refactor: Use module alias for WADO-URI service

Chinlinlee · Nov 19, 2023 · ebefd6a · ebefd6a
1 parent 57aaea7
commit ebefd6a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 103 deletions.
diff --git a/api-sql/WADO-URI/controller/retrieveInstance.js b/api-sql/WADO-URI/controller/retrieveInstance.js
diff --git a/api-sql/WADO-URI/index.js b/api-sql/WADO-URI/index.js
diff --git a/api/WADO-URI/controller/retrieveInstance.js b/api/WADO-URI/controller/retrieveInstance.js
@@ -1,4 +1,4 @@
-const { WadoUriService, NotFoundInstanceError } = require("../service/WADO-URI.service");
+const { WadoUriService, NotFoundInstanceError } = require("@wado-uri-service");
 const { Controller } = require("../../controller.class");
 const { ApiLogger } = require("../../../utils/logs/api-logger");
 const { ApiErrorArrayHandler } = require("@error/api-errors.handler");

diff --git a/config/jsconfig.sql.json b/config/jsconfig.sql.json
@@ -14,6 +14,7 @@
             "@stow-rs-service": ["./api/dicom-web/controller/STOW-RS/service/stow-rs.service.js"],
             "@qido-rs-service": ["./api-sql/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js"],
             "@wado-rs-service": ["./api-sql/dicom-web/controller/WADO-RS/service/WADO-RS.service.js"],
+            "@wado-uri-service": ["./api-sql/WADO-URI/service/WADO-URI.service.js"],
             "@bulkdata-service": ["./api-sql/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata.js"],
             "@delete-service": ["./api-sql/dicom-web/controller/WADO-RS/deletion/service/delete.js"],
             "@rendered-service": ["./api-sql/dicom-web/controller/WADO-RS/service/rendered.service.js"],

diff --git a/config/modula-alias/sql/package.json b/config/modula-alias/sql/package.json
@@ -13,6 +13,7 @@
         "@stow-rs-service": "../../../api/dicom-web/controller/STOW-RS/service/stow-rs.service.js",
         "@qido-rs-service": "../../../api-sql/dicom-web/controller/QIDO-RS/service/QIDO-RS.service.js",
         "@wado-rs-service": "../../../api-sql/dicom-web/controller/WADO-RS/service/WADO-RS.service.js",
+        "@wado-uri-service": "../../../api-sql/WADO-URI/service/WADO-URI.service.js",
         "@bulkdata-service": "../../../api-sql/dicom-web/controller/WADO-RS/bulkdata/service/bulkdata.js",
         "@delete-service": "../../../api-sql/dicom-web/controller/WADO-RS/deletion/service/delete.js",
         "@rendered-service": "../../../api-sql/dicom-web/controller/WADO-RS/service/rendered.service.js",
@@ -22,6 +23,7 @@
         "@dimse-study-query-task": "../../../dimse-sql/studyQueryTask.js",
         "@dimse-series-query-task": "../../../dimse-sql/seriesQueryTask.js",
         "@dimse-instance-query-task": "../../../dimse-sql/instanceQueryTask.js",
-        "@dimse-utils": "../../../dimse-sql/utils.js"
+        "@dimse-utils": "../../../dimse-sql/utils.js",
+        "@dimse": "../../../dimse-sql"
     }
 }
diff --git a/routes.js b/routes.js
@@ -29,5 +29,5 @@ module.exports = function (app) {
     app.use("/dicom-web", require("./api/dicom-web/delete.route"));
     // app.use("/dicom-web", require("./api/dicom-web/ups-rs.route"));
 
-    app.use("/wado", require("./api-sql/WADO-URI"));
+    app.use("/wado", require("./api/WADO-URI"));
 };