wip

Signed-off-by: bnechyporenko <bnechyporenko@bol.com>

plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.test.ts

@@ -16,7 +16,7 @@
 
 import { DatabaseManager } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
-import { DatabaseTaskStore } from './DatabaseTaskStore';
+import { DatabaseTaskStore, RawDbTaskEventRow } from './DatabaseTaskStore';
 import { TaskSpec } from '@backstage/plugin-scaffolder-common';
 import { ConflictError } from '@backstage/errors';
 import { createMockDirectory } from '@backstage/backend-test-utils';
@@ -267,6 +267,48 @@ describe('DatabaseTaskStore', () => {
     expect(event.type).toBe('log');
   });
 
+  it('should be able to retied cancelled recoverable task', async () => {
+    const { store, manager } = await createStore();
+    const client = await manager.getClient();
+
+    const { taskId } = await store.createTask({
+      spec: {
+        EXPERIMENTAL_recovery: { EXPERIMENTAL_strategy: 'startOver' },
+      } as TaskSpec,
+      createdBy: 'me#too',
+    });
+    await store.completeTask({ taskId, status: 'cancelled', eventBody: {} });
+
+    await store.retryTask?.({ taskId });
+
+    const taskAfterRetry = await store.getTask(taskId);
+    expect(taskAfterRetry.status).toBe('open');
+
+    expect(
+      await client<RawDbTaskEventRow>('task_events')
+        .where({
+          task_id: taskId,
+          event_type: 'recovered',
+        })
+        .select(['body', 'event_type', 'task_id']),
+    ).toEqual([
+      {
+        body: JSON.stringify({ recoverStrategy: 'startOver' }),
+        event_type: 'recovered',
+        task_id: taskId,
+      },
+    ]);
+
+    expect(
+      await client<RawDbTaskEventRow>('task_events')
+        .where({
+          task_id: taskId,
+        })
+        .andWhere(q => q.whereIn('event_type', ['cancelled', 'completion']))
+        .select(['body', 'event_type', 'task_id']),
+    ).toEqual([]);
+  });
+
   it('should complete the task', async () => {
     const { store } = await createStore();
     const { taskId } = await store.createTask({

plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts

@@ -618,6 +618,12 @@ export class DatabaseTaskStore implements TaskStore {
       for (const { id, spec } of result) {
         const taskSpec = JSON.parse(spec as string) as TaskSpec;
 
+        /**
+         * Once task is picked up, all event types are replayed.
+         * We have to remove cancelled or completion event_type as these are as actions for frontend to perform.
+         * In contrary, we send 'recovered' event_type to reset the state on the frontend side.
+         *
+         */
         await tx<RawDbTaskEventRow>('task_events')
           .where('task_id', id)
           .andWhere(q => q.whereIn('event_type', ['cancelled', 'completion']))