refactor: export original function for reusing

Chinlinlee · Aug 14, 2023 · 905ff93 · 905ff93
1 parent 30e13ae
commit 905ff93
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/api-sql/dicom-web/controller/WADO-RS/rendered/instanceFrames.js b/api-sql/dicom-web/controller/WADO-RS/rendered/instanceFrames.js
@@ -1,8 +1,5 @@
 const _ = require("lodash");
 const renderedService = require("../service/rendered.service");
-const {
-    RenderedImageMultipartWriter
-} = require("@root/api/dicom-web/controller/WADO-RS/service/rendered.service");
 const { InstanceImagePathFactory } = require("../service/WADO-RS.service");
 const errorResponse = require("@root/utils/errorResponse/errorResponseMessage");
 const { ApiLogger } = require("@root/utils/logs/api-logger");
@@ -36,7 +33,7 @@ class RetrieveRenderedInstanceFramesController extends Controller {
         }
 
         try {
-            let renderedImageMultipartWriter = new RenderedImageMultipartWriter(
+            let renderedImageMultipartWriter = new renderedService.RenderedImageMultipartWriter(
                 this.request,
                 this.response,
                 InstanceImagePathFactory,

diff --git a/api-sql/dicom-web/controller/WADO-RS/rendered/instances.js b/api-sql/dicom-web/controller/WADO-RS/rendered/instances.js
@@ -1,5 +1,4 @@
 const _ = require("lodash");
-const { RenderedImageMultipartWriter } = require("@root/api/dicom-web/controller/WADO-RS/service/rendered.service");
 const renderedService = require("../service/rendered.service");
 const { InstanceImagePathFactory } = require("../service/WADO-RS.service");
 const errorResponse = require("@root/utils/errorResponse/errorResponseMessage");
@@ -28,7 +27,7 @@ class RetrieveRenderedInstancesController extends Controller {
         }
 
         try {
-            let renderedImageMultipartWriter = new RenderedImageMultipartWriter(
+            let renderedImageMultipartWriter = new renderedService.RenderedImageMultipartWriter(
                 this.request,
                 this.response,
                 InstanceImagePathFactory,

diff --git a/api-sql/dicom-web/controller/WADO-RS/rendered/series.js b/api-sql/dicom-web/controller/WADO-RS/rendered/series.js
@@ -1,5 +1,4 @@
 const _ = require("lodash");
-const { RenderedImageMultipartWriter } = require("@root/api/dicom-web/controller/WADO-RS/service/rendered.service");
 const renderedService = require("../service/rendered.service");
 const { SeriesImagePathFactory } = require("../service/WADO-RS.service");
 const errorResponse = require("@root/utils/errorResponse/errorResponseMessage");
@@ -23,7 +22,7 @@ class RetrieveRenderedSeriesController extends Controller {
         }
 
         try {
-            let renderedImageMultipartWriter = new RenderedImageMultipartWriter(
+            let renderedImageMultipartWriter = new renderedService.RenderedImageMultipartWriter(
                 this.request,
                 this.response,
                 SeriesImagePathFactory,

diff --git a/api-sql/dicom-web/controller/WADO-RS/rendered/study.js b/api-sql/dicom-web/controller/WADO-RS/rendered/study.js
@@ -1,5 +1,4 @@
 const _ = require("lodash");
-const { RenderedImageMultipartWriter } = require("@root/api/dicom-web/controller/WADO-RS/service/rendered.service");
 const renderedService = require("../service/rendered.service");
 const {
     StudyImagePathFactory
@@ -30,7 +29,7 @@ class RetrieveRenderedStudyController extends Controller {
 
         try {
 
-            let renderedImageMultipartWriter = new RenderedImageMultipartWriter(
+            let renderedImageMultipartWriter = new renderedService.RenderedImageMultipartWriter(
                 this.request,
                 this.response,
                 StudyImagePathFactory,

diff --git a/api-sql/dicom-web/controller/WADO-RS/service/rendered.service.js b/api-sql/dicom-web/controller/WADO-RS/service/rendered.service.js
@@ -1,7 +1,8 @@
 const { 
     postProcessFrameImage,
     writeRenderedImages,
-    writeSpecificFramesRenderedImages
+    writeSpecificFramesRenderedImages,
+    RenderedImageMultipartWriter
 } = require("@root/api/dicom-web/controller/WADO-RS/service/rendered.service");
 
 const path = require("path");
@@ -195,7 +196,11 @@ async function getInstanceFrameObj(iParam, otherFields = {}) {
 }
 
 
+module.exports.postProcessFrameImage = postProcessFrameImage;
+module.exports.writeRenderedImages = writeRenderedImages;
+module.exports.writeSpecificFramesRenderedImages = writeSpecificFramesRenderedImages;
 module.exports.getInstanceFrameObj = getInstanceFrameObj;
+module.exports.RenderedImageMultipartWriter = RenderedImageMultipartWriter;
 module.exports.StudyFramesWriter = StudyFramesWriter;
 module.exports.SeriesFramesWriter = SeriesFramesWriter;
 module.exports.InstanceFramesWriter = InstanceFramesWriter;