Merge pull request #3541 from OriginTrail/v8/query-both-new-and-old-r…

…epos-while-migration Query both new and old repos while migration
OriginTrail · Dec 19, 2024 · b23b51d · b23b51d
2 parents 7124a22 + d7cb03b
commit b23b51d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/src/commands/query/query-command.js b/src/commands/query/query-command.js
@@ -47,6 +47,7 @@ class QueryCommand extends Command {
         //         query = query.replace(repositoryInOriginalQuery, federatedQueryRepositoryName);
         //     }
         // }
+
         try {
             switch (queryType) {
                 case QUERY_TYPES.CONSTRUCT: {
@@ -66,7 +67,19 @@ class QueryCommand extends Command {
                         OPERATION_ID_STATUS.QUERY.QUERY_SELECT_QUERY_START,
                         operationId,
                     );
-                    data = await this.tripleStoreService.select(query, repository);
+
+                    if (Array.isArray(repository)) {
+                        const dataV6 = await this.tripleStoreService.select(query, repository[0]);
+                        const dataV8 = await this.tripleStoreService.select(query, repository[1]);
+
+                        data = this.dataService.removeDuplicateObjectsFromArray([
+                            ...dataV6,
+                            ...dataV8,
+                        ]);
+                    } else {
+                        data = await this.tripleStoreService.select(query, repository);
+                    }
+
                     this.operationIdService.emitChangeEvent(
                         OPERATION_ID_STATUS.QUERY.QUERY_SELECT_QUERY_END,
                         operationId,

diff --git a/src/controllers/http-api/v0/query-http-api-controller-v0.js b/src/controllers/http-api/v0/query-http-api-controller-v0.js
@@ -45,7 +45,7 @@ class QueryController extends BaseController {
                 queryType,
                 repository:
                     !tripleStoreMigrationAlreadyExecuted && repository
-                        ? repository
+                        ? [repository, TRIPLE_STORE_REPOSITORIES.DKG]
                         : TRIPLE_STORE_REPOSITORIES.DKG,
                 operationId,
             },

diff --git a/src/controllers/http-api/v1/query-http-api-controller-v1.js b/src/controllers/http-api/v1/query-http-api-controller-v1.js
@@ -45,7 +45,7 @@ class QueryController extends BaseController {
                 queryType,
                 repository:
                     !tripleStoreMigrationAlreadyExecuted && repository
-                        ? repository
+                        ? [repository, TRIPLE_STORE_REPOSITORIES.DKG]
                         : TRIPLE_STORE_REPOSITORIES.DKG,
                 operationId,
             },

diff --git a/src/service/data-service.js b/src/service/data-service.js
@@ -149,6 +149,18 @@ class DataService {
         array.splice(left, 0, str);
         return left;
     }
+
+    removeDuplicateObjectsFromArray(array) {
+        const seen = new Set();
+        return array.filter((item) => {
+            const key = Object.values(item).join('_');
+            if (seen.has(key)) {
+                return false;
+            }
+            seen.add(key);
+            return true;
+        });
+    }
 }
 
 export default DataService;