From 09c87cd763874edaef838f424ff404959ac785cc Mon Sep 17 00:00:00 2001
From: Tomer Shvadron <tomers@ballerine.com>
Date: Wed, 1 May 2024 14:29:32 +0300
Subject: [PATCH 1/4] feat: added new columns in alerts table

---
 .../TextWithNAFallback/TextWithNAFallback.tsx |  1 +
 .../src/domains/alerts/fetchers.ts            |  7 +++-
 .../components/AlertsTable/AlertsTable.tsx    |  4 +-
 .../components/AlertsTable/columns.tsx        | 37 ++++++++++++++++++-
 .../workflows-service/prisma/data-migrations  |  2 +-
 .../src/alert/alert.controller.external.ts    |  4 ++
 services/workflows-service/src/alert/types.ts |  6 +--
 7 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/apps/backoffice-v2/src/common/components/atoms/TextWithNAFallback/TextWithNAFallback.tsx b/apps/backoffice-v2/src/common/components/atoms/TextWithNAFallback/TextWithNAFallback.tsx
index 3bba3e2a0d..6a94efd0ce 100644
--- a/apps/backoffice-v2/src/common/components/atoms/TextWithNAFallback/TextWithNAFallback.tsx
+++ b/apps/backoffice-v2/src/common/components/atoms/TextWithNAFallback/TextWithNAFallback.tsx
@@ -34,5 +34,6 @@ export const TextWithNAFallback: TTextWithNAFallback = forwardRef(
     );
   },
 );
+
 // @ts-ignore
 TextWithNAFallback.displayName = 'TextWithNAFallback';
diff --git a/apps/backoffice-v2/src/domains/alerts/fetchers.ts b/apps/backoffice-v2/src/domains/alerts/fetchers.ts
index 8ae7da4f9f..aff7fe898c 100644
--- a/apps/backoffice-v2/src/domains/alerts/fetchers.ts
+++ b/apps/backoffice-v2/src/domains/alerts/fetchers.ts
@@ -76,7 +76,12 @@ export const AlertsListSchema = z.array(
   ObjectWithIdSchema.extend({
     dataTimestamp: z.string().datetime(),
     updatedAt: z.string().datetime(),
-    subject: ObjectWithIdSchema.extend({ name: z.string() }),
+    subject: ObjectWithIdSchema.extend({
+      id: z.string(),
+      name: z.string(),
+      correlationId: z.string(),
+      type: z.enum(['business', 'counterparty']),
+    }),
     severity: z.enum(AlertSeverities),
     label: z.string(),
     alertDetails: z.string(),
diff --git a/apps/backoffice-v2/src/pages/TransactionMonitoringAlerts/components/AlertsTable/AlertsTable.tsx b/apps/backoffice-v2/src/pages/TransactionMonitoringAlerts/components/AlertsTable/AlertsTable.tsx
index 92a4da77c1..e19a671491 100644
--- a/apps/backoffice-v2/src/pages/TransactionMonitoringAlerts/components/AlertsTable/AlertsTable.tsx
+++ b/apps/backoffice-v2/src/pages/TransactionMonitoringAlerts/components/AlertsTable/AlertsTable.tsx
@@ -29,7 +29,7 @@ export const AlertsTable: FunctionComponent<IAlertsTableProps> = ({ data }) => {
                   {headers.map(header => (
                     <TableHead
                       key={header.id}
-                      className={`sticky top-0 z-10 h-[34px] bg-white p-0 text-[14px] font-bold text-[#787981]`}
+                      className={`sticky top-0 z-10 h-[34px] bg-white p-1 text-[14px] font-bold text-[#787981]`}
                     >
                       {header.column.id === 'select' && (
                         <span className={'pe-4'}>
@@ -38,7 +38,7 @@ export const AlertsTable: FunctionComponent<IAlertsTableProps> = ({ data }) => {
                       )}
                       {header.column.id !== 'select' && (
                         <button
-                          className="flex h-9 flex-row items-center gap-x-2 px-3 text-[#A3A3A3]"
+                          className="flex h-9 flex-row items-center gap-x-2 px-3 text-left text-[#A3A3A3]"
                           onClick={() => header.column.toggleSorting()}
                         >
                           <span>
diff --git a/apps/backoffice-v2/src/pages/TransactionMonitoringAlerts/components/AlertsTable/columns.tsx b/apps/backoffice-v2/src/pages/TransactionMonitoringAlerts/components/AlertsTable/columns.tsx
index dead4b4478..8d3e2366e3 100644
--- a/apps/backoffice-v2/src/pages/TransactionMonitoringAlerts/components/AlertsTable/columns.tsx
+++ b/apps/backoffice-v2/src/pages/TransactionMonitoringAlerts/components/AlertsTable/columns.tsx
@@ -14,6 +14,8 @@ import { severityToClassName } from '@/pages/TransactionMonitoringAlerts/compone
 import { IndeterminateCheckbox } from '@/common/components/atoms/IndeterminateCheckbox/IndeterminateCheckbox';
 import { SnakeCase, titleCase } from 'string-ts';
 import { toScreamingSnakeCase } from '@/common/utils/to-screaming-snake-case/to-screaming-snake-case';
+import { useEllipsesWithTitle } from '@/common/hooks/useEllipsesWithTitle/useEllipsesWithTitle';
+import { buttonVariants } from '@/common/components/atoms/Button/Button';
 
 const columnHelper = createColumnHelper<
   TAlertsList[number] & {
@@ -84,6 +86,39 @@ export const columns = [
     },
     header: 'Subject',
   }),
+  columnHelper.accessor('subject.type', {
+    cell: info => {
+      const subjectType = info.getValue();
+
+      return (
+        <TextWithNAFallback className={`max-w-[12ch]`}>{titleCase(subjectType)}</TextWithNAFallback>
+      );
+    },
+    header: 'Subject Type',
+  }),
+  columnHelper.accessor('subject.correlationId', {
+    cell: info => {
+      // eslint-disable-next-line react-hooks/rules-of-hooks -- ESLint doesn't like `cell` not being `Cell`.
+      const { ref, styles } = useEllipsesWithTitle<HTMLSpanElement>();
+      const subjectId = info.getValue();
+
+      return (
+        <div className={`w-[11.8ch]`}>
+          <TextWithNAFallback
+            className={buttonVariants({
+              variant: 'link',
+              className: '!block cursor-pointer !p-0 text-sm !text-blue-500',
+            })}
+            style={styles}
+            ref={ref}
+          >
+            {subjectId}
+          </TextWithNAFallback>
+        </div>
+      );
+    },
+    header: 'Subject ID',
+  }),
   columnHelper.accessor('severity', {
     cell: info => {
       const severity = info.getValue();
@@ -108,7 +143,7 @@ export const columns = [
     cell: info => {
       const alertDetails = info.getValue();
 
-      return <TextWithNAFallback>{alertDetails}</TextWithNAFallback>;
+      return <TextWithNAFallback className={`max-w-[40ch]`}>{alertDetails}</TextWithNAFallback>;
     },
     header: 'Alert Details',
   }),
diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations
index ba704ed1de..fc39adb8e0 160000
--- a/services/workflows-service/prisma/data-migrations
+++ b/services/workflows-service/prisma/data-migrations
@@ -1 +1 @@
-Subproject commit ba704ed1dec6f80d0a5fdae9583ccdb0c8487297
+Subproject commit fc39adb8e0451ac4aa945da131d8d55d6dad7b53
diff --git a/services/workflows-service/src/alert/alert.controller.external.ts b/services/workflows-service/src/alert/alert.controller.external.ts
index 3e4fdbf8b4..b27aa2e631 100644
--- a/services/workflows-service/src/alert/alert.controller.external.ts
+++ b/services/workflows-service/src/alert/alert.controller.external.ts
@@ -107,11 +107,15 @@ export class AlertControllerExternal {
         alertDetails: alertDefinition.description,
         subject: counterparty.business
           ? {
+              type: 'business',
               id: counterparty.business.id,
               name: counterparty.business.companyName,
+              correlationId: counterparty.business.correlationId,
             }
           : {
+              type: 'counterparty',
               id: counterparty.endUser.id,
+              correlationId: counterparty.endUser.correlationId,
               name: `${counterparty.endUser.firstName} ${counterparty.endUser.lastName}`,
             },
         decision: state,
diff --git a/services/workflows-service/src/alert/types.ts b/services/workflows-service/src/alert/types.ts
index 18d8e7a4c5..d880442484 100644
--- a/services/workflows-service/src/alert/types.ts
+++ b/services/workflows-service/src/alert/types.ts
@@ -1,4 +1,4 @@
-import { Alert, AlertDefinition, Business, User } from '@prisma/client';
+import { Alert, AlertDefinition, Business, EndUser, User } from '@prisma/client';
 
 export type TExecutionDetails = {
   checkpoint: {
@@ -23,8 +23,8 @@ export type TAlertResponse = Alert & {
   alertDefinition: Pick<AlertDefinition, 'description' | 'label'>;
   assignee: Pick<User, 'id' | 'firstName' | 'lastName' | 'avatarUrl'>;
   counterparty: {
-    business: Pick<Business, 'id' | 'companyName'>;
-    endUser: Pick<User, 'id' | 'firstName' | 'lastName'>;
+    business: Pick<Business, 'id' | 'companyName' | 'correlationId'>;
+    endUser: Pick<EndUser, 'id' | 'firstName' | 'lastName' | 'correlationId'>;
   };
 };
 

From 8e18b930a9a9ef08e89fe5bffab6d73d78d70ae4 Mon Sep 17 00:00:00 2001
From: Tomer Shvadron <tomers@ballerine.com>
Date: Wed, 1 May 2024 15:55:03 +0300
Subject: [PATCH 2/4] Update apps/backoffice-v2/src/domains/alerts/fetchers.ts

Co-authored-by: Omri Levy <61207713+Omri-Levy@users.noreply.github.com>
---
 apps/backoffice-v2/src/domains/alerts/fetchers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/backoffice-v2/src/domains/alerts/fetchers.ts b/apps/backoffice-v2/src/domains/alerts/fetchers.ts
index aff7fe898c..0c89a9123f 100644
--- a/apps/backoffice-v2/src/domains/alerts/fetchers.ts
+++ b/apps/backoffice-v2/src/domains/alerts/fetchers.ts
@@ -77,7 +77,6 @@ export const AlertsListSchema = z.array(
     dataTimestamp: z.string().datetime(),
     updatedAt: z.string().datetime(),
     subject: ObjectWithIdSchema.extend({
-      id: z.string(),
       name: z.string(),
       correlationId: z.string(),
       type: z.enum(['business', 'counterparty']),

From c755543c7f5f511ddf51c642efed3cdd6f73c1d7 Mon Sep 17 00:00:00 2001
From: Tomer Shvadron <tomers@ballerine.com>
Date: Wed, 1 May 2024 16:28:12 +0300
Subject: [PATCH 3/4] feat(lint): lint

---
 services/workflows-service/src/alert/alert.service.intg.test.ts | 1 -
 .../src/alert/dtos/create-alert-definition.dto.ts               | 2 +-
 .../src/common/filters/HttpExceptions.filter.ts                 | 2 +-
 services/workflows-service/src/customer/customer.service.ts     | 2 +-
 services/workflows-service/src/data-analytics/types.ts          | 1 +
 services/workflows-service/src/errors.ts                        | 1 +
 services/workflows-service/src/test/helpers/nest-app-helper.ts  | 1 -
 .../src/transaction/dtos/transaction-create.dto.ts              | 1 -
 .../transaction/transaction.controller.external.intg.test.ts    | 2 --
 .../workflows-service/src/transaction/transaction.mapper.ts     | 2 ++
 services/workflows-service/src/webhooks/webhooks.service.ts     | 1 +
 11 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/services/workflows-service/src/alert/alert.service.intg.test.ts b/services/workflows-service/src/alert/alert.service.intg.test.ts
index cbfbd7d56a..94744414c2 100644
--- a/services/workflows-service/src/alert/alert.service.intg.test.ts
+++ b/services/workflows-service/src/alert/alert.service.intg.test.ts
@@ -24,7 +24,6 @@ import {
   ALERT_DEFINITIONS,
   getAlertDefinitionCreateData,
 } from '../../scripts/alerts/generate-alerts';
-import { TExecutionDetails } from './types';
 
 describe('AlertService', () => {
   let prismaService: PrismaService;
diff --git a/services/workflows-service/src/alert/dtos/create-alert-definition.dto.ts b/services/workflows-service/src/alert/dtos/create-alert-definition.dto.ts
index 66e6976031..72e72a5308 100644
--- a/services/workflows-service/src/alert/dtos/create-alert-definition.dto.ts
+++ b/services/workflows-service/src/alert/dtos/create-alert-definition.dto.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsNotEmpty, IsString, IsOptional, IsBoolean, IsEnum } from 'class-validator';
+import { IsNotEmpty, IsString, IsOptional, IsBoolean } from 'class-validator';
 
 export class CreateAlertDefinitionDto {
   @ApiProperty({ example: '[Payments] - High Cumulative Amount - Inbound' })
diff --git a/services/workflows-service/src/common/filters/HttpExceptions.filter.ts b/services/workflows-service/src/common/filters/HttpExceptions.filter.ts
index 731599d55f..3492f1648b 100644
--- a/services/workflows-service/src/common/filters/HttpExceptions.filter.ts
+++ b/services/workflows-service/src/common/filters/HttpExceptions.filter.ts
@@ -1,4 +1,4 @@
-import { ArgumentsHost, Catch, HttpException, HttpStatus } from '@nestjs/common';
+import { ArgumentsHost, Catch, HttpStatus } from '@nestjs/common';
 import { BaseExceptionFilter, HttpAdapterHost } from '@nestjs/core';
 import { Prisma } from '@prisma/client';
 import { PRISMA_UNIQUE_CONSTRAINT_ERROR } from '@/prisma/prisma.util';
diff --git a/services/workflows-service/src/customer/customer.service.ts b/services/workflows-service/src/customer/customer.service.ts
index 341d71b25b..58c18ae8b7 100644
--- a/services/workflows-service/src/customer/customer.service.ts
+++ b/services/workflows-service/src/customer/customer.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { CustomerRepository } from '@/customer/customer.repository';
-import { Prisma, Project } from '@prisma/client';
+import { Prisma } from '@prisma/client';
 import { TCustomerWithDefinitionsFeatures } from '@/customer/types';
 import { ApiKeyService } from '@/customer/api-key/api-key.service';
 import { generateHashedKey } from '@/customer/api-key/utils';
diff --git a/services/workflows-service/src/data-analytics/types.ts b/services/workflows-service/src/data-analytics/types.ts
index 3112dd62c8..0a94a234f0 100644
--- a/services/workflows-service/src/data-analytics/types.ts
+++ b/services/workflows-service/src/data-analytics/types.ts
@@ -1,5 +1,6 @@
 import { TransactionDirection, PaymentMethod, TransactionRecordType } from '@prisma/client';
 import { AggregateType, TIME_UNITS } from './consts';
+
 export type InlineRule = {
   id: string;
   subjects: string[] | readonly string[];
diff --git a/services/workflows-service/src/errors.ts b/services/workflows-service/src/errors.ts
index 2532cc36e1..f664a4ecc2 100644
--- a/services/workflows-service/src/errors.ts
+++ b/services/workflows-service/src/errors.ts
@@ -85,6 +85,7 @@ export class ValidationError extends common.BadRequestException {
 
   static fromClassValidator(error: ClassValidatorValidationError[]) {
     const childrens = error[0]?.children ? error[0].children : [];
+
     return new ValidationError(
       [...error, ...childrens].map(({ property, constraints = {} }) => ({
         message: `${Object.values(constraints).join(', ')}.`,
diff --git a/services/workflows-service/src/test/helpers/nest-app-helper.ts b/services/workflows-service/src/test/helpers/nest-app-helper.ts
index 500cedf5f1..d694d9fd88 100644
--- a/services/workflows-service/src/test/helpers/nest-app-helper.ts
+++ b/services/workflows-service/src/test/helpers/nest-app-helper.ts
@@ -12,7 +12,6 @@ import { AppLoggerModule } from '@/common/app-logger/app-logger.module';
 import { ClsMiddleware, ClsModule, ClsService } from 'nestjs-cls';
 import { AuthKeyMiddleware } from '@/common/middlewares/auth-key.middleware';
 import { CustomerModule } from '@/customer/customer.module';
-import { CustomerService } from '@/customer/customer.service';
 import { HttpModule } from '@nestjs/axios';
 import { ApiKeyService } from '@/customer/api-key/api-key.service';
 
diff --git a/services/workflows-service/src/transaction/dtos/transaction-create.dto.ts b/services/workflows-service/src/transaction/dtos/transaction-create.dto.ts
index 56ddf03741..8e6f7c76c5 100644
--- a/services/workflows-service/src/transaction/dtos/transaction-create.dto.ts
+++ b/services/workflows-service/src/transaction/dtos/transaction-create.dto.ts
@@ -12,7 +12,6 @@ import {
 } from '@prisma/client';
 import {
   IsBoolean,
-  IsDate,
   IsDateString,
   IsEnum,
   IsNotEmpty,
diff --git a/services/workflows-service/src/transaction/transaction.controller.external.intg.test.ts b/services/workflows-service/src/transaction/transaction.controller.external.intg.test.ts
index 4b90312b13..23ff5f2cc2 100644
--- a/services/workflows-service/src/transaction/transaction.controller.external.intg.test.ts
+++ b/services/workflows-service/src/transaction/transaction.controller.external.intg.test.ts
@@ -17,9 +17,7 @@ import {
   PaymentProcessor,
   PaymentType,
   Project,
-  ReviewStatus,
   TransactionDirection,
-  TransactionRecordStatus,
   TransactionRecordType,
 } from '@prisma/client';
 import { createProject } from '@/test/helpers/create-project';
diff --git a/services/workflows-service/src/transaction/transaction.mapper.ts b/services/workflows-service/src/transaction/transaction.mapper.ts
index 53b8cacecb..96fbb4a9c2 100644
--- a/services/workflows-service/src/transaction/transaction.mapper.ts
+++ b/services/workflows-service/src/transaction/transaction.mapper.ts
@@ -210,6 +210,7 @@ export class TransactionEntityMapper {
     };
 
     let brandName;
+
     if (altDto.tx_product.toLowerCase() in PaymentBrandName) {
       brandName = altDto.tx_product.toLowerCase() as PaymentBrandName;
     } else {
@@ -261,6 +262,7 @@ export class TransactionEntityMapper {
     }
 
     const errors = validateSync(Object.assign(new TransactionCreateDto(), originalDto));
+
     if (errors.length > 0) {
       throw new ValidationError(errors as any);
     } else {
diff --git a/services/workflows-service/src/webhooks/webhooks.service.ts b/services/workflows-service/src/webhooks/webhooks.service.ts
index 0fc9a06394..c12804e840 100644
--- a/services/workflows-service/src/webhooks/webhooks.service.ts
+++ b/services/workflows-service/src/webhooks/webhooks.service.ts
@@ -60,6 +60,7 @@ export class WebhooksService {
 
     if (!config?.ongoingWorkflowDefinitionId) {
       this.logger.error('No ongoing workflow definition found for project', { projectId });
+
       return;
     }
 

From 53ccf83c51ce7744a2c7d3e4453956dcce485554 Mon Sep 17 00:00:00 2001
From: Tomer Shvadron <tomers@ballerine.com>
Date: Wed, 1 May 2024 16:37:09 +0300
Subject: [PATCH 4/4] feat: merge fix

---
 services/workflows-service/src/errors.ts | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/services/workflows-service/src/errors.ts b/services/workflows-service/src/errors.ts
index f664a4ecc2..8694faccae 100644
--- a/services/workflows-service/src/errors.ts
+++ b/services/workflows-service/src/errors.ts
@@ -84,13 +84,32 @@ export class ValidationError extends common.BadRequestException {
   }
 
   static fromClassValidator(error: ClassValidatorValidationError[]) {
-    const childrens = error[0]?.children ? error[0].children : [];
+    const flattenedErrors = flattenValidationErrors(error);
 
     return new ValidationError(
-      [...error, ...childrens].map(({ property, constraints = {} }) => ({
+      flattenedErrors.map(({ property, constraints = {}, value }, index) => ({
         message: `${Object.values(constraints).join(', ')}.`,
+        value: index !== 0 ? value : {},
         path: property,
       })),
     );
   }
 }
+
+const flattenValidationErrors = (
+  errors: ClassValidatorValidationError[],
+): ClassValidatorValidationError[] => {
+  const flattenedErrors: ClassValidatorValidationError[] = [];
+
+  for (const error of errors) {
+    flattenedErrors.push(error);
+
+    if (error.children) {
+      for (const child of error.children) {
+        flattenedErrors.push(...flattenValidationErrors([child]));
+      }
+    }
+  }
+
+  return flattenedErrors;
+};