Merge pull request #3568 from OriginTrail/fix/fixes-for-backwards-com…

…patibility Backwards compatibiltiy fixes
OriginTrail · Dec 20, 2024 · 55afd4f · 55afd4f
2 parents 6712b00 + 092fecb
commit 55afd4f
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 34 deletions.
diff --git a/src/commands/protocols/get/receiver/v1.0.0/v1-0-0-handle-get-request-command.js b/src/commands/protocols/get/receiver/v1.0.0/v1-0-0-handle-get-request-command.js
@@ -118,13 +118,6 @@ class HandleGetRequestCommand extends HandleProtocolMessageCommand {
                     ual,
                 );
 
-                if (!assertionId) {
-                    assertionId = await this.tripleStoreService.getLatestAssertionId(
-                        TRIPLE_STORE_REPOSITORIES.PRIVATE_CURRENT,
-                        ual,
-                    );
-                }
-
                 if (!assertionId) {
                     return {
                         messageType: NETWORK_MESSAGE_TYPES.RESPONSES.NACK,
@@ -144,7 +137,7 @@ class HandleGetRequestCommand extends HandleProtocolMessageCommand {
                         operationId,
                         blockchain,
                     );
-                    return result;
+                    return result.split('\n').filter((res) => res.length > 0);
                 });
         } else {
             assertionPromise = this.tripleStoreService

diff --git a/src/commands/protocols/get/sender/get-validate-asset-command.js b/src/commands/protocols/get/sender/get-validate-asset-command.js
@@ -1,6 +1,10 @@
 import ValidateAssetCommand from '../../../common/validate-asset-command.js';
 import Command from '../../../command.js';
-import { OPERATION_ID_STATUS, ERROR_TYPE } from '../../../../constants/constants.js';
+import {
+    OPERATION_ID_STATUS,
+    ERROR_TYPE,
+    OLD_CONTENT_STORAGE_MAP,
+} from '../../../../constants/constants.js';
 
 class GetValidateAssetCommand extends ValidateAssetCommand {
     constructor(ctx) {
@@ -49,30 +53,41 @@ class GetValidateAssetCommand extends ValidateAssetCommand {
             blockchain,
         );
         // TODO: Update to validate knowledge asset index
-        const isValidUal = isOperationV0
-            ? true
-            : await this.validationService.validateUal(blockchain, contract, knowledgeCollectionId);
-        this.operationIdService.emitChangeEvent(
-            OPERATION_ID_STATUS.GET.GET_VALIDATE_UAL_END,
-            operationId,
-            blockchain,
-        );
+        if (
+            !isOperationV0 &&
+            Object.values(OLD_CONTENT_STORAGE_MAP).every(
+                (ca) => !ca.toLowerCase().includes(contract.toLowerCase()),
+            )
+        ) {
+            const isValidUal = await this.validationService.validateUal(
+                blockchain,
+                contract,
+                knowledgeCollectionId,
+            );
 
-        if (!isValidUal) {
-            await this.handleError(
+            this.operationIdService.emitChangeEvent(
+                OPERATION_ID_STATUS.GET.GET_VALIDATE_UAL_END,
                 operationId,
                 blockchain,
-                `Get for operation id: ${operationId}, UAL: ${ual}: there is no asset with this UAL.`,
-                this.errorType,
             );
-            return Command.empty();
+
+            if (!isValidUal) {
+                await this.handleError(
+                    operationId,
+                    blockchain,
+                    `Get for operation id: ${operationId}, UAL: ${ual}: there is no asset with this UAL.`,
+                    this.errorType,
+                );
+                return Command.empty();
+            }
+
+            await this.operationIdService.updateOperationIdStatus(
+                operationId,
+                blockchain,
+                OPERATION_ID_STATUS.GET.GET_VALIDATE_ASSET_END,
+            );
         }
 
-        await this.operationIdService.updateOperationIdStatus(
-            operationId,
-            blockchain,
-            OPERATION_ID_STATUS.GET.GET_VALIDATE_ASSET_END,
-        );
         return this.continueSequence(
             {
                 ...command.data,

diff --git a/src/commands/protocols/get/sender/local-get-command.js b/src/commands/protocols/get/sender/local-get-command.js
@@ -104,7 +104,7 @@ class LocalGetCommand extends Command {
 
         if (assertionId) {
             assertionPromise = (async () => {
-                let result = null;
+                let result = {};
                 for (const repository of [
                     TRIPLE_STORE_REPOSITORIES.PRIVATE_CURRENT,
                     TRIPLE_STORE_REPOSITORIES.PUBLIC_CURRENT,
@@ -124,7 +124,7 @@ class LocalGetCommand extends Command {
                     );
                 }
 
-                return result;
+                return result.split('\n').filter((res) => res.length > 0);
             })();
         } else {
             assertionPromise = this.tripleStoreService

diff --git a/src/commands/protocols/publish/sender/publish-find-shard-command.js b/src/commands/protocols/publish/sender/publish-find-shard-command.js
@@ -20,9 +20,10 @@ class PublishFindShardCommand extends FindShardCommand {
 
     getOperationCommandSequence(nodePartOfShard, commandData) {
         const sequence = [];
-        sequence.push(
-            commandData.isOperationV0 ? 'validateAssetCommand' : 'publishValidateAssetCommand',
-        );
+        if (!commandData.isOperationV0) {
+            sequence.push('publishValidateAssetCommand');
+        }
+
         if (nodePartOfShard && !commandData.isOperationV0) {
             sequence.push('localStoreCommand');
         } else {

diff --git a/src/commands/query/query-command.js b/src/commands/query/query-command.js
@@ -55,7 +55,25 @@ class QueryCommand extends Command {
                         OPERATION_ID_STATUS.QUERY.QUERY_CONSTRUCT_QUERY_START,
                         operationId,
                     );
-                    data = await this.tripleStoreService.construct(query, repository);
+
+                    if (Array.isArray(repository)) {
+                        const dataV6 = await this.tripleStoreService.construct(
+                            query,
+                            repository[0],
+                        );
+                        const dataV8 = await this.tripleStoreService.construct(
+                            query,
+                            repository[1],
+                        );
+
+                        data = this.dataService.removeDuplicateObjectsFromArray([
+                            ...dataV6,
+                            ...dataV8,
+                        ]);
+                    } else {
+                        data = await this.tripleStoreService.construct(query, repository);
+                    }
+
                     this.operationIdService.emitChangeEvent(
                         OPERATION_ID_STATUS.QUERY.QUERY_CONSTRUCT_QUERY_END,
                         operationId,

diff --git a/src/controllers/http-api/v0/local-store-http-api-controller-v0.js b/src/controllers/http-api/v0/local-store-http-api-controller-v0.js
@@ -75,7 +75,7 @@ class LocalStoreController extends BaseController {
 
         await this.operationIdService.cacheOperationIdDataToFile(operationId, cachedAssertions);
 
-        const commandSequence = ['validateAssetCommand', 'localStoreCommand'];
+        const commandSequence = ['localStoreCommand'];
 
         await this.commandExecutor.add({
             name: commandSequence[0],