refactor: recon engine rules v2 api integration (#4045)

susrithasabbini · web-flow · commit 5a4f7f0f380b · 2026-01-13T16:20:00.000+05:30
diff --git a/src/APIUtils/APIUtils.res b/src/APIUtils/APIUtils.res
@@ -1031,8 +1031,8 @@ let useGetURL = () => {
           switch methodType {
           | Get =>
             switch id {
-            | Some(ruleId) => `${reconBaseURL}/recon_rules/${ruleId}`
-            | None => `${reconBaseURL}/recon_rules`
+            | Some(ruleId) => `${reconBaseURL}/recon_rules/v2/${ruleId}`
+            | None => `${reconBaseURL}/recon_rules/v2`
             }
           | _ => ""
           }
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineExceptions/ReconEngineExceptions.res b/src/ReconEngine/ReconEngineScreens/ReconEngineExceptions/ReconEngineExceptions.res
@@ -21,7 +21,7 @@ let make = () => {
         ~methodType=Get,
       )
       let res = await fetchDetails(url)
-      let ruleDetails = res->getArrayDataFromJson(getRulePayloadFromDict)
+      let ruleDetails = res->getArrayDataFromJson(ruleItemToObjMapper)
       setReconRulesList(_ => ruleDetails)
       setScreenState(_ => PageLoaderWrapper.Success)
     } catch {
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverview.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverview.res
@@ -20,7 +20,7 @@ let make = () => {
         ~methodType=Get,
       )
       let res = await fetchDetails(url)
-      let ruleDetails = res->getArrayDataFromJson(getRulePayloadFromDict)
+      let ruleDetails = res->getArrayDataFromJson(ruleItemToObjMapper)
       setReconRulesList(_ => ruleDetails)
       setScreenState(_ => PageLoaderWrapper.Success)
     } catch {
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetails.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetails.res
@@ -1,5 +1,5 @@
 @react.component
-let make = (~ruleDetails: ReconEngineTypes.reconRuleType) => {
+let make = (~ruleDetails: ReconEngineRulesTypes.rulePayload) => {
   <div className="flex flex-col gap-8 mt-8">
     <ReconEngineOverviewStackedBarGraph ruleDetails />
     <ReconEngineOverviewColumnGraphs ruleDetails />
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewAccountDetails.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewAccountDetails.res
@@ -1,10 +1,9 @@
+open ReconEngineRulesTypes
+
 @react.component
-let make = (~ruleDetails: ReconEngineTypes.reconRuleType) => {
-  open ReconEngineTypes
+let make = (~ruleDetails: rulePayload) => {
   open ReconEngineOverviewSummaryUtils
   open ReconEngineOverviewHelper
-  open LogicUtils
-  open ReconEngineAccountsUtils
 
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let (accountData, setAccountData) = React.useState(_ => [])
@@ -34,14 +33,11 @@ let make = (~ruleDetails: ReconEngineTypes.reconRuleType) => {
     None
   }, [])
 
-  let (sourceAccountData, targetAccountData) = React.useMemo(() => {
-    let source =
-      ruleDetails.sources->getValueFromArray(0, Dict.make()->getAccountRefPayloadFromDict)
-    let target =
-      ruleDetails.targets->getValueFromArray(0, Dict.make()->getAccountRefPayloadFromDict)
+  let (sourceAccountId, targetAccountId) = getSourceAndTargetAccountIdsFromRuleDetails(ruleDetails)
 
-    let sourceAccount = getAccountData(accountData, source.account_id)
-    let targetAccount = getAccountData(accountData, target.account_id)
+  let (sourceAccountData, targetAccountData) = React.useMemo(() => {
+    let sourceAccount = getAccountData(accountData, sourceAccountId)
+    let targetAccount = getAccountData(accountData, targetAccountId)
 
     (sourceAccount, targetAccount)
   }, (ruleDetails, accountData))
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewCardDetails.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewCardDetails.res
@@ -1,9 +1,10 @@
+open ReconEngineRulesTypes
+
 @react.component
-let make = (~ruleDetails: ReconEngineTypes.reconRuleType) => {
+let make = (~ruleDetails: rulePayload) => {
   open LogicUtils
   open ReconEngineOverviewUtils
   open ReconEngineOverviewHelper
-  open ReconEngineAccountsUtils
 
   let (accountData, setAccountData) = React.useState(_ => [])
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
@@ -28,16 +29,17 @@ let make = (~ruleDetails: ReconEngineTypes.reconRuleType) => {
     }
   }
 
+  let (
+    sourceAccountId,
+    targetAccountId,
+  ) = ReconEngineOverviewSummaryUtils.getSourceAndTargetAccountIdsFromRuleDetails(ruleDetails)
+
   let (
     (sourceAccountName, sourceAccountCurrency),
     (targetAccountName, targetAccountCurrency),
   ) = React.useMemo(() => {
-    let source =
-      ruleDetails.sources->getValueFromArray(0, Dict.make()->getAccountRefPayloadFromDict)
-    let target =
-      ruleDetails.targets->getValueFromArray(0, Dict.make()->getAccountRefPayloadFromDict)
-    let sourceInfo = getAccountNameAndCurrency(accountData, source.account_id)
-    let targetInfo = getAccountNameAndCurrency(accountData, target.account_id)
+    let sourceInfo = getAccountNameAndCurrency(accountData, sourceAccountId)
+    let targetInfo = getAccountNameAndCurrency(accountData, targetAccountId)
     (sourceInfo, targetInfo)
   }, (ruleDetails, accountData))
 
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewColumnGraphs.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewColumnGraphs.res
@@ -1,5 +1,5 @@
 @react.component
-let make = (~ruleDetails: ReconEngineTypes.reconRuleType) => {
+let make = (~ruleDetails: ReconEngineRulesTypes.rulePayload) => {
   <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
     <FilterContext index="recon_reconciled_graph">
       <ReconEngineReconciledVolumeColumnGraph ruleId={ruleDetails.rule_id} />
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewStackedBarGraph.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewStackedBarGraph.res
@@ -1,7 +1,7 @@
 open Typography
 
 @react.component
-let make = (~ruleDetails: ReconEngineTypes.reconRuleType) => {
+let make = (~ruleDetails: ReconEngineRulesTypes.rulePayload) => {
   open CurrencyFormatUtils
 
   let (allTransactionsData, setAllTransactionsData) = React.useState(_ => [])
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewTransactions.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewDetails/ReconEngineOverviewDetailsComponents/ReconEngineOverviewTransactions.res
@@ -1,5 +1,5 @@
 @react.component
-let make = (~ruleDetails: ReconEngineTypes.reconRuleType) => {
+let make = (~ruleDetails: ReconEngineRulesTypes.rulePayload) => {
   open LogicUtils
   open HierarchicalTransactionsTableEntity
 
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewSummary/ReconEngineOverviewSummaryComponents/ReconEngineOverviewSummaryAccountsView.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewSummary/ReconEngineOverviewSummaryComponents/ReconEngineOverviewSummaryAccountsView.res
@@ -135,7 +135,7 @@ module AccountsList = {
 }
 
 @react.component
-let make = (~reconRulesList: array<reconRuleType>) => {
+let make = (~reconRulesList: array<ReconEngineRulesTypes.rulePayload>) => {
   open ReconEngineOverviewSummaryUtils
   open ReconEngineAccountsUtils
 
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewSummary/ReconEngineOverviewSummaryComponents/ReconEngineOverviewSummaryFlowDiagram.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewSummary/ReconEngineOverviewSummaryComponents/ReconEngineOverviewSummaryFlowDiagram.res
@@ -120,7 +120,7 @@ module FlowWithLayoutControls = {
 }
 
 @react.component
-let make = (~reconRulesList: array<ReconEngineTypes.reconRuleType>) => {
+let make = (~reconRulesList: array<ReconEngineRulesTypes.rulePayload>) => {
   open ReconEngineOverviewSummaryUtils
   open ReactFlow
   open LogicUtils
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewSummary/ReconEngineOverviewSummaryComponents/ReconEngineOverviewSummaryStackedBarGraphs.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewSummary/ReconEngineOverviewSummaryComponents/ReconEngineOverviewSummaryStackedBarGraphs.res
@@ -1,9 +1,9 @@
 open Typography
-open ReconEngineTypes
+open ReconEngineRulesTypes
 
 module RuleWiseStackedBarGraph = {
   @react.component
-  let make = (~rule: ReconEngineTypes.reconRuleType) => {
+  let make = (~rule: rulePayload) => {
     open CurrencyFormatUtils
     open LogicUtils
 
@@ -83,7 +83,7 @@ module RuleWiseStackedBarGraph = {
 }
 
 @react.component
-let make = (~reconRulesList: array<reconRuleType>) => {
+let make = (~reconRulesList: array<rulePayload>) => {
   <div className="grid gap-6 grid-cols-1 lg:grid-cols-2">
     {reconRulesList
     ->Array.map(rule => <RuleWiseStackedBarGraph rule key={rule.rule_id} />)
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewSummary/ReconEngineOverviewSummaryUtils.res b/src/ReconEngine/ReconEngineScreens/ReconEngineOverview/ReconEngineOverviewSummary/ReconEngineOverviewSummaryUtils.res
@@ -190,13 +190,18 @@ let getAccountData = (accountData: array<accountType>, accountId: string): accou
   ->Option.getOr(Dict.make()->getOverviewAccountPayloadFromDict)
 }
 
-let getAllAccountIds = (reconRulesList: array<reconRuleType>) => {
+let getAllAccountIds = (reconRulesList: array<ReconEngineRulesTypes.rulePayload>) => {
   reconRulesList
   ->Array.flatMap(rule =>
-    Array.concat(
-      rule.sources->Array.map(source => source.account_id),
-      rule.targets->Array.map(target => target.account_id),
-    )
+    switch rule.strategy {
+    | OneToOne(oneToOne) =>
+      switch oneToOne {
+      | SingleSingle(data) => [data.source_account.account_id, data.target_account.account_id]
+      | SingleMany(data) => [data.source_account.account_id, data.target_account.account_id]
+      | ManySingle(data) => [data.source_account.account_id, data.target_account.account_id]
+      }
+    | UnknownReconStrategy => []
+    }
   )
   ->getUniqueArray
 }
@@ -219,21 +224,18 @@ let getPercentageLabel = (~postedCount, ~totalCount) =>
     "0% Reconciled"
   }
 let makeEdge = (
-  ~source: reconRuleAccountRefType,
-  ~target: reconRuleAccountRefType,
+  ~sourceAccountId: string,
+  ~targetAccountId: string,
   ~ruleTransactions,
   ~selectedNodeId,
 ) => {
   let (postedCount, totalCount) = summarizeTransactions(ruleTransactions)
   let label = getPercentageLabel(~postedCount, ~totalCount)
-  let sourceNodeId = `${source.account_id}-node`
-  let targetNodeId = `${target.account_id}-node`
-  let isHighlighted = switch selectedNodeId {
-  | Some(id) => id === sourceNodeId || id === targetNodeId
-  | None => false
-  }
+  let sourceNodeId = `${sourceAccountId}-node`
+  let targetNodeId = `${targetAccountId}-node`
+  let isHighlighted = Some(sourceNodeId) == selectedNodeId || Some(targetNodeId) == selectedNodeId
   {
-    id: `${source.account_id}-to-${target.account_id}`,
+    id: `${sourceAccountId}-to-${targetAccountId}`,
     ReconEngineOverviewSummaryTypes.source: sourceNodeId,
     target: targetNodeId,
     edgeType: "smoothstep",
@@ -246,20 +248,43 @@ let makeEdge = (
   }
 }
 let getEdges = (
-  ~reconRulesList: array<reconRuleType>,
+  ~reconRulesList: array<ReconEngineRulesTypes.rulePayload>,
   ~allTransactions: array<transactionType>,
   ~selectedNodeId,
 ) =>
-  reconRulesList->Array.flatMap(rule =>
-    rule.sources->Array.flatMap(source =>
-      rule.targets->Array.map(
-        target => {
-          let ruleTransactions = allTransactions->Array.filter(t => t.rule.rule_id === rule.rule_id)
-          makeEdge(~source, ~target, ~ruleTransactions, ~selectedNodeId)
-        },
-      )
-    )
-  )
+  reconRulesList->Array.flatMap(rule => {
+    let ruleTransactions = allTransactions->Array.filter(t => t.rule.rule_id === rule.rule_id)
+    switch rule.strategy {
+    | OneToOne(oneToOne) =>
+      switch oneToOne {
+      | SingleSingle(data) => [
+          makeEdge(
+            ~sourceAccountId=data.source_account.account_id,
+            ~targetAccountId=data.target_account.account_id,
+            ~ruleTransactions,
+            ~selectedNodeId,
+          ),
+        ]
+      | SingleMany(data) => [
+          makeEdge(
+            ~sourceAccountId=data.source_account.account_id,
+            ~targetAccountId=data.target_account.account_id,
+            ~ruleTransactions,
+            ~selectedNodeId,
+          ),
+        ]
+      | ManySingle(data) => [
+          makeEdge(
+            ~sourceAccountId=data.source_account.account_id,
+            ~targetAccountId=data.target_account.account_id,
+            ~ruleTransactions,
+            ~selectedNodeId,
+          ),
+        ]
+      }
+    | UnknownReconStrategy => []
+    }
+  })
 
 let getTransactionsData = (
   accountTransactionData: Dict.t<accountTransactionData>,
@@ -271,7 +296,7 @@ let getTransactionsData = (
 }
 
 let generateNodesAndEdgesWithTransactionAmounts = (
-  reconRulesList: array<reconRuleType>,
+  reconRulesList: array<ReconEngineRulesTypes.rulePayload>,
   accountsData: array<accountType>,
   accountTransactionData: Dict.t<accountTransactionData>,
   allTransactions: array<transactionType>,
@@ -343,7 +368,7 @@ let makeAmountData = (amount, currency): balanceType => {
 }
 
 let processAllTransactionsWithAmounts = (
-  reconRulesList: array<reconRuleType>,
+  reconRulesList: array<ReconEngineRulesTypes.rulePayload>,
   allTransactions: array<transactionType>,
   accountsData: array<accountType>,
 ) => {
@@ -529,3 +554,17 @@ let getStatusIcon = (statusType: amountType) => {
 
 let allAmountTypes = [ReconciledAmount, PendingAmount, MismatchedAmount]
 let allSubHeaderTypes = [DebitAmount, CreditAmount]
+
+let getSourceAndTargetAccountIdsFromRuleDetails = (
+  ruleDetails: ReconEngineRulesTypes.rulePayload,
+) => {
+  switch ruleDetails.strategy {
+  | OneToOne(oneToOne) =>
+    switch oneToOne {
+    | SingleSingle(data) => (data.source_account.account_id, data.target_account.account_id)
+    | SingleMany(data) => (data.source_account.account_id, data.target_account.account_id)
+    | ManySingle(data) => (data.source_account.account_id, data.target_account.account_id)
+    }
+  | UnknownReconStrategy => ("", "")
+  }
+}
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRule.res b/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRule.res
@@ -4,6 +4,8 @@ open ReconEngineRulesEntity
 @react.component
 let make = () => {
   open APIUtils
+  open ReconEngineRulesUtils
+
   let getURL = useGetURL()
   let fetchDetails = useGetMethod()
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Success)
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRuleDetails.res b/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRuleDetails.res
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRulesEntity.res b/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRulesEntity.res
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRulesTypes.res b/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRulesTypes.res
diff --git a/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRulesUtils.res b/src/ReconEngine/ReconEngineScreens/ReconEngineRules/ReconEngineRulesUtils.res

Original file line number	Diff line number	Diff line change
`@@ -1031,8 +1031,8 @@ let useGetURL = () => {`
`1031`	`1031`	`switch methodType {`
`1032`	`1032`	`\| Get =>`
`1033`	`1033`	`switch id {`
`1034`		- \| Some(ruleId) => `${reconBaseURL}/recon_rules/${ruleId}`
`1035`		- \| None => `${reconBaseURL}/recon_rules`
	`1034`	+ \| Some(ruleId) => `${reconBaseURL}/recon_rules/v2/${ruleId}`
	`1035`	+ \| None => `${reconBaseURL}/recon_rules/v2`
`1036`	`1036`	`}`
`1037`	`1037`	`\| _ => ""`
`1038`	`1038`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ let make = () => {`
`21`	`21`	`~methodType=Get,`
`22`	`22`	`)`
`23`	`23`	`let res = await fetchDetails(url)`
`24`		`- let ruleDetails = res->getArrayDataFromJson(getRulePayloadFromDict)`
	`24`	`+ let ruleDetails = res->getArrayDataFromJson(ruleItemToObjMapper)`
`25`	`25`	`setReconRulesList(_ => ruleDetails)`
`26`	`26`	`setScreenState(_ => PageLoaderWrapper.Success)`
`27`	`27`	`} catch {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ let make = () => {`
`20`	`20`	`~methodType=Get,`
`21`	`21`	`)`
`22`	`22`	`let res = await fetchDetails(url)`
`23`		`- let ruleDetails = res->getArrayDataFromJson(getRulePayloadFromDict)`
	`23`	`+ let ruleDetails = res->getArrayDataFromJson(ruleItemToObjMapper)`
`24`	`24`	`setReconRulesList(_ => ruleDetails)`
`25`	`25`	`setScreenState(_ => PageLoaderWrapper.Success)`
`26`	`26`	`} catch {`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ module AccountsList = {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`@react.component`
`138`		`-let make = (~reconRulesList: array<reconRuleType>) => {`
	`138`	`+let make = (~reconRulesList: array<ReconEngineRulesTypes.rulePayload>) => {`
`139`	`139`	`open ReconEngineOverviewSummaryUtils`
`140`	`140`	`open ReconEngineAccountsUtils`
`141`	`141`