From ff436b0ca9b28d87996b993e876f6509fb314aaa Mon Sep 17 00:00:00 2001
From: Hironsan <hiroki.nakayama.py@gmail.com>
Date: Tue, 28 Feb 2023 15:02:48 +0900
Subject: [PATCH] Remove task status application service

---
 .../domain/models/celery/taskStatusRepository.ts    |  5 -----
 frontend/pages/projects/_id/dataset/export.vue      |  2 +-
 frontend/pages/projects/_id/dataset/import.vue      |  6 +++---
 frontend/plugins/services.ts                        |  3 ---
 .../repositories/celery/apiTaskStatusRepository.ts  |  5 ++---
 frontend/services/application/celery/statusData.ts  | 13 -------------
 .../celery/taskStatusApplicationService.ts          | 11 -----------
 7 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 frontend/domain/models/celery/taskStatusRepository.ts
 delete mode 100644 frontend/services/application/celery/statusData.ts
 delete mode 100644 frontend/services/application/celery/taskStatusApplicationService.ts

diff --git a/frontend/domain/models/celery/taskStatusRepository.ts b/frontend/domain/models/celery/taskStatusRepository.ts
deleted file mode 100644
index 24f39288..00000000
--- a/frontend/domain/models/celery/taskStatusRepository.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Status } from './status'
-
-export interface TaskStatusRepository {
-  get(taskId: string): Promise<Status>
-}
diff --git a/frontend/pages/projects/_id/dataset/export.vue b/frontend/pages/projects/_id/dataset/export.vue
index c9dffe5e..d99c2b1b 100644
--- a/frontend/pages/projects/_id/dataset/export.vue
+++ b/frontend/pages/projects/_id/dataset/export.vue
@@ -105,7 +105,7 @@ export default Vue.extend({
       // @ts-ignore
       this.polling = setInterval(async () => {
         if (this.taskId) {
-          const res = await this.$services.taskStatus.get(this.taskId)
+          const res = await this.$repositories.taskStatus.get(this.taskId)
           if (res.ready) {
             this.$services.download.download(this.projectId, this.taskId)
             this.reset()
diff --git a/frontend/pages/projects/_id/dataset/import.vue b/frontend/pages/projects/_id/dataset/import.vue
index 18ba0c13..346e0682 100644
--- a/frontend/pages/projects/_id/dataset/import.vue
+++ b/frontend/pages/projects/_id/dataset/import.vue
@@ -92,10 +92,10 @@
 </template>
 
 <script>
+import FilePondPluginFileValidateType from 'filepond-plugin-file-validate-type'
+import 'filepond/dist/filepond.min.css'
 import Cookies from 'js-cookie'
 import vueFilePond from 'vue-filepond'
-import 'filepond/dist/filepond.min.css'
-import FilePondPluginFileValidateType from 'filepond-plugin-file-validate-type'
 const FilePond = vueFilePond(FilePondPluginFileValidateType)
 
 export default {
@@ -246,7 +246,7 @@ export default {
     pollData() {
       this.polling = setInterval(async () => {
         if (this.taskId) {
-          const res = await this.$services.taskStatus.get(this.taskId)
+          const res = await this.$repositories.taskStatus.get(this.taskId)
           if (res.ready) {
             this.taskId = null
             this.errors = res.result.error
diff --git a/frontend/plugins/services.ts b/frontend/plugins/services.ts
index 84536bea..2b70e910 100644
--- a/frontend/plugins/services.ts
+++ b/frontend/plugins/services.ts
@@ -1,7 +1,6 @@
 import { Plugin } from '@nuxt/types'
 import { repositories } from './repositories'
 import { ConfigApplicationService } from '@/services/application/autoLabeling/configApplicationService'
-import { TaskStatusApplicationService } from '@/services/application/celery/taskStatusApplicationService'
 import { CommentApplicationService } from '@/services/application/comment/commentApplicationService'
 import { DownloadApplicationService } from '@/services/application/download/downloadApplicationService'
 import { DownloadFormatApplicationService } from '@/services/application/download/downloadFormatApplicationService'
@@ -34,7 +33,6 @@ export interface Services {
   config: ConfigApplicationService
   catalog: CatalogApplicationService
   parse: ParseApplicationService
-  taskStatus: TaskStatusApplicationService
   downloadFormat: DownloadFormatApplicationService
   download: DownloadApplicationService
   tag: TagApplicationService
@@ -67,7 +65,6 @@ const plugin: Plugin = (_, inject) => {
     config: new ConfigApplicationService(repositories.config),
     catalog: new CatalogApplicationService(repositories.catalog),
     parse: new ParseApplicationService(repositories.parse),
-    taskStatus: new TaskStatusApplicationService(repositories.taskStatus),
     downloadFormat: new DownloadFormatApplicationService(repositories.downloadFormat),
     download: new DownloadApplicationService(repositories.download),
     tag: new TagApplicationService(repositories.tag),
diff --git a/frontend/repositories/celery/apiTaskStatusRepository.ts b/frontend/repositories/celery/apiTaskStatusRepository.ts
index 378f86f3..339cd460 100644
--- a/frontend/repositories/celery/apiTaskStatusRepository.ts
+++ b/frontend/repositories/celery/apiTaskStatusRepository.ts
@@ -1,9 +1,8 @@
 import { plainToInstance } from 'class-transformer'
-import ApiService from '@/services/api.service'
-import { TaskStatusRepository } from '@/domain/models/celery/taskStatusRepository'
 import { Status } from '@/domain/models/celery/status'
+import ApiService from '@/services/api.service'
 
-export class APITaskStatusRepository implements TaskStatusRepository {
+export class APITaskStatusRepository {
   constructor(private readonly request = ApiService) {}
 
   async get(taskId: string): Promise<Status> {
diff --git a/frontend/services/application/celery/statusData.ts b/frontend/services/application/celery/statusData.ts
deleted file mode 100644
index 9a1c54ea..00000000
--- a/frontend/services/application/celery/statusData.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Status } from '@/domain/models/celery/status'
-
-export class StatusDTO {
-  ready: boolean
-  result: object
-  error: any
-
-  constructor(item: Status) {
-    this.ready = item.ready
-    this.result = item.result
-    this.error = item.error
-  }
-}
diff --git a/frontend/services/application/celery/taskStatusApplicationService.ts b/frontend/services/application/celery/taskStatusApplicationService.ts
deleted file mode 100644
index 770c05c1..00000000
--- a/frontend/services/application/celery/taskStatusApplicationService.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { StatusDTO } from './statusData'
-import { TaskStatusRepository } from '@/domain/models/celery/taskStatusRepository'
-
-export class TaskStatusApplicationService {
-  constructor(private readonly repository: TaskStatusRepository) {}
-
-  public async get(taskId: string): Promise<StatusDTO> {
-    const item = await this.repository.get(taskId)
-    return new StatusDTO(item)
-  }
-}