feat: add findOneByDicomUID for study/series/instance models and us…

…e for delete
Chinlinlee · Jan 22, 2024 · feb1ed1 · feb1ed1
1 parent a731375
commit feb1ed1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/api/dicom-web/controller/WADO-RS/deletion/service/delete.js b/api/dicom-web/controller/WADO-RS/deletion/service/delete.js
@@ -28,7 +28,7 @@ class DeleteService {
     }
 
     async deleteStudy() {
-        let study = await StudyModel.findOne({
+        let study = await StudyModel.findOneByDicomUID({
             ...this.request.params
         });
 
@@ -46,7 +46,7 @@ class DeleteService {
     }
 
     async deleteSeries() {
-        let aSeries = await SeriesModel.findOne({
+        let aSeries = await SeriesModel.findOneByDicomUID({
             ...this.request.params
         });
 
@@ -64,7 +64,7 @@ class DeleteService {
 
 
     async deleteInstance() {
-        let instance = await InstanceModel.findOne({
+        let instance = await InstanceModel.findOneByDicomUID({
             ...this.request.params
         });
 

diff --git a/models/mongodb/models/instance.model.js b/models/mongodb/models/instance.model.js
@@ -34,6 +34,9 @@ let dicomSchemaOptions = _.merge(
     {
         strict: false,
         methods: {
+            findOneByDicomUID: async function ({ studyUID, seriesUID, instanceUID }) {
+                return await mongoose.model("dicom").findOne({ studyUID, seriesUID, instanceUID }).exec();
+            },
             deleteDicomInstances: async function () {
                 let instancePath = this.instancePath;
                 try {

diff --git a/models/mongodb/models/series.model.js b/models/mongodb/models/series.model.js
@@ -34,6 +34,9 @@ let dicomSeriesSchemaOptions = _.merge(
             }
         },
         statics: {
+            findOneByDicomUID: async function({ studyUID, seriesUID }) {
+                return await mongoose.model("dicomSeries").findOne({ studyUID, seriesUID }).exec();
+            },
             /**
              * 
              * @param {import("@root/utils/typeDef/dicom").DicomJsonQueryOptions} queryOptions

diff --git a/models/mongodb/models/study.model.js b/models/mongodb/models/study.model.js
@@ -44,6 +44,9 @@ let dicomStudySchemaOptions = _.merge(
             }
         },
         statics: {
+            findOneByDicomUID: async function({ studyUID })  {
+                return await mongoose.model("dicomStudy").findOne({ studyUID }).exec();
+            },
             /**
              * 
              * @param {import("@root/utils/typeDef/dicom").DicomJsonQueryOptions} queryOptions