refactor: wrap findNotSubscribedWorkItems in repository model

Chinlinlee · Jan 13, 2024 · a0b4299 · a0b4299
1 parent 50935d5
commit a0b4299
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/api/dicom-web/controller/UPS-RS/service/subscribe.service.js b/api/dicom-web/controller/UPS-RS/service/subscribe.service.js
@@ -1,7 +1,7 @@
 const _ = require("lodash");
 const { DicomJsonModel } = require("@dicom-json-model");
 const { DicomCode } = require("@models/DICOM/code");
-const workItemModel = require("@models/mongodb/models/workitems.model");
+const { WorkItemModel } = require("@models/mongodb/models/workitems.model");
 const subscriptionModel = require("@models/mongodb/models/upsSubscription");
 const globalSubscriptionModel = require("@models/mongodb/models/upsGlobalSubscription");
 const {
@@ -154,19 +154,7 @@ class SubscribeService extends BaseWorkItemService {
     //#endregion
 
     async findNotSubscribedWorkItems() {
-        return await workItemModel.find({
-            $or: [
-                {
-                    subscribed: SUBSCRIPTION_STATE.NOT_SUBSCRIBED
-                },
-                {
-                    subscribed: {
-                        $exists: false
-                    }
-                }
-            ]
-
-        }) || [];
+        return await WorkItemModel.findNotSubscribedWorkItems();
     }
 }
 

diff --git a/models/mongodb/models/workitems.model.js b/models/mongodb/models/workitems.model.js
@@ -36,6 +36,23 @@ let workItemSchema = new mongoose.Schema(
         toObject: {
             getters: true
         },
+        statics: {
+            findNotSubscribedWorkItems: async function () {
+                return await mongoose.model("workItems").find({
+                    $or: [
+                        {
+                            subscribed: SUBSCRIPTION_STATE.NOT_SUBSCRIBED
+                        },
+                        {
+                            subscribed: {
+                                $exists: false
+                            }
+                        }
+                    ]
+
+                }) || [];
+            }
+        },
         methods: {
             toDicomJsonModel: function () {
                 return new DicomJsonModel(this);
@@ -110,13 +127,6 @@ function getWorkItemFields() {
     };
 }
 
-/**
- * @typedef { mongoose.Model<mongoose.Schema> & { 
- * getDicomJson: function(import("../../../utils/typeDef/dicom").DicomJsonMongoQueryOptions): Promise<function>
- * }} WorkItemsModel
-*/
-
-/** @type {WorkItemsModel} */
 let workItemModel = mongoose.model(
     "workItems",
     workItemSchema,