refactor: duplicate codes in dicom schemas

- Add base dicom schema definition for reusable - Add DicomSchemaOptionsFactory - The not implemented function need to implement in each schema
Chinlinlee · Nov 5, 2023 · 2f7c950 · 2f7c950
1 parent a9676d8
commit 2f7c950
Show file tree

Hide file tree

Showing 6 changed files with 512 additions and 598 deletions.
diff --git a/models/mongodb/deleteSchedule.js b/models/mongodb/deleteSchedule.js
@@ -44,7 +44,7 @@ async function deleteExpireStudies() {
                 deletedStudy.delete()
             ]);
 
-            await deletedStudy.deleteStudyFolder();
+            await deletedStudy.deleteDicomInstances();
         }
     }
 }
@@ -74,7 +74,7 @@ async function deleteExpireSeries() {
                 aDeletedSeries.delete()
             ]);
 
-            await aDeletedSeries.deleteSeriesFolder();
+            await aDeletedSeries.deleteDicomInstances();
         }
     }
 }
@@ -94,8 +94,8 @@ async function deleteExpireInstances() {
         let diff = now.diff(updateAtDate, "days");
         if (diff >= 30) {
             logger.info("delete expired instance: " + instanceUID);
-            await deletedInstance.deleteInstance();
             await deletedInstance.delete();
+            await deletedInstance.deleteDicomInstances();
         }
     }
 }