ballerine-io · liorzam · Nov 16, 2024 · Nov 16, 2024 · Nov 16, 2024 · Nov 16, 2024
diff --git a/apps/backoffice-v2/src/domains/transactions/fetchers.ts b/apps/backoffice-v2/src/domains/transactions/fetchers.ts
@@ -178,7 +178,7 @@ export const TransactionsListSchema = z.array(
 export type TTransactionsList = z.output<typeof TransactionsListSchema>;
 
 export const fetchTransactions = async (params: {
-  counterpartyId: string;
+  counterpartyId?: string;
   page: {
     number: number;
     size: number;

diff --git a/...e-v2/src/domains/transactions/hooks/queries/useTransactionsQuery/useTransactionsQuery.tsx b/...e-v2/src/domains/transactions/hooks/queries/useTransactionsQuery/useTransactionsQuery.tsx
@@ -9,7 +9,7 @@ export const useTransactionsQuery = ({
   pageSize,
 }: {
   alertId: string;
-  counterpartyId: string;
+  counterpartyId?: string;
   page: number;
   pageSize: number;
 }) => {
@@ -22,7 +22,7 @@ export const useTransactionsQuery = ({
       page,
       pageSize,
     }),
-    enabled: isAuthenticated && !!counterpartyId,
+    enabled: isAuthenticated,
     staleTime: 100_000,
   });
 };
diff --git a/apps/backoffice-v2/src/domains/transactions/query-keys.ts b/apps/backoffice-v2/src/domains/transactions/query-keys.ts
@@ -8,7 +8,7 @@ export const transactionsQueryKeys = createQueryKeys('transactions', {
     ...params
   }: {
     alertId: string;
-    counterpartyId: string;
+    counterpartyId?: string;
     page: number;
     pageSize: number;
   }) => {

diff --git a/...tionMonitoringAlertsAnalysisPageLogic/useTransactionMonitoringAlertsAnalysisPageLogic.tsx b/...tionMonitoringAlertsAnalysisPageLogic/useTransactionMonitoringAlertsAnalysisPageLogic.tsx
@@ -5,19 +5,18 @@ import { useTransactionsQuery } from '@/domains/transactions/hooks/queries/useTr
 import { useCallback } from 'react';
 
 export const useTransactionMonitoringAlertsAnalysisPageLogic = () => {
-  const [{ businessId, counterpartyId }] = useSerializedSearchParams();
+  const [{ counterpartyId }] = useSerializedSearchParams();
   const { alertId } = useParams();
   const { data: alertDefinition, isLoading: isLoadingAlertDefinition } =
     useAlertDefinitionByAlertIdQuery({
       alertId: alertId ?? '',
     });
   const { data: transactions } = useTransactionsQuery({
-    alertId: alertId ?? '',
-    businessId: businessId ?? '',
+    alertId: alertId?.toString() ?? '',
     // @TODO: Remove
     counterpartyId: counterpartyId ?? '',
     page: 1,
-    pageSize: 50,
+    pageSize: 500,
   });
   const navigate = useNavigate();
   const onNavigateBack = useCallback(() => {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/services/workflows-service/jest.config.cjs b/services/workflows-service/jest.config.cjs
@@ -1,6 +1,7 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  testTimeout: 30000,
   modulePathIgnorePatterns: ['<rootDir>/dist/'],
   testRegex: '(/__tests__/.*|(\\.|/)(unit|e2e|intg)\\.test)\\.ts$',
   moduleNameMapper: {

diff --git a/services/workflows-service/package.json b/services/workflows-service/package.json
@@ -86,6 +86,7 @@
     "csv-parse": "^5.5.6",
     "dayjs": "^1.11.6",
     "deep-diff": "^1.0.2",
+    "deepmerge": "^4.3.0",
     "file-type": "^16.5.4",
     "helmet": "^6.0.1",
     "i18n-iso-countries": "^7.6.0",

diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations
diff --git a/...ions/20241021185057_add_alerts_counterparty_relation_for_advanced_filtering/migration.sql b/...ions/20241021185057_add_alerts_counterparty_relation_for_advanced_filtering/migration.sql
@@ -0,0 +1,15 @@
+-- AlterTable
+ALTER TABLE "Alert" ADD COLUMN     "counterpartyBeneficiaryId" TEXT,
+ADD COLUMN     "counterpartyOriginatorId" TEXT;
+
+-- CreateIndex
+CREATE INDEX "Alert_counterpartyOriginatorId_idx" ON "Alert"("counterpartyOriginatorId");
+
+-- CreateIndex
+CREATE INDEX "Alert_counterpartyBeneficiaryId_idx" ON "Alert"("counterpartyBeneficiaryId");
+
+-- AddForeignKey
+ALTER TABLE "Alert" ADD CONSTRAINT "Alert_counterpartyOriginatorId_fkey" FOREIGN KEY ("counterpartyOriginatorId") REFERENCES "Counterparty"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Alert" ADD CONSTRAINT "Alert_counterpartyBeneficiaryId_fkey" FOREIGN KEY ("counterpartyBeneficiaryId") REFERENCES "Counterparty"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/services/workflows-service/prisma/schema.prisma b/services/workflows-service/prisma/schema.prisma
@@ -834,9 +834,15 @@ model Alert {
   workflowRuntimeDataId String?
   workflowRuntimeData   WorkflowRuntimeData? @relation(fields: [workflowRuntimeDataId], references: [id], onUpdate: Cascade, onDelete: NoAction)
 
+  // TODO: Remove this field after data migration
   counterpartyId String?
   counterparty   Counterparty? @relation(fields: [counterpartyId], references: [id])
 
+  counterpartyOriginatorId String?
+  counterpartyBeneficiaryId String?
+  counterpartyOriginator   Counterparty? @relation(name: "counterpartyAlertOriginator", fields: [counterpartyOriginatorId], references: [id])
+  counterpartyBeneficiary   Counterparty? @relation(name: "counterpartyAlertBeneficiary", fields: [counterpartyBeneficiaryId], references: [id])
+
   businessId String?
   business   Business? @relation(fields: [businessId], references: [id])
 
@@ -845,6 +851,9 @@ model Alert {
   @@index([alertDefinitionId])
   @@index([counterpartyId])
   @@index([createdAt(sort: Desc)])
+
+  @@index([counterpartyOriginatorId])
+  @@index([counterpartyBeneficiaryId])
 }
 
 enum RiskCategory {
@@ -888,6 +897,9 @@ model Counterparty {
   benefitingTransactions  TransactionRecord[] @relation("BenefitingCounterparty")
   alerts                  Alert[]
 
+  alertsBenefiting                  Alert[] @relation("counterpartyAlertBeneficiary")
+  alertsOriginating                 Alert[] @relation("counterpartyAlertOriginator")
+
   projectId String
   project   Project @relation(fields: [projectId], references: [id])