Merge pull request #23 from bcgov/feature/nested-rulemaps

Feature - input / output rulemaps for linked rules
bcgov · Jul 24, 2024 · e2c41fc · e2c41fc
2 parents 590a4df + dfd9057
commit e2c41fc
Show file tree

Hide file tree

Showing 7 changed files with 649 additions and 84 deletions.
diff --git a/src/api/ruleMapping/ruleMapping.controller.spec.ts b/src/api/ruleMapping/ruleMapping.controller.spec.ts
@@ -41,7 +41,7 @@ describe('RuleMappingController', () => {
       const ruleFileName = 'test-rule.json';
       const ruleContent = { nodes: [], edges: [] };
       const rulemap = { inputs: [], outputs: [], resultOutputs: [] };
-      jest.spyOn(service, 'ruleSchema').mockReturnValue(rulemap);
+      jest.spyOn(service, 'ruleSchema').mockResolvedValue(rulemap);
 
       const mockResponse = {
         setHeader: jest.fn(),
@@ -65,7 +65,7 @@ describe('RuleMappingController', () => {
       const nodes = [{ id: '1', type: 'someType', content: { inputs: [], outputs: [] } }];
       const edges = [{ id: '2', type: 'someType', targetId: '1', sourceId: '1' }];
       const result = { inputs: [], outputs: [], resultOutputs: [] };
-      jest.spyOn(service, 'ruleSchema').mockReturnValue(result);
+      jest.spyOn(service, 'ruleSchema').mockResolvedValue(result);
 
       const dto: EvaluateRuleMappingDto = { nodes, edges };
       const response = await controller.evaluateRuleMap(dto);

diff --git a/src/api/ruleMapping/ruleMapping.controller.ts b/src/api/ruleMapping/ruleMapping.controller.ts
@@ -14,7 +14,7 @@ export class RuleMappingController {
     @Body('ruleContent') ruleContent: EvaluateRuleMappingDto,
     @Res() res: Response,
   ) {
-    const rulemap = this.ruleMappingService.ruleSchema(ruleContent);
+    const rulemap = await this.ruleMappingService.ruleSchema(ruleContent);
 
     try {
       res.setHeader('Content-Type', 'application/json');
@@ -33,7 +33,7 @@ export class RuleMappingController {
   @Post('/evaluate')
   async evaluateRuleMap(@Body() ruleContent: EvaluateRuleMappingDto) {
     try {
-      const result = this.ruleMappingService.ruleSchema(ruleContent);
+      const result = await this.ruleMappingService.ruleSchema(ruleContent);
       return { result };
     } catch (error) {
       if (error instanceof InvalidRuleContent) {

diff --git a/src/api/ruleMapping/ruleMapping.interface.ts b/src/api/ruleMapping/ruleMapping.interface.ts
@@ -9,7 +9,9 @@ export interface Field {
 
 export interface InputField extends Field {}
 
-export interface OutputField extends Field {}
+export interface OutputField extends Field {
+  exception?: string;
+}
 
 export interface Expression {
   key: string;
@@ -20,12 +22,13 @@ export interface NodeContent {
   inputs?: InputField[];
   outputs?: OutputField[];
   expressions?: Expression[];
+  key?: string;
 }
 
 export interface Node {
   id: any;
   type: string;
-  content: NodeContent;
+  content: NodeContent | string;
 }
 
 export interface Edge {