app: fix possible migration issues, #TASK-6445

opencb · Nov 13, 2024 · 93c141b · 93c141b
1 parent 3f37761
commit 93c141b
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/...org/opencb/opencga/app/migrations/v4/v4_0_0/catalog/JobModelChangesMigrationTask6445.java b/...org/opencb/opencga/app/migrations/v4/v4_0_0/catalog/JobModelChangesMigrationTask6445.java
@@ -19,15 +19,25 @@ public class JobModelChangesMigrationTask6445 extends MigrationTool {
 
     @Override
     protected void run() throws Exception {
-        Bson query = Filters.exists("type", false);
-        Bson update = Updates.combine(
-                Updates.set("type", "NATIVE"),
-                Updates.set("tool.minimumRequirements", new Document()),
-                Updates.set("execution.dependencies", Collections.emptyList())
+        Bson typeQuery = Filters.exists("type", false);
+        Bson typeUpdate = Updates.set("type", "NATIVE");
+
+        Bson requirementsQuery = Filters.and(
+                Filters.exists("tool.id"),
+                Filters.exists("tool.minimumRequirements", false)
+        );
+        Bson requirementsUpdate = Updates.set("tool.minimumRequirements", new Document());
+
+        Bson dependenciesQuery = Filters.and(
+                Filters.exists("execution.executor"),
+                Filters.exists("execution.dependencies", false)
         );
+        Bson dependenciesUpdate = Updates.set("execution.dependencies", Collections.emptyList());
         for (String collection : Arrays.asList(OrganizationMongoDBAdaptorFactory.JOB_COLLECTION,
                 OrganizationMongoDBAdaptorFactory.DELETED_JOB_COLLECTION)) {
-            getMongoCollection(collection).updateMany(query, update);
+            getMongoCollection(collection).updateMany(typeQuery, typeUpdate);
+            getMongoCollection(collection).updateMany(requirementsQuery, requirementsUpdate);
+            getMongoCollection(collection).updateMany(dependenciesQuery, dependenciesUpdate);
         }
     }