refactor: wrap deleteOneByAeTitle for (global)ups subscription model

Chinlinlee · Jan 18, 2024 · 306c46f · 306c46f
1 parent f5bf053
commit 306c46f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/api/dicom-web/controller/UPS-RS/service/suspend-subscription.service.js b/api/dicom-web/controller/UPS-RS/service/suspend-subscription.service.js
@@ -35,17 +35,12 @@ class SuspendSubscribeService extends BaseWorkItemService {
     }
 
     async deleteGlobalSubscription() {
-
-        await UpsGlobalSubscriptionModel.findOneAndDelete({
-            aeTitle: this.subscriberAeTitle
-        });
+        await UpsGlobalSubscriptionModel.deleteOneByAeTitle(this.subscriberAeTitle);
 
     }
 
     async isGlobalSubscriptionExist() {
-        return await UpsGlobalSubscriptionModel.countDocuments({
-            aeTitle: this.subscriberAeTitle
-        }) > 0;
+        return await UpsGlobalSubscriptionModel.getCountByAeTitle(this.subscriberAeTitle) > 0;
     }
 
 }

diff --git a/api/dicom-web/controller/UPS-RS/service/unsubscribe.service.js b/api/dicom-web/controller/UPS-RS/service/unsubscribe.service.js
@@ -64,14 +64,9 @@ class UnSubscribeService extends BaseWorkItemService {
     }
 
     async deleteGlobalSubscription() {
-        // TODO: wrap method in model
         await Promise.all([
-            UpsSubscriptionModel.findOneAndDelete({
-                aeTitle: this.subscriberAeTitle
-            }),
-            UpsGlobalSubscriptionModel.findOneAndDelete({
-                aeTitle: this.subscriberAeTitle
-            })
+            UpsSubscriptionModel.deleteOneByAeTitle(this.subscriberAeTitle),
+            UpsGlobalSubscriptionModel.deleteOneByAeTitle(this.subscriberAeTitle)
         ]);
 
     }

diff --git a/models/mongodb/models/upsGlobalSubscription.js b/models/mongodb/models/upsGlobalSubscription.js
@@ -55,6 +55,9 @@ let upsGlobalSubscriptionSchema = new mongoose.Schema(
              */
             getCountByAeTitle: async function (aeTitle) {
                 return await mongoose.model("upsGlobalSubscription").countDocuments({ aeTitle: aeTitle });
+            },
+            deleteOneByAeTitle: async function (aeTitle) {
+                return await mongoose.model("upsGlobalSubscription").findOneAndDelete({ aeTitle: aeTitle });
             }
         }
     }

diff --git a/models/mongodb/models/upsSubscription.js b/models/mongodb/models/upsSubscription.js
@@ -88,6 +88,9 @@ let upsSubscriptionSchema = new mongoose.Schema(
              */
             getCountByAeTitle: async function (aeTitle) {
                 return await mongoose.model("upsSubscription").countDocuments({ aeTitle: aeTitle });
+            },
+            deleteOneByAeTitle: async function (aeTitle) {
+                return await mongoose.model("upsSubscription").findOneAndDelete({ aeTitle: aeTitle });
             }
         }
     }