refactor: duplicate codes for bulkdata api

- response Bulk Data Array and response single bulk data
Chinlinlee · Nov 11, 2023 · e889b0c · e889b0c
1 parent 9392d66
commit e889b0c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 32 deletions.
diff --git a/api/dicom-web/controller/WADO-RS/bulkdata/base.controller.js b/api/dicom-web/controller/WADO-RS/bulkdata/base.controller.js
@@ -11,6 +11,7 @@ class BaseBulkDataController extends Controller {
         this.apiLogger.addTokenValue();
         this.bulkDataFactoryType = StudyBulkDataFactory;
         this.imagePathFactoryType = StudyImagePathFactory;
+        this.bulkDataService = new BulkDataService(this.request, this.response, this.bulkDataFactoryType);
     }
 
     logAction() {
@@ -20,30 +21,42 @@ class BaseBulkDataController extends Controller {
     async mainProcess() {
         this.logAction();
 
-        let bulkDataService = new BulkDataService(this.request, this.response, this.bulkDataFactoryType);
-
         try {
-            let bulkDataArray = await bulkDataService.getBulkData();
-            for(let bulkData of bulkDataArray) {
-                await bulkDataService.writeBulkData(bulkData);
-            }
+            this.logAction();
 
-            let imagePathFactory = new this.imagePathFactoryType({
-                ...this.request.params
-            });
-            await imagePathFactory.getImagePaths();
-
-            for(let imagePathObj of imagePathFactory.imagePaths) {
-                await bulkDataService.writeBulkData(imagePathObj);
+            let bulkData = await this.bulkDataService.getBulkData();
+            if (Array.isArray(bulkData)) {
+                await this.responseBulkDataArray(bulkData);
+            } else {
+                await this.responseBulkData(bulkData);
             }
 
-            bulkDataService.multipartWriter.writeFinalBoundary();
+            this.bulkDataService.multipartWriter.writeFinalBoundary();
             return this.response.end();
-        } catch(e) {
+        } catch (e) {
             let apiErrorArrayHandler = new ApiErrorArrayHandler(this.response, this.apiLogger, e);
             return apiErrorArrayHandler.doErrorResponse();
         }
     }
+
+    async responseBulkDataArray(bulkDataArray) {
+        for (let bulkData of bulkDataArray) {
+            await this.bulkDataService.writeBulkData(bulkData);
+        }
+
+        let imagePathFactory = new this.imagePathFactoryType({
+            ...this.request.params
+        });
+        await imagePathFactory.getImagePaths();
+
+        for (let imagePathObj of imagePathFactory.imagePaths) {
+            await this.bulkDataService.writeBulkData(imagePathObj);
+        }
+    }
+
+    async responseBulkData(bulkData) {
+        await this.bulkDataService.writeBulkData(bulkData);
+    }
 }
 
 module.exports.BaseBulkDataController = BaseBulkDataController;
diff --git a/api/dicom-web/controller/WADO-RS/bulkdata/bulkdata.js b/api/dicom-web/controller/WADO-RS/bulkdata/bulkdata.js
@@ -20,22 +20,6 @@ class BulkDataController extends BaseBulkDataController {
 , SOPInstanceUID: ${this.request.params.instanceUID}`);
     }
 
-    async mainProcess() {
-        this.logAction();
-
-        let bulkDataService = new BulkDataService(this.request, this.response, this.bulkDataFactoryType);
-
-        try {
-            let bulkData = await bulkDataService.getBulkData();
-            await bulkDataService.writeBulkData(bulkData);
-            bulkDataService.multipartWriter.writeFinalBoundary();
-            return this.response.end();
-        } catch(e) {
-            let apiErrorArrayHandler = new ApiErrorArrayHandler(this.response, this.apiLogger, e);
-            return apiErrorArrayHandler.doErrorResponse();
-        }
-
-    }
 }
 
 

diff --git a/api/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata.js b/api/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata.js
@@ -51,7 +51,7 @@ class BulkDataService {
     async getBulkData() {
         return await this.bulkDataFactory.getBulkData();
     }
-
+    
 }
 
 class BulkDataFactory {