refactor(workflow.service): enhance final state detection logic

Author: tomer-shvadron

apps/kyb-app/src/pages/CollectionFlow/versions/v2/CollectionFlowV2.tsx

@@ -61,31 +61,21 @@ export const CollectionFlowV2 = withSessionProtected(() => {
     setLogoLoaded(false);
   }, [customer?.logoImageUri]);
 
-  if (
-    getCollectionFlowState(collectionFlowData?.context)?.status ===
-    CollectionFlowStatusesEnum.approved
-  ) {
+  const collectionFlowState = getCollectionFlowState(collectionFlowData?.context)?.status;
+
+  if (collectionFlowState === CollectionFlowStatusesEnum.approved) {
     return <Approved />;
   }
 
-  if (
-    getCollectionFlowState(collectionFlowData?.context)?.status ===
-    CollectionFlowStatusesEnum.rejected
-  ) {
+  if (collectionFlowState === CollectionFlowStatusesEnum.rejected) {
     return <Rejected />;
   }
 
-  if (
-    getCollectionFlowState(collectionFlowData?.context)?.status ===
-    CollectionFlowStatusesEnum.completed
-  ) {
+  if (collectionFlowState === CollectionFlowStatusesEnum.completed) {
     return <CompletedScreen redirectUrl={successRedirectUrl} />;
   }
 
-  if (
-    getCollectionFlowState(collectionFlowData?.context)?.status ===
-    CollectionFlowStatusesEnum.failed
-  ) {
+  if (collectionFlowState === CollectionFlowStatusesEnum.failed) {
     return <FailedScreen redirectUrl={failureRedirectUrl} />;
   }
 

services/workflows-service/prisma/data-migrations

@@ -63,6 +63,8 @@ import {
   isType,
   ProcessStatus,
   setCollectionFlowStatus,
+  StateTag,
+  TStateTag,
   TWorkflowHelpers,
 } from '@ballerine/common';
 import {
@@ -1389,10 +1391,20 @@ export class WorkflowService {
       // assign runtime to user, copy the context.
       const currentState = data.state;
 
+      const finalStateTags: TStateTag[] = [StateTag.APPROVED, StateTag.REJECTED];
+
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      // TODO: Use snapshot.done instead
-      const isFinal = workflowDef.definition?.states?.[currentState]?.type === 'final';
+      const stateHasFinalStateTags = workflowDef.definition?.states?.[currentState]?.tags?.some(
+        (tag: TStateTag) => finalStateTags.includes(tag),
+      );
+
+      const isFinal =
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        // TODO: Use snapshot.done instead
+        workflowDef.definition?.states?.[currentState]?.type === 'final' || stateHasFinalStateTags;
+
       const isResolved = isFinal || data.status === WorkflowRuntimeDataStatus.completed;
 
       const customer = await this.customerService.getByProjectId(projectId);