@zeniai/client-epic-state 5.2.22-betaAM2 → 5.2.22-betaAM4

package/lib/entity/jeSchedules/jeSchedulesPayload.d.ts

@@ -135,6 +135,7 @@ export interface JEOneTimeAccrualClearedPayload {
     match_tier?: string | null;
     matched_amount?: number | null;
     matched_line_id?: string | null;
+    matched_transaction_date?: string | null;
     matched_transaction_id?: string | null;
     matched_transaction_integration_id?: string | null;
     matched_transaction_type?: string | null;
@@ -144,6 +145,7 @@ export interface JEOneTimeAccrualMatchSuggestionPayload {
     match_tier?: string | null;
     matched_amount?: number | null;
     matched_line_id?: string | null;
+    matched_transaction_date?: string | null;
     matched_transaction_id?: string | null;
     matched_transaction_integration_id?: string | null;
     matched_transaction_type?: string | null;

package/lib/entity/jeSchedules/jeSchedulesPayload.js

@@ -473,6 +473,9 @@ function toJEOneTimeAccrualCleared(payload, currencyCode) {
             : undefined,
         accrualIds: payload.accrual_ids ?? undefined,
         reversedAt: payload.reversed_at != null ? (0, zeniDayJS_1.date)(payload.reversed_at) : undefined,
+        matchedTransactionDate: payload.matched_transaction_date != null
+            ? (0, zeniDayJS_1.date)(payload.matched_transaction_date)
+            : undefined,
         matchTier: payload.match_tier ?? undefined,
         matchShape: payload.match_shape ?? undefined,
     };
@@ -491,6 +494,9 @@ function toJEOneTimeAccrualMatchSuggestion(payload, currencyCode) {
         matchedAmount: payload.matched_amount != null
             ? toOneTimeAccrualAmount(payload.matched_amount, currencyCode)
             : undefined,
+        matchedTransactionDate: payload.matched_transaction_date != null
+            ? (0, zeniDayJS_1.date)(payload.matched_transaction_date)
+            : undefined,
     };
 }
 function toJEOneTimeAccrual(payload) {

package/lib/entity/jeSchedules/jeSchedulesState.d.ts

@@ -204,6 +204,7 @@ export interface JEOneTimeAccrualCleared {
     groupSum?: Amount;
     matchedAmount?: Amount;
     matchedLineId?: string;
+    matchedTransactionDate?: ZeniDate;
     matchedTransactionId?: string;
     matchedTransactionIntegrationId?: string;
     matchedTransactionType?: string;
@@ -215,6 +216,7 @@ export interface JEOneTimeAccrualCleared {
 export interface JEOneTimeAccrualMatchSuggestion {
     matchedAmount?: Amount;
     matchedLineId?: string;
+    matchedTransactionDate?: ZeniDate;
     matchedTransactionId?: string;
     matchedTransactionIntegrationId?: string;
     matchedTransactionType?: string;

package/lib/esm/entity/jeSchedules/jeSchedulesPayload.js

@@ -462,6 +462,9 @@ function toJEOneTimeAccrualCleared(payload, currencyCode) {
             : undefined,
         accrualIds: payload.accrual_ids ?? undefined,
         reversedAt: payload.reversed_at != null ? date(payload.reversed_at) : undefined,
+        matchedTransactionDate: payload.matched_transaction_date != null
+            ? date(payload.matched_transaction_date)
+            : undefined,
         matchTier: payload.match_tier ?? undefined,
         matchShape: payload.match_shape ?? undefined,
     };
@@ -480,6 +483,9 @@ function toJEOneTimeAccrualMatchSuggestion(payload, currencyCode) {
         matchedAmount: payload.matched_amount != null
             ? toOneTimeAccrualAmount(payload.matched_amount, currencyCode)
             : undefined,
+        matchedTransactionDate: payload.matched_transaction_date != null
+            ? date(payload.matched_transaction_date)
+            : undefined,
     };
 }
 export function toJEOneTimeAccrual(payload) {

package/lib/esm/view/expenseAutomationView/selectors/actualMatchingViewSelector.js

@@ -20,26 +20,6 @@ export function isPendingReviewAccrual(accrual) {
 export function getClearedMatchedAmount(accrual) {
     return accrual.cleared?.matchedAmount?.amount;
 }
-function getActualMatchingGroupKey(accrual) {
-    const ids = accrual.cleared?.accrualIds;
-    if (ids != null && ids.length > 1) {
-        return `cleared:${[...ids].sort().join(',')}`;
-    }
-    return accrual.accrualId;
-}
-function sumUniqueActualMatchingAmounts(accruals) {
-    const seen = new Set();
-    let sum = 0;
-    for (const accrual of accruals) {
-        const key = getActualMatchingGroupKey(accrual);
-        if (seen.has(key)) {
-            continue;
-        }
-        seen.add(key);
-        sum += getActualMatchingAmount(accrual);
-    }
-    return sum;
-}
 export function getActualMatchingAmount(accrual) {
     if (isPendingReviewAccrual(accrual)) {
         return (accrual.matchSuggestion?.matchedAmount?.amount ??
@@ -51,20 +31,88 @@ export function getActualMatchingAmount(accrual) {
     return accrual.estimatedAmount.amount;
 }
 export function getActualMatchingReversalDate(accrual) {
-    if (!isAutoReversedAccrual(accrual) && !isManuallyReversedAccrual(accrual)) {
+    if (isPendingReviewAccrual(accrual)) {
+        return accrual.matchSuggestion?.matchedTransactionDate;
+    }
+    return accrual.cleared?.matchedTransactionDate;
+}
+function getActualMatchingBillCollapseKey(accrual) {
+    const stamp = isPendingReviewAccrual(accrual)
+        ? accrual.matchSuggestion
+        : accrual.cleared;
+    const txnId = stamp?.matchedTransactionId;
+    if (txnId != null && txnId !== '') {
+        return `txn:${txnId}`;
+    }
+    const integrationId = stamp?.matchedTransactionIntegrationId;
+    if (integrationId != null && integrationId !== '') {
+        return `int:${integrationId}`;
+    }
+    const ids = accrual.cleared?.accrualIds;
+    if (ids != null && ids.length > 1) {
+        return `cleared:${[...ids].sort().join(',')}`;
+    }
+    return `accrual:${accrual.accrualId}`;
+}
+function collectGroupedAccrualIds(members) {
+    const stampIds = members[0]?.cleared?.accrualIds;
+    const memberIds = members.map((member) => member.accrualId);
+    if (stampIds != null && stampIds.length >= memberIds.length) {
+        return stampIds;
+    }
+    const seen = new Set();
+    const grouped = [];
+    for (const id of [...(stampIds ?? []), ...memberIds]) {
+        if (!seen.has(id)) {
+            seen.add(id);
+            grouped.push(id);
+        }
+    }
+    return grouped;
+}
+function collectGroupedMembers(members) {
+    if (members.length <= 1) {
         return undefined;
     }
-    return accrual.actualReversalPostDate ?? accrual.cleared?.reversedAt;
+    return members.map((member) => ({
+        accrualId: member.accrualId,
+        estimatedAmount: member.estimatedAmount,
+        jeDebitAccountName: member.jeDebitAccountName,
+        memo: member.memo,
+        serviceMonth: member.serviceMonth,
+    }));
 }
-function toActualMatchingRow(accrual, kind) {
+function toActualMatchingRow(members, kind) {
+    const accrual = members[0];
     return {
         ...accrual,
         kind,
-        reversalDate: kind === 'pending_review'
-            ? undefined
-            : getActualMatchingReversalDate(accrual),
+        groupedAccrualIds: collectGroupedAccrualIds(members),
+        groupedMembers: collectGroupedMembers(members),
+        reversalDate: getActualMatchingReversalDate(accrual),
     };
 }
+function collapseActualMatchingRows(accruals, kind) {
+    const groups = new Map();
+    for (const accrual of accruals) {
+        const key = getActualMatchingBillCollapseKey(accrual);
+        const members = groups.get(key);
+        if (members != null) {
+            members.push(accrual);
+        }
+        else {
+            groups.set(key, [accrual]);
+        }
+    }
+    const rows = [];
+    for (const members of groups.values()) {
+        rows.push(toActualMatchingRow(members, kind));
+    }
+    return rows;
+}
+function sumCollapsedActualMatchingAmounts(rows) {
+    return rows.reduce((sum, row) => sum + getActualMatchingAmount(row), 0);
+}
 function matchesSearch(accrual, searchString) {
     const trimmed = searchString.trim().toLowerCase();
     if (trimmed.length === 0) {
@@ -120,38 +168,30 @@ export function getExpenseAutomationActualMatchingView(state) {
         .map((key) => getJEOneTimeAccrualByKey(key, state.jeSchedulesState))
         .filter((accrual) => accrual != null);
     const filtered = accruals.filter((accrual) => matchesSearch(accrual, uiState.searchString));
-    const autoReversed = sortActualMatchingRows(filtered
-        .filter(isAutoReversedAccrual)
-        .map((accrual) => toActualMatchingRow(accrual, 'auto_reversed')), uiState);
-    const pendingReview = sortActualMatchingRows(filtered
-        .filter(isPendingReviewAccrual)
-        .map((accrual) => toActualMatchingRow(accrual, 'pending_review')), uiState);
-    const manuallyReversed = sortActualMatchingRows(filtered
-        .filter(isManuallyReversedAccrual)
-        .map((accrual) => toActualMatchingRow(accrual, 'manually_reversed')), uiState);
-    const listedAccruals = accruals.filter((accrual) => isAutoReversedAccrual(accrual) ||
-        isPendingReviewAccrual(accrual) ||
-        isManuallyReversedAccrual(accrual));
-    const kpiSummary = listedAccruals.length === 0
+    const autoReversed = sortActualMatchingRows(collapseActualMatchingRows(filtered.filter(isAutoReversedAccrual), 'auto_reversed'), uiState);
+    const pendingReview = sortActualMatchingRows(collapseActualMatchingRows(filtered.filter(isPendingReviewAccrual), 'pending_review'), uiState);
+    const manuallyReversed = sortActualMatchingRows(collapseActualMatchingRows(filtered.filter(isManuallyReversedAccrual), 'manually_reversed'), uiState);
+    const listedRows = [...autoReversed, ...pendingReview, ...manuallyReversed];
+    const kpiSummary = listedRows.length === 0
         ? emptyKpiSummary()
         : {
             autoReversed: {
-                count: listedAccruals.filter(isAutoReversedAccrual).length,
-                amount: sumUniqueActualMatchingAmounts(listedAccruals.filter(isAutoReversedAccrual)),
+                count: autoReversed.length,
+                amount: sumCollapsedActualMatchingAmounts(autoReversed),
             },
             pendingReview: {
-                count: listedAccruals.filter(isPendingReviewAccrual).length,
-                amount: sumUniqueActualMatchingAmounts(listedAccruals.filter(isPendingReviewAccrual)),
+                count: pendingReview.length,
+                amount: sumCollapsedActualMatchingAmounts(pendingReview),
             },
             totalThisClose: {
-                count: listedAccruals.length,
-                amount: sumUniqueActualMatchingAmounts(listedAccruals),
+                count: listedRows.length,
+                amount: sumCollapsedActualMatchingAmounts(listedRows),
             },
             ai: {
-                count: listedAccruals.filter((accrual) => accrual.origin === 'agent').length,
+                count: listedRows.filter((row) => row.origin === 'agent').length,
             },
             manual: {
-                count: listedAccruals.filter((accrual) => accrual.origin === 'human').length,
+                count: listedRows.filter((row) => row.origin === 'human').length,
             },
         };
     const accrualSearchResults = matchModal.accrualSearch.results

package/lib/view/expenseAutomationView/selectorTypes/actualMatchingViewSelectorTypes.d.ts

@@ -1,11 +1,21 @@
-import { FetchStateAndError } from '../../../commonStateTypes/common';
+import { Amount } from '../../../commonStateTypes/amount';
+import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { JEOneTimeAccrual } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { ZeniDate } from '../../../zeniDayJS';
 import { ActualMatchingTransactionSearchResult, ActualMatchingViewUIState, MatchAndReverseResult } from '../types/actualMatchingViewState';
 export type ActualMatchingRowKind = 'auto_reversed' | 'pending_review' | 'manually_reversed';
+export type ActualMatchingGroupedAccrual = {
+    accrualId: ID;
+    estimatedAmount?: Amount;
+    jeDebitAccountName?: string;
+    memo?: string;
+    serviceMonth?: string;
+};
 export interface ActualMatchingRow extends JEOneTimeAccrual {
     kind: ActualMatchingRowKind;
+    groupedAccrualIds?: ID[];
+    groupedMembers?: ActualMatchingGroupedAccrual[];
     reversalDate?: ZeniDate;
 }
 export interface ActualMatchingKpiSummary {

package/lib/view/expenseAutomationView/selectors/actualMatchingViewSelector.js

@@ -32,26 +32,6 @@ function isPendingReviewAccrual(accrual) {
 function getClearedMatchedAmount(accrual) {
     return accrual.cleared?.matchedAmount?.amount;
 }
-function getActualMatchingGroupKey(accrual) {
-    const ids = accrual.cleared?.accrualIds;
-    if (ids != null && ids.length > 1) {
-        return `cleared:${[...ids].sort().join(',')}`;
-    }
-    return accrual.accrualId;
-}
-function sumUniqueActualMatchingAmounts(accruals) {
-    const seen = new Set();
-    let sum = 0;
-    for (const accrual of accruals) {
-        const key = getActualMatchingGroupKey(accrual);
-        if (seen.has(key)) {
-            continue;
-        }
-        seen.add(key);
-        sum += getActualMatchingAmount(accrual);
-    }
-    return sum;
-}
 function getActualMatchingAmount(accrual) {
     if (isPendingReviewAccrual(accrual)) {
         return (accrual.matchSuggestion?.matchedAmount?.amount ??
@@ -63,20 +43,88 @@ function getActualMatchingAmount(accrual) {
     return accrual.estimatedAmount.amount;
 }
 function getActualMatchingReversalDate(accrual) {
-    if (!isAutoReversedAccrual(accrual) && !isManuallyReversedAccrual(accrual)) {
+    if (isPendingReviewAccrual(accrual)) {
+        return accrual.matchSuggestion?.matchedTransactionDate;
+    }
+    return accrual.cleared?.matchedTransactionDate;
+}
+function getActualMatchingBillCollapseKey(accrual) {
+    const stamp = isPendingReviewAccrual(accrual)
+        ? accrual.matchSuggestion
+        : accrual.cleared;
+    const txnId = stamp?.matchedTransactionId;
+    if (txnId != null && txnId !== '') {
+        return `txn:${txnId}`;
+    }
+    const integrationId = stamp?.matchedTransactionIntegrationId;
+    if (integrationId != null && integrationId !== '') {
+        return `int:${integrationId}`;
+    }
+    const ids = accrual.cleared?.accrualIds;
+    if (ids != null && ids.length > 1) {
+        return `cleared:${[...ids].sort().join(',')}`;
+    }
+    return `accrual:${accrual.accrualId}`;
+}
+function collectGroupedAccrualIds(members) {
+    const stampIds = members[0]?.cleared?.accrualIds;
+    const memberIds = members.map((member) => member.accrualId);
+    if (stampIds != null && stampIds.length >= memberIds.length) {
+        return stampIds;
+    }
+    const seen = new Set();
+    const grouped = [];
+    for (const id of [...(stampIds ?? []), ...memberIds]) {
+        if (!seen.has(id)) {
+            seen.add(id);
+            grouped.push(id);
+        }
+    }
+    return grouped;
+}
+function collectGroupedMembers(members) {
+    if (members.length <= 1) {
         return undefined;
     }
-    return accrual.actualReversalPostDate ?? accrual.cleared?.reversedAt;
+    return members.map((member) => ({
+        accrualId: member.accrualId,
+        estimatedAmount: member.estimatedAmount,
+        jeDebitAccountName: member.jeDebitAccountName,
+        memo: member.memo,
+        serviceMonth: member.serviceMonth,
+    }));
 }
-function toActualMatchingRow(accrual, kind) {
+function toActualMatchingRow(members, kind) {
+    const accrual = members[0];
     return {
         ...accrual,
         kind,
-        reversalDate: kind === 'pending_review'
-            ? undefined
-            : getActualMatchingReversalDate(accrual),
+        groupedAccrualIds: collectGroupedAccrualIds(members),
+        groupedMembers: collectGroupedMembers(members),
+        reversalDate: getActualMatchingReversalDate(accrual),
     };
 }
+function collapseActualMatchingRows(accruals, kind) {
+    const groups = new Map();
+    for (const accrual of accruals) {
+        const key = getActualMatchingBillCollapseKey(accrual);
+        const members = groups.get(key);
+        if (members != null) {
+            members.push(accrual);
+        }
+        else {
+            groups.set(key, [accrual]);
+        }
+    }
+    const rows = [];
+    for (const members of groups.values()) {
+        rows.push(toActualMatchingRow(members, kind));
+    }
+    return rows;
+}
+function sumCollapsedActualMatchingAmounts(rows) {
+    return rows.reduce((sum, row) => sum + getActualMatchingAmount(row), 0);
+}
 function matchesSearch(accrual, searchString) {
     const trimmed = searchString.trim().toLowerCase();
     if (trimmed.length === 0) {
@@ -132,38 +180,30 @@ function getExpenseAutomationActualMatchingView(state) {
         .map((key) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(key, state.jeSchedulesState))
         .filter((accrual) => accrual != null);
     const filtered = accruals.filter((accrual) => matchesSearch(accrual, uiState.searchString));
-    const autoReversed = sortActualMatchingRows(filtered
-        .filter(isAutoReversedAccrual)
-        .map((accrual) => toActualMatchingRow(accrual, 'auto_reversed')), uiState);
-    const pendingReview = sortActualMatchingRows(filtered
-        .filter(isPendingReviewAccrual)
-        .map((accrual) => toActualMatchingRow(accrual, 'pending_review')), uiState);
-    const manuallyReversed = sortActualMatchingRows(filtered
-        .filter(isManuallyReversedAccrual)
-        .map((accrual) => toActualMatchingRow(accrual, 'manually_reversed')), uiState);
-    const listedAccruals = accruals.filter((accrual) => isAutoReversedAccrual(accrual) ||
-        isPendingReviewAccrual(accrual) ||
-        isManuallyReversedAccrual(accrual));
-    const kpiSummary = listedAccruals.length === 0
+    const autoReversed = sortActualMatchingRows(collapseActualMatchingRows(filtered.filter(isAutoReversedAccrual), 'auto_reversed'), uiState);
+    const pendingReview = sortActualMatchingRows(collapseActualMatchingRows(filtered.filter(isPendingReviewAccrual), 'pending_review'), uiState);
+    const manuallyReversed = sortActualMatchingRows(collapseActualMatchingRows(filtered.filter(isManuallyReversedAccrual), 'manually_reversed'), uiState);
+    const listedRows = [...autoReversed, ...pendingReview, ...manuallyReversed];
+    const kpiSummary = listedRows.length === 0
         ? emptyKpiSummary()
         : {
             autoReversed: {
-                count: listedAccruals.filter(isAutoReversedAccrual).length,
-                amount: sumUniqueActualMatchingAmounts(listedAccruals.filter(isAutoReversedAccrual)),
+                count: autoReversed.length,
+                amount: sumCollapsedActualMatchingAmounts(autoReversed),
             },
             pendingReview: {
-                count: listedAccruals.filter(isPendingReviewAccrual).length,
-                amount: sumUniqueActualMatchingAmounts(listedAccruals.filter(isPendingReviewAccrual)),
+                count: pendingReview.length,
+                amount: sumCollapsedActualMatchingAmounts(pendingReview),
             },
             totalThisClose: {
-                count: listedAccruals.length,
-                amount: sumUniqueActualMatchingAmounts(listedAccruals),
+                count: listedRows.length,
+                amount: sumCollapsedActualMatchingAmounts(listedRows),
             },
             ai: {
-                count: listedAccruals.filter((accrual) => accrual.origin === 'agent').length,
+                count: listedRows.filter((row) => row.origin === 'agent').length,
             },
             manual: {
-                count: listedAccruals.filter((accrual) => accrual.origin === 'human').length,
+                count: listedRows.filter((row) => row.origin === 'human').length,
             },
         };
     const accrualSearchResults = matchModal.accrualSearch.results

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.22-betaAM2",
+  "version": "5.2.22-betaAM4",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",