refactor: centralize retrieve instance controller

- Using inherit class may be redundant
- Set `zipResponseHandlerType`, `logger`,  `multipartResponseHandlerType` in request object and use them in after process

api/dicom-web/controller/WADO-RS/base.controller.js → api/dicom-web/controller/WADO-RS/retrieveInstances.controller.js

@@ -17,10 +17,6 @@ const { ApiErrorArrayHandler } = require("@error/api-errors.handler");
 class BaseRetrieveController extends Controller {
     constructor(req, res) {
         super(req, res);
-        this.apiLogger = new ApiLogger(this.request, "WADO-RS");
-        this.apiLogger.addTokenValue();
-        this.zipResponseHandlerType = BaseZipResponseHandler;
-        this.multipartResponseHandlerType = BaseMultipartRelatedResponseHandler;
     }
 
     logAction() {
@@ -40,18 +36,18 @@ class BaseRetrieveController extends Controller {
 
             return sendNotSupportedMediaType(this.response, this.request.headers.accept);
         } catch (e) {
-            let apiErrorArrayHandler = new ApiErrorArrayHandler(this.response, this.apiLogger, e);
+            let apiErrorArrayHandler = new ApiErrorArrayHandler(this.response, this.request.logger, e);
             return apiErrorArrayHandler.doErrorResponse();
         }
     }
 
     async responseZip() {
-        let zipResponseHandler = new this.zipResponseHandlerType(this.request, this.response);
+        let zipResponseHandler = new this.request.zipResponseHandlerType(this.request, this.response);
         await zipResponseHandler.doResponse();
     }
 
     async responseMultipartRelated() {
-        let multipartResponseHandler = new this.multipartResponseHandlerType(this.request, this.response);
+        let multipartResponseHandler = new this.request.multipartResponseHandlerType(this.request, this.response);
         await multipartResponseHandler.doResponse();
     }
 }

api/dicom-web/wado-rs-instance.route.js

@@ -3,6 +3,23 @@ const Joi = require("joi");
 const { validateParams, intArrayJoi } = require("../validator");
 const router = express();
 
+
+const {
+    BaseRetrieveController,
+    StudyZipResponseHandler,
+    StudyMultipartRelatedResponseHandler,
+    SeriesZipResponseHandler,
+    SeriesMultipartRelatedResponseHandler,
+    InstanceZipResponseHandler,
+    InstanceMultipartRelatedResponseHandler
+} = require("./controller/WADO-RS/retrieveInstances.controller");
+const { ApiLogger } = require("@root/utils/logs/api-logger");
+
+let retrieveController = async (req, res) => {
+    let controller = new BaseRetrieveController(req, res);
+    await controller.doPipeline();
+};
+
 //#region WADO-RS Retrieve Transaction Instance Resources
 
 /**
@@ -21,7 +38,15 @@ const router = express();
  */
 router.get(
     "/studies/:studyUID",
-    require("./controller/WADO-RS/retrieveStudyInstances")
+    (req, res, next) => {
+        req.zipResponseHandlerType = StudyZipResponseHandler;
+        req.multipartResponseHandlerType = StudyMultipartRelatedResponseHandler;
+        req.logger = new ApiLogger(req, "WADO-RS");
+        req.logger.addTokenValue();
+        req.logger.logger.info(`[Get study's instances, study UID: ${req.params.studyUID}] [Request Accept: ${req.headers?.accept}]`);
+        next();
+    },
+    retrieveController
 );
 
 /**
@@ -41,7 +66,15 @@ router.get(
  */
 router.get(
     "/studies/:studyUID/series/:seriesUID",
-    require("./controller/WADO-RS/retrieveStudy-Series-Instances")
+    (req, res, next) => {
+        req.zipResponseHandlerType = SeriesZipResponseHandler;
+        req.multipartResponseHandlerType = SeriesMultipartRelatedResponseHandler;
+        req.logger = new ApiLogger(req, "WADO-RS");
+        req.logger.addTokenValue();
+        req.logger.logger.info(`[Get study's series' instances, study UID: ${req.params.studyUID}, series UID: ${req.params.seriesUID}] [Request Accept: ${req.headers?.accept}]`);
+        next();
+    },
+    retrieveController
 );
 
 /**
@@ -62,7 +95,18 @@ router.get(
  */
 router.get(
     "/studies/:studyUID/series/:seriesUID/instances/:instanceUID",
-    require("./controller/WADO-RS/retrieveInstance")
+    (req, res, next) => {
+        req.zipResponseHandlerType = InstanceZipResponseHandler;
+        req.multipartResponseHandlerType = InstanceMultipartRelatedResponseHandler;
+        req.logger = new ApiLogger(req, "WADO-RS");
+        req.logger.addTokenValue();
+        req.logger.logger.info(`[Get study's series' instance,`+ 
+                               `study UID: ${req.params.studyUID}, series UID: ${req.params.seriesUID}, instance UID: ${req.params.instanceUID}]`
+                               + ` [Request Accept: ${req.headers?.accept}]`);
+
+        next();
+    },
+    retrieveController
 );
 
 //#endregion