feat: refactor

Author: chesterkmr

apps/backoffice-v2/public/locales/en/toast.json

@@ -11,6 +11,10 @@
     "success": "The case has been approved successfully.",
     "error": "Error occurred while approving the case."
   },
+  "approve_individual": {
+    "success": "The individual has been approved successfully.",
+    "error": "Error occurred while approving the individual."
+  },
   "reject_case": {
     "success": "The case has been rejected successfully.",
     "error": "Error occurred while rejecting the case."

apps/backoffice-v2/src/domains/individuals/fetchers.ts

@@ -93,8 +93,8 @@ export const getEndUsersByIds = async ({ ids }: { ids: string[] }) => {
 };
 
 export type TIndividualDecision =
-  | `${typeof EndUserApprovalState.APPROVED}`
-  | `${typeof EndUserApprovalState.REJECTED}`;
+  | typeof EndUserApprovalState.APPROVED
+  | typeof EndUserApprovalState.REJECTED;
 
 export const updateIndividualApprovalDecision = async ({
   endUserId,
@@ -108,7 +108,6 @@ export const updateIndividualApprovalDecision = async ({
     method: Method.POST,
     schema: EndUserSchema,
     body: {
-      endUserId,
       decision,
     },
   });

apps/backoffice-v2/src/domains/individuals/mutations/useMutateIndividualApprovalDecision/useMutateIndividualApprovalDecision.ts

@@ -4,6 +4,7 @@ import { toast } from 'sonner';
 import { t } from 'i18next';
 import { queryClient } from '@/lib/react-query/query-client';
 import { workflowsQueryKeys } from '@/domains/workflows/query-keys';
+import { endUsersQueryKeys } from '../../query-keys';
 
 export const useMutateIndividualApprovalDecision = () => {
   return useMutation({
@@ -19,13 +20,18 @@ export const useMutateIndividualApprovalDecision = () => {
         decision,
       });
     },
-    onSuccess: () => {
+    onSuccess: endUser => {
       void queryClient.invalidateQueries(workflowsQueryKeys._def);
+      void queryClient.invalidateQueries(endUsersQueryKeys._def);
 
-      toast.success(t('toast:approve_case.success'));
+      if (endUser?.id) {
+        void queryClient.invalidateQueries(endUsersQueryKeys.byId({ id: endUser.id }));
+      }
+
+      toast.success(t('toast:approve_individual.success'));
     },
     onError: () => {
-      toast.error(t('toast:approve_case.error'));
+      toast.error(t('toast:approve_individual.error'));
     },
   });
 };

apps/backoffice-v2/src/lib/blocks/components/KycBlock/hooks/useKycBlock/useKycBlock.tsx

@@ -304,7 +304,7 @@ export const useKycBlock = ({
   const badgeClassNames = 'text-sm font-bold';
 
   const getDecisionStatusOrAction = (status: TIndividualKycCheckStatus | undefined) => {
-    if (status === INDIVIDUAL_KYC_CHECK_STATUS_ENUM.revision) {
+    if (status === INDIVIDUAL_KYC_CHECK_STATUS_ENUM.REVISION) {
       return createBlocksTyped()
         .addBlock()
         .addCell({
@@ -319,7 +319,7 @@ export const useKycBlock = ({
         .buildFlat();
     }
 
-    if (status === INDIVIDUAL_KYC_CHECK_STATUS_ENUM.approved) {
+    if (status === INDIVIDUAL_KYC_CHECK_STATUS_ENUM.APPROVED) {
       return createBlocksTyped()
         .addBlock()
         .addCell({
@@ -334,7 +334,7 @@ export const useKycBlock = ({
         .buildFlat();
     }
 
-    if (status === INDIVIDUAL_KYC_CHECK_STATUS_ENUM.rejected) {
+    if (status === INDIVIDUAL_KYC_CHECK_STATUS_ENUM.REJECTED) {
       return createBlocksTyped()
         .addBlock()
         .addCell({
@@ -349,7 +349,7 @@ export const useKycBlock = ({
         .buildFlat();
     }
 
-    if (status === INDIVIDUAL_KYC_CHECK_STATUS_ENUM.pending) {
+    if (status === INDIVIDUAL_KYC_CHECK_STATUS_ENUM.PENDING) {
       return createBlocksTyped()
         .addBlock()
         .addCell({

apps/backoffice-v2/src/lib/blocks/variants/DefaultBlocks/hooks/useCaseBlocksLogic/utils/compute-individual-kyc-check-status.ts

@@ -3,29 +3,29 @@ import { TWorkflowById } from '@/domains/workflows/fetchers';
 import { ObjectValues, StateTag } from '@ballerine/common';
 
 export const INDIVIDUAL_KYC_CHECK_STATUS_ENUM = {
-  revision: 'revision',
-  approved: 'approved',
-  rejected: 'rejected',
-  pending: 'pending',
+  REVISION: 'revision',
+  APPROVED: 'approved',
+  REJECTED: 'rejected',
+  PENDING: 'pending',
 } as const;
 
 export type TIndividualKycCheckStatus = ObjectValues<typeof INDIVIDUAL_KYC_CHECK_STATUS_ENUM>;
 
 const getStatusFromTags = (tags: string[]) => {
   if (tags?.includes(StateTag.REVISION)) {
-    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.revision;
+    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.REVISION;
   }
 
   if (tags?.includes(StateTag.APPROVED)) {
-    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.approved;
+    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.APPROVED;
   }
 
   if (tags?.includes(StateTag.REJECTED)) {
-    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.rejected;
+    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.REJECTED;
   }
 
   if (tags?.includes(StateTag.PENDING_PROCESS)) {
-    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.pending;
+    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.PENDING;
   }
 };
 
@@ -37,7 +37,7 @@ export const computeIndividualKycCheckStatus = ({
   tags: TWorkflowById['tags'];
 }): TIndividualKycCheckStatus | undefined => {
   if (endUser?.individualVerificationsChecks?.status === 'in-progress') {
-    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.pending;
+    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.PENDING;
   }
 
   if (
@@ -48,10 +48,10 @@ export const computeIndividualKycCheckStatus = ({
   }
 
   if (endUser?.approvalState === EndUserApprovalState.APPROVED) {
-    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.approved;
+    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.APPROVED;
   }
 
   if (endUser?.approvalState === EndUserApprovalState.REJECTED) {
-    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.rejected;
+    return INDIVIDUAL_KYC_CHECK_STATUS_ENUM.REJECTED;
   }
 };

apps/backoffice-v2/src/lib/blocks/variants/DefaultBlocks/hooks/useCaseBlocksLogic/utils/useTabsToBlocksMap.tsx

@@ -195,7 +195,7 @@ export const useTabsToBlocksMap = ({
         ...additionalInfoRest
       } = additionalInfo ?? {};
       const status = computeIndividualKycCheckStatus({
-        endUser: endUser,
+        endUser,
         tags: childWorkflow?.tags ?? [],
       });
       const kycSession = omitPropsFromObject(
@@ -262,7 +262,7 @@ export const useTabsToBlocksMap = ({
           ({ ids }: { ids: string[] }) =>
           () =>
             mutateIndividualApprovalDecision({
-              endUserId: childWorkflow?.context?.entity?.data?.ballerineEntityId,
+              endUserId: endUser?.id!,
               decision: EndUserApprovalState.APPROVED,
             }),
         onReuploadNeeded:
@@ -422,7 +422,7 @@ export const useTabsToBlocksMap = ({
           const endUser = endUsers?.find(endUser => endUser.id === director.ballerineEntityId);
           const { amlHits, individualVerificationsChecks, ...directorEndUser } = endUser ?? {};
           const status = computeIndividualKycCheckStatus({
-            endUser: endUser,
+            endUser,
             tags: [],
           });
 
@@ -455,7 +455,7 @@ export const useTabsToBlocksMap = ({
         ...personOfInterestEndUser
       } = endUser ?? {};
       const status = computeIndividualKycCheckStatus({
-        endUser: endUser,
+        endUser,
         tags: [],
       });
       const kycSession = omitPropsFromObject(

services/workflows-service/src/end-user/end-user.service.ts

@@ -2,7 +2,7 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 import { EndUserRepository } from './end-user.repository';
 import { EndUserCreateDto } from '@/end-user/dtos/end-user-create';
 import type { PrismaTransaction, TProjectId, TProjectIds } from '@/types';
-import { ProjectScopeService } from '@/project/project-scope.service';
+import { assertIsValidProjectIds, ProjectScopeService } from '@/project/project-scope.service';
 import { ApprovalState, Business, BusinessPosition, EndUser, Prisma } from '@prisma/client';
 import { EndUserActiveMonitoringsSchema, EndUserAmlHitsSchema } from '@ballerine/common';
 
@@ -118,6 +118,8 @@ export class EndUserService {
   }
 
   async updateDecisionById(id: string, decision: ApprovalState, projectIds: TProjectIds) {
+    assertIsValidProjectIds(projectIds);
+
     const endUser = await this.repository.findById(id, {}, projectIds);
 
     const isApprovedOrRejected = [ApprovalState.APPROVED, ApprovalState.REJECTED].includes(