From 30258837b25ec3ff7ff66c997551a1ac3e2699d0 Mon Sep 17 00:00:00 2001
From: bnechyporenko <bnechyporenko@bol.com>
Date: Wed, 13 Mar 2024 14:59:18 +0100
Subject: [PATCH] Fixing the lost of the initial state after a task recovery.

Signed-off-by: bnechyporenko <bnechyporenko@bol.com>
---
 .../src/scaffolder/tasks/DatabaseTaskStore.test.ts            | 2 +-
 .../src/scaffolder/tasks/DatabaseTaskStore.ts                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts
index bd0b84227c..ab80dcff04 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts
@@ -196,7 +196,7 @@ describe('DatabaseTaskStore', () => {
     await store.claimTask();
 
     const claimedTask = await store.getTask(taskId);
-    expect(claimedTask.state).toEqual({ state });
+    expect(claimedTask.state).toEqual({ state: state.state });
   });
 
   it('should shutdown the running task', async () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
index 68f76cd3e4..752108cf6e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts
@@ -212,7 +212,7 @@ export class DatabaseTaskStore implements TaskStore {
     try {
       const spec = JSON.parse(result.spec);
       const secrets = result.secrets ? JSON.parse(result.secrets) : undefined;
-      const state = result.state ? JSON.parse(result.state) : undefined;
+      const state = result.state ? JSON.parse(result.state).state : undefined;
       return {
         id: result.id,
         spec,
@@ -272,7 +272,7 @@ export class DatabaseTaskStore implements TaskStore {
 
       const getState = () => {
         try {
-          return task.state ? JSON.parse(task.state) : undefined;
+          return task.state ? JSON.parse(task.state).state : undefined;
         } catch (error) {
           throw new Error(
             `Failed to parse state of the task '${task.id}', ${error}`,