refactor: require SeriesModel instead of dicomSeriesModel

Chinlinlee · Nov 10, 2023 · 33bdee2 · 33bdee2
1 parent 2075c1d
commit 33bdee2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/api/dicom-web/controller/QIDO-RS/service/query-dicom-json-factory.js b/api/dicom-web/controller/QIDO-RS/service/query-dicom-json-factory.js
@@ -1,7 +1,7 @@
 const _ = require("lodash");
 const { PatientModel } = require("@dbModels/patient");
 const { StudyModel } = require("@dbModels/dicomStudy");
-const dicomSeriesModel = require("@models/mongodb/models/dicomSeries");
+const { SeriesModel } = require("@dbModels/dicomSeries");
 const dicomModel = require("@models/mongodb/models/dicom");
 const { dictionary } = require("@models/DICOM/dicom-tags-dic");
 const { mongoDateQuery, timeQuery } = require("@models/mongodb/service");
@@ -193,7 +193,7 @@ class QueryStudyDicomJsonFactory extends QueryDicomJsonFactory {
 class QuerySeriesDicomJsonFactory extends QueryDicomJsonFactory {
     constructor(queryOptions) {
         super(queryOptions);
-        this.model = dicomSeriesModel;
+        this.model = SeriesModel;
     }
 }
 

diff --git a/api/dicom-web/controller/WADO-RS/deletion/service/delete.js b/api/dicom-web/controller/WADO-RS/deletion/service/delete.js
@@ -1,6 +1,6 @@
 const _ = require("lodash");
 const { StudyModel } = require("@dbModels/dicomStudy");
-const dicomSeriesModel = require("../../../../../../models/mongodb/models/dicomSeries");
+const { SeriesModel } = require("@dbModels/dicomSeries");
 const dicomModel = require("../../../../../../models/mongodb/models/dicom");
 const fsP = require("fs/promises");
 const { NotFoundInstanceError } = require("../../../../../../error/dicom-instance");
@@ -46,7 +46,7 @@ class DeleteService {
     }
 
     async deleteSeries() {
-        let aSeries = await dicomSeriesModel.findOne({
+        let aSeries = await SeriesModel.findOne({
             ...this.request.params
         });
 

diff --git a/api/dicom-web/controller/WADO-RS/service/thumbnail.service.js b/api/dicom-web/controller/WADO-RS/service/thumbnail.service.js
@@ -1,5 +1,4 @@
 const dicomModel = require("../../../../../models/mongodb/models/dicom");
-const dicomSeriesModel = require("../../../../../models/mongodb/models/dicomSeries");
 const errorResponse = require("../../../../../utils/errorResponse/errorResponseMessage");
 const renderedService = require("../service/rendered.service");
 const _ = require("lodash");

diff --git a/dimse/seriesQueryTask.js b/dimse/seriesQueryTask.js
@@ -3,7 +3,7 @@ const _ = require("lodash");
 const { createQueryTaskInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/QueryTaskInject");
 const { DimseQueryBuilder } = require("./queryBuilder");
 const { JsStudyQueryTask } = require("./studyQueryTask");
-const dicomSeriesModel = require("@models/mongodb/models/dicomSeries");
+const { SeriesModel } = require("@dbModels/dicomSeries");
 const { SeriesQueryTask } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/SeriesQueryTask");
 const { Attributes } = require("@dcm4che/data/Attributes");
 const { createSeriesQueryTaskInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/SeriesQueryTaskInject");
@@ -117,7 +117,7 @@ class JsSeriesQueryTask extends JsStudyQueryTask {
             await this.as.getRemoteAET(), await this.as.getRemoteHostName(),
             await this.as.getLocalAET(), await this.as.getLocalHostName()
         );
-        
+
         let queryAttr = await Attributes.newInstanceAsync();
         await queryAttr.addAll(this.keys);
         await queryAttr.addSelected(this.studyAttr, [Tag.PatientID, Tag.StudyInstanceUID]);
@@ -134,7 +134,7 @@ class JsSeriesQueryTask extends JsStudyQueryTask {
         let returnKeys = this.getReturnKeys(normalQuery);
 
         logger.info(`do DIMSE Series query: ${JSON.stringify(mongoQuery.$match)}`);
-        this.seriesCursor = await dicomSeriesModel.getDimseResultCursor({
+        this.seriesCursor = await SeriesModel.getDimseResultCursor({
             ...mongoQuery.$match
         }, returnKeys);
     }

diff --git a/models/mongodb/deleteSchedule.js b/models/mongodb/deleteSchedule.js
@@ -3,7 +3,7 @@ const moment = require("moment");
 const { logger } = require("@root/utils/logs/log");
 const { StudyModel } = require("@dbModels/dicomStudy");
 const dicomModel = require("./models/dicom");
-const dicomSeriesModel = require("./models/dicomSeries");
+const { SeriesModel } = require("@dbModels/dicomSeries");
 
 // Delete dicom with delete status >= 2
 schedule.scheduleJob("*/5 * * * * *", async function () {
@@ -38,7 +38,7 @@ async function deleteExpireStudies() {
                 dicomModel.deleteMany({
                     studyUID
                 }),
-                dicomSeriesModel.deleteMany({
+                SeriesModel.deleteMany({
                     studyUID
                 }),
                 deletedStudy.delete()
@@ -50,7 +50,7 @@ async function deleteExpireStudies() {
 }
 
 async function deleteExpireSeries() {
-    let deletedSeries = await dicomSeriesModel.find({
+    let deletedSeries = await SeriesModel.find({
         deleteStatus: {
             $gte: 2
         }
@@ -61,7 +61,7 @@ async function deleteExpireSeries() {
         let now = moment();
         let diff = now.diff(updateAtDate, "seconds");
         if (diff >= 30) {
-            let {studyUID, seriesUID} = aDeletedSeries;
+            let { studyUID, seriesUID } = aDeletedSeries;
 
             logger.info("delete expired series: " + seriesUID);
             await Promise.all([
@@ -87,7 +87,7 @@ async function deleteExpireInstances() {
     });
 
     for (let deletedInstance of deletedInstances) {
-        let {instanceUID} = deletedInstance;
+        let { instanceUID } = deletedInstance;
 
         let updateAtDate = moment(deletedInstance.updatedAt);
         let now = moment();

diff --git a/models/mongodb/models/dicomSeries.js b/models/mongodb/models/dicomSeries.js
@@ -107,3 +107,4 @@ let dicomSeriesModel = mongoose.model(
 );
 
 module.exports = dicomSeriesModel;
+module.exports.SeriesModel = dicomSeriesModel;