feat: wrap findMwlItems in mwl item model

Chinlinlee · Jan 19, 2024 · 094b637 · 094b637
1 parent b519dd3
commit 094b637
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/api/dicom-web/controller/MWL-RS/service/change-filtered-mwlItem-status.js b/api/dicom-web/controller/MWL-RS/service/change-filtered-mwlItem-status.js
@@ -26,8 +26,7 @@ class ChangeFilteredMwlItemStatusService extends BaseQueryService {
     }
 
     async getMwlItems() {
-        let query = (await convertRequestQueryToMongoQuery(this.query)).$match;
-        return await MwlItemModel.find(query);
+        return await MwlItemModel.findMwlItems(this.query);
     }
 }
 

diff --git a/models/mongodb/models/mwlitems.model.js b/models/mongodb/models/mwlitems.model.js
@@ -102,6 +102,10 @@ let mwlItemSchema = new mongoose.Schema(
                     ...generalDicomJson
                 });
                 return await mwlItem.save();
+            },
+            findMwlItems: async function(query) {
+                let mongoQuery = await convertRequestQueryToMongoQuery(query);
+                return await mongoose.model("mwlItems").find(mongoQuery);
             }
         },
         methods: {