From 7c2db0e21d41a2cfd42b2059318a233a19cd4547 Mon Sep 17 00:00:00 2001
From: Zvonimir <zvonimir@Zvonimirs-MacBook-Pro.local>
Date: Fri, 27 Dec 2024 16:14:44 +0100
Subject: [PATCH] Fix fetching v6 assertion first

---
 .../v1-0-0-handle-get-request-command.js      | 61 +++++++++++--------
 1 file changed, 34 insertions(+), 27 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
index 1b76bdad7..731356946 100644
--- 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
@@ -125,43 +125,50 @@ class HandleGetRequestCommand extends HandleProtocolMessageCommand {
 
         if (assertionId) {
             // DO NOT RUN THIS IF !assertionId
-            assertionPromise = this.tripleStoreService
-                .getV6Assertion(TRIPLE_STORE_REPOSITORIES.PUBLIC_CURRENT, assertionId)
-                .then(async (result) => {
-                    if (!result?.length) {
-                        this.logger.info(
-                            `No V6 assertion found for assertionId: ${assertionId}, falling back to V8 getAssertion`,
-                        );
+            assertionPromise = (async () => {
+                let result = null;
+
+                if (!isOperationV0) {
+                    result = await this.tripleStoreService.getAssertion(
+                        blockchain,
+                        contract,
+                        knowledgeCollectionId,
+                        knowledgeAssetId,
+                        TRIPLES_VISIBILITY.PUBLIC,
+                    );
+                }
 
-                        const fallbackResult = await this.tripleStoreService.getAssertion(
+                if (!result?.length) {
+                    // eslint-disable-next-line no-await-in-loop
+                    result = await this.tripleStoreService.getV6Assertion(
+                        TRIPLE_STORE_REPOSITORIES.PUBLIC_CURRENT,
+                        assertionId,
+                    );
+                    if (result?.length && !isOperationV0) {
+                        notMigrated = true;
+                    }
+
+                    if (!result?.length && isOperationV0) {
+                        result = await this.tripleStoreService.getAssertion(
                             blockchain,
                             contract,
                             knowledgeCollectionId,
                             knowledgeAssetId,
                             TRIPLES_VISIBILITY.PUBLIC,
                         );
-
-                        this.operationIdService.emitChangeEvent(
-                            OPERATION_ID_STATUS.GET.GET_REMOTE_GET_ASSERTION_END,
-                            operationId,
-                            blockchain,
-                        );
-
-                        return fallbackResult;
-                    }
-
-                    if (!isOperationV0) {
-                        notMigrated = true;
                     }
+                }
 
-                    this.operationIdService.emitChangeEvent(
-                        OPERATION_ID_STATUS.GET.GET_REMOTE_GET_ASSERTION_END,
-                        operationId,
-                        blockchain,
-                    );
+                this.operationIdService.emitChangeEvent(
+                    OPERATION_ID_STATUS.GET.GET_REMOTE_GET_ASSERTION_END,
+                    operationId,
+                    blockchain,
+                );
 
-                    return result.split('\n').filter((res) => res.length > 0);
-                });
+                return typeof result === 'string'
+                    ? result.split('\n').filter((res) => res.length > 0)
+                    : result;
+            })();
         } else {
             if (!knowledgeAssetId) {
                 try {