Notion schema fix and Cron schedule change (#2793)

* feat: notion schema fix and Cron schedule change * feat: test fix
ballerine-io · Oct 22, 2024 · 028dcb3 · 028dcb3
1 parent 5448ecd
commit 028dcb3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/packages/common/src/rule-engine/operators/enums.ts b/packages/common/src/rule-engine/operators/enums.ts
@@ -9,6 +9,7 @@ export const OPERATION = {
   LAST_YEAR: 'LAST_YEAR',
   EXISTS: 'EXISTS',
   IN: 'IN',
+  IN_CASE_INSENSITIVE: 'IN_CASE_INSENSITIVE',
   NOT_IN: 'NOT_IN',
   AML_CHECK: 'AML_CHECK',
 } as const;
@@ -24,6 +25,7 @@ export const OPERATIONS = [
   OPERATION.LAST_YEAR,
   OPERATION.EXISTS,
   OPERATION.IN,
+  OPERATION.IN_CASE_INSENSITIVE,
   OPERATION.NOT_IN,
   OPERATION.AML_CHECK,
 ];

diff --git a/packages/common/src/rule-engine/rules/schemas.ts b/packages/common/src/rule-engine/rules/schemas.ts
@@ -1,19 +1,20 @@
 import { z } from 'zod';
 
-import { OPERATION, OPERATOR } from '../operators/enums';
 import { RuleSet } from './types';
 import {
+  OPERATION,
+  OPERATOR,
   AmlCheckSchema,
   BetweenSchema,
   ExistsSchema,
   LastYearsSchema,
   PrimitiveArraySchema,
   PrimitiveSchema,
-} from '../operators/schemas';
+} from '@/rule-engine';
 
-export function getValues<T extends Record<string, unknown>>(obj: T) {
+export const getValues = <T extends Record<string, unknown>>(obj: T) => {
   return Object.values(obj) as [(typeof obj)[keyof T]];
-}
+};
 
 export const RuleSchema = z.discriminatedUnion('operator', [
   z.object({
@@ -79,6 +80,11 @@ export const RuleSchema = z.discriminatedUnion('operator', [
     operator: z.literal(OPERATION.IN),
     value: PrimitiveArraySchema,
   }),
+  z.object({
+    key: z.string(),
+    operator: z.literal(OPERATION.IN_CASE_INSENSITIVE),
+    value: PrimitiveArraySchema,
+  }),
   z.object({
     key: z.string(),
     operator: z.literal(OPERATION.NOT_IN),

diff --git a/packages/workflow-core/src/lib/plugins/common-plugin/types.ts b/packages/workflow-core/src/lib/plugins/common-plugin/types.ts
@@ -75,7 +75,7 @@ export interface RiskRulesPluginParams {
       id: string;
       domain: string;
       indicator: string;
-      riskLevel: 'critical' | 'moderate' | 'positive';
+      riskLevel: 'critical' | 'high' | 'moderate' | 'positive';
       baseRiskScore: number;
       additionalRiskScore: number;
       result: RuleResultSet;

diff --git a/services/workflows-service/prisma/data-migrations b/services/workflows-service/prisma/data-migrations
diff --git a/services/workflows-service/src/rule-engine/core/test/rule-engine.unit.test.ts b/services/workflows-service/src/rule-engine/core/test/rule-engine.unit.test.ts
@@ -119,12 +119,13 @@ describe('Rule Engine', () => {
               "LTE",
               "EXISTS",
               "IN",
+              "IN_CASE_INSENSITIVE",
               "NOT_IN"
             ],
             "path": [
               "operator"
             ],
-            "message": "Invalid discriminator value. Expected 'LAST_YEAR' | 'AML_CHECK' | 'EQUALS' | 'NOT_EQUALS' | 'BETWEEN' | 'GT' | 'LT' | 'GTE' | 'LTE' | 'EXISTS' | 'IN' | 'NOT_IN'"
+            "message": "Invalid discriminator value. Expected 'LAST_YEAR' | 'AML_CHECK' | 'EQUALS' | 'NOT_EQUALS' | 'BETWEEN' | 'GT' | 'LT' | 'GTE' | 'LTE' | 'EXISTS' | 'IN' | 'IN_CASE_INSENSITIVE' | 'NOT_IN'"
           }
         ],
         "name": "ZodError"

diff --git a/services/workflows-service/src/rule-engine/risk-rule.service.intg.test.ts b/services/workflows-service/src/rule-engine/risk-rule.service.intg.test.ts
@@ -1,5 +1,5 @@
 import { fetchServiceFromModule } from '@/test/helpers/nest-app-helper';
-import { NotionService } from './../notion/notion.service';
+import { NotionService } from '../notion/notion.service';
 import { RiskRuleService } from './risk-rule.service';
 
 // We should inject notion api key in order to run it during CI pipeline

diff --git a/services/workflows-service/src/rule-engine/risk-rule.service.ts b/services/workflows-service/src/rule-engine/risk-rule.service.ts
@@ -25,7 +25,7 @@ const NotionRiskRuleRecordSchema = z
       .pipe(RuleSetSchema),
     Domain: z.string().min(1),
     Indicator: z.string().min(1),
-    'Risk level': z.enum(['positive', 'moderate', 'critical']),
+    'Risk level': z.enum(['positive', 'moderate', 'high', 'critical']),
     'Base risk score': z.number().min(0).max(100),
     'Additional risk score': z.number().min(0).max(100),
     'Min risk score': z.number().min(0).max(100),

diff --git a/services/workflows-service/src/workflow/cron/ongoing-monitoring.cron.ts b/services/workflows-service/src/workflow/cron/ongoing-monitoring.cron.ts
@@ -30,7 +30,7 @@ export class OngoingMonitoringCron {
     protected readonly businessReportService: BusinessReportService,
   ) {}
 
-  @Cron(CronExpression.EVERY_MINUTE)
+  @Cron(CronExpression.EVERY_HOUR)
   async handleCron() {
     this.logger.log('Ongoing monitoring cron started');