@accounter/server 0.0.8-alpha-20251104081410-ad15de052a742b1353c38e22ebbcae3e9e0b4d90 → 0.0.8-alpha-20251104115901-2a484be84dde31c9a4be251038269ba4823b6dc9

package/src/modules/charges-matcher/__generated__/types.ts

@@ -5,7 +5,7 @@ export namespace ChargesMatcherModule {
     Query: 'findChargeMatches';
     Mutation: 'autoMatchCharges';
     ChargeMatchesResult: 'matches';
-    ChargeMatch: 'chargeId' | 'confidenceScore';
+    ChargeMatch: 'chargeId' | 'charge' | 'confidenceScore';
     AutoMatchChargesResult: 'totalMatches' | 'mergedCharges' | 'skippedCharges' | 'errors';
     MergedCharge: 'chargeId' | 'confidenceScore';
   };
@@ -16,6 +16,7 @@ export namespace ChargesMatcherModule {
   export type Mutation = Pick<Types.Mutation, DefinedFields['Mutation']>;
   export type AutoMatchChargesResult = Pick<Types.AutoMatchChargesResult, DefinedFields['AutoMatchChargesResult']>;
   export type ChargeMatch = Pick<Types.ChargeMatch, DefinedFields['ChargeMatch']>;
+  export type Charge = Types.Charge;
   export type MergedCharge = Pick<Types.MergedCharge, DefinedFields['MergedCharge']>;
   
   export type QueryResolvers = Pick<Types.QueryResolvers, DefinedFields['Query']>;
@@ -53,6 +54,7 @@ export namespace ChargesMatcherModule {
     ChargeMatch?: {
       '*'?: gm.Middleware[];
       chargeId?: gm.Middleware[];
+      charge?: gm.Middleware[];
       confidenceScore?: gm.Middleware[];
     };
     AutoMatchChargesResult?: {

package/src/modules/charges-matcher/__tests__/auto-match-integration.test.ts

@@ -40,7 +40,6 @@ type Injector = {
 
 // Test constants
 const ADMIN_BUSINESS_ID = 'user-123';
-const BUSINESS_A = 'business-a';
 
 // Helper to create charge
 function createCharge(id: string, ownerId: string) {

package/src/modules/charges-matcher/__tests__/test-helpers.ts

@@ -1,7 +1,7 @@
 import type {
   Transaction,
   Document,
-  ChargeMatch,
+  ChargeMatchProto,
   AggregatedTransaction,
   AggregatedDocument,
   ConfidenceScores,
@@ -125,8 +125,8 @@ export function createMockConfidenceScores(
 /**
  * Factory for creating mock charge matches
  */
-export function createMockChargeMatch(overrides: Partial<ChargeMatch> = {}): ChargeMatch {
-  const defaultMatch: ChargeMatch = {
+export function createMockChargeMatch(overrides: Partial<ChargeMatchProto> = {}): ChargeMatchProto {
+  const defaultMatch: ChargeMatchProto = {
     chargeId: '00000000-0000-0000-0000-000000000099',
     confidenceScore: 0.95,
   };

package/src/modules/charges-matcher/providers/auto-match.provider.ts

@@ -146,8 +146,10 @@ export function determineMergeDirection(
   charge1: ChargeWithData,
   charge2: ChargeWithData,
 ): [ChargeWithData, ChargeWithData] {
+  const charge1HasDescription = charge1.description && charge1.description.length > 0;
   const charge1HasTransactions = charge1.transactions && charge1.transactions.length > 0;
   const charge1HasDocuments = charge1.documents && charge1.documents.length > 0;
+  const charge2HasDescription = charge2.description && charge2.description.length > 0;
   const charge2HasTransactions = charge2.transactions && charge2.transactions.length > 0;
   const charge2HasDocuments = charge2.documents && charge2.documents.length > 0;
 
@@ -162,7 +164,15 @@ export function determineMergeDirection(
     return [charge1, charge2]; // Merge charge1 INTO charge2 (keep charge2)
   }
 
-  // Rule 2: Both unmatched - keep the one with transactions
+  // Rule 2: Both unmatched - keep the one with description
+  if (charge1HasDescription && !charge2HasDescription) {
+    return [charge2, charge1]; // Merge charge2 INTO charge1 (keep description charge)
+  }
+  if (charge2HasDescription && !charge1HasDescription) {
+    return [charge1, charge2]; // Merge charge1 INTO charge2 (keep description charge)
+  }
+
+  // Rule 3: Neither has description or both have description - keep the one with transactions
   if (charge1HasTransactions && !charge2HasTransactions) {
     return [charge2, charge1]; // Merge charge2 INTO charge1 (keep transaction charge)
   }

package/src/modules/charges-matcher/providers/charges-matcher.provider.ts

@@ -5,6 +5,7 @@
  * Integrates with existing modules: charges, transactions, and documents.
  */
 
+import { subYears } from 'date-fns';
 import { Injectable, Scope } from 'graphql-modules';
 import { mergeChargesExecutor } from '@modules/charges/helpers/merge-charges.hepler.js';
 import { ChargesProvider } from '@modules/charges/providers/charges.provider.js';
@@ -116,36 +117,42 @@ export class ChargesMatcherProvider {
     // Step 6: Load transactions and documents for all candidate charges
     const candidateChargesWithData: Array<TransactionCharge | DocumentCharge> = [];
 
-    for (const candidate of candidateCharges) {
-      // Skip the source charge itself
-      if (candidate.id === chargeId) {
-        continue;
-      }
+    await Promise.all(
+      candidateCharges.map(async candidate => {
+        // Skip the source charge itself
+        if (candidate.id === chargeId) {
+          return;
+        }
 
-      const candidateTransactions = (await transactionsProvider.transactionsByChargeIDLoader.load(
-        candidate.id,
-      )) as Transaction[];
-      const candidateDocuments = (await documentsProvider.getDocumentsByChargeIdLoader.load(
-        candidate.id,
-      )) as Document[];
-
-      const hasTxs = candidateTransactions && candidateTransactions.length > 0;
-      const hasDocs = candidateDocuments && candidateDocuments.length > 0;
-
-      // Only include unmatched charges (not both types)
-      if (hasTxs && !hasDocs) {
-        candidateChargesWithData.push({
-          chargeId: candidate.id,
-          transactions: candidateTransactions,
-        });
-      } else if (hasDocs && !hasTxs) {
-        candidateChargesWithData.push({
-          chargeId: candidate.id,
-          documents: candidateDocuments,
-        });
-      }
-      // Skip matched charges (have both) and empty charges (have neither)
-    }
+        const candidateTransactionsPromise = transactionsProvider.transactionsByChargeIDLoader.load(
+          candidate.id,
+        ) as Promise<Transaction[]>;
+        const candidateDocumentsPromise = documentsProvider.getDocumentsByChargeIdLoader.load(
+          candidate.id,
+        ) as Promise<Document[]>;
+        const [candidateTransactions, candidateDocuments] = await Promise.all([
+          candidateTransactionsPromise,
+          candidateDocumentsPromise,
+        ]);
+
+        const hasTxs = candidateTransactions && candidateTransactions.length > 0;
+        const hasDocs = candidateDocuments && candidateDocuments.length > 0;
+
+        // Only include unmatched charges (not both types)
+        if (hasTxs && !hasDocs) {
+          candidateChargesWithData.push({
+            chargeId: candidate.id,
+            transactions: candidateTransactions,
+          });
+        } else if (hasDocs && !hasTxs) {
+          candidateChargesWithData.push({
+            chargeId: candidate.id,
+            documents: candidateDocuments,
+          });
+        }
+        // Skip matched charges (have both) and empty charges (have neither)
+      }),
+    );
 
     // Step 7: Build source charge object for findMatches
     let sourceChargeData: TransactionCharge | DocumentCharge;
@@ -208,30 +215,40 @@ export class ChargesMatcherProvider {
     const documentsProvider = injector.get(DocumentsProvider);
 
     // Step 1: Load all charges for this user
+    const prevYear = dateToTimelessDateString(subYears(new Date(), 1));
     const allCharges = await chargesProvider.getChargesByFilters({
       ownerIds: [adminBusinessId],
+      fromAnyDate: prevYear,
     });
 
     // Step 2: Load transactions and documents for all charges
     const chargesWithData: ChargeWithData[] = [];
     const mergedChargeIds = new Set<string>(); // Track merged charges to exclude from processing
 
-    for (const charge of allCharges) {
-      const transactions = (await transactionsProvider.transactionsByChargeIDLoader.load(
-        charge.id,
-      )) as Transaction[];
-      const documents = (await documentsProvider.getDocumentsByChargeIdLoader.load(
-        charge.id,
-      )) as Document[];
-
-      chargesWithData.push({
-        chargeId: charge.id,
-        ownerId: charge.owner_id ?? adminBusinessId,
-        type: ChargeType.TRANSACTION_ONLY, // Will be determined by processChargeForAutoMatch
-        transactions: transactions || [],
-        documents: documents || [],
-      });
-    }
+    await Promise.all(
+      allCharges.map(async charge => {
+        const transactionsPromise = transactionsProvider.transactionsByChargeIDLoader.load(
+          charge.id,
+        ) as Promise<Transaction[]>;
+        const documentsPromise = documentsProvider.getDocumentsByChargeIdLoader.load(
+          charge.id,
+        ) as Promise<Document[]>;
+
+        const [transactions, documents] = await Promise.all([
+          transactionsPromise,
+          documentsPromise,
+        ]);
+
+        chargesWithData.push({
+          chargeId: charge.id,
+          ownerId: charge.owner_id ?? adminBusinessId,
+          type: ChargeType.TRANSACTION_ONLY, // Will be determined by processChargeForAutoMatch
+          description: charge.user_description ?? undefined,
+          transactions: transactions || [],
+          documents: documents || [],
+        });
+      }),
+    );
 
     // Step 3: Filter to get only unmatched charges
     const unmatchedCharges = chargesWithData.filter(charge => {
@@ -288,7 +305,7 @@ export class ChargesMatcherProvider {
             // Track successful merge
             result.totalMatches++;
             result.mergedCharges.push({
-              chargeId: sourceToMerge.chargeId,
+              chargeId: targetToKeep.chargeId,
               confidenceScore: processResult.match.confidenceScore,
             });
 

package/src/modules/charges-matcher/resolvers/index.ts

@@ -1,3 +1,4 @@
+import { ChargesProvider } from '@modules/charges/providers/charges.provider.js';
 import type { ChargesMatcherModule } from '../types.js';
 import { autoMatchChargesResolver } from './auto-match-charges.resolver.js';
 import { findChargeMatchesResolver } from './find-charge-matches.resolver.js';
@@ -9,4 +10,8 @@ export const chargesMatcherResolvers: ChargesMatcherModule.Resolvers = {
   Mutation: {
     ...autoMatchChargesResolver.Mutation,
   },
+  ChargeMatch: {
+    charge: async ({ chargeId }, _args, { injector }) =>
+      injector.get(ChargesProvider).getChargeByIdLoader.load(chargeId),
+  },
 };

package/src/modules/charges-matcher/typeDefs/charges-matcher.graphql.ts

@@ -21,6 +21,7 @@ export default gql`
   type ChargeMatch {
     " UUID of the matched charge "
     chargeId: UUID!
+    charge: Charge!
     " Confidence score between 0.00 and 1.00 "
     confidenceScore: Float!
   }

package/src/modules/charges-matcher/types.ts

@@ -1,8 +1,6 @@
 import type { currency, document_type, IGetAllDocumentsResult } from '@modules/documents/types.js';
 import type { IGetTransactionsByIdsResult } from '@modules/transactions/types.js';
 
-export * from './__generated__/types.js';
-
 /**
  * Re-export shared types from other modules
  */
@@ -26,7 +24,7 @@ export type Document = IGetAllDocumentsResult;
 /**
  * Represents a single charge match with its confidence score
  */
-export interface ChargeMatch {
+export interface ChargeMatchProto {
   /** UUID of the matched charge */
   chargeId: string;
   /** Confidence score between 0.00 and 1.00 (two decimal precision) */
@@ -38,7 +36,7 @@ export interface ChargeMatch {
  */
 export interface ChargeMatchesResult {
   /** Array of up to 5 matches, ordered by confidence score (highest first) */
-  matches: ChargeMatch[];
+  matches: ChargeMatchProto[];
 }
 
 /**
@@ -149,6 +147,8 @@ export interface ChargeWithData {
   ownerId: string;
   /** Charge classification */
   type: ChargeType;
+  /** Charge description */
+  description?: string;
   /** Associated transactions (if any) */
   transactions: Transaction[];
   /** Associated documents (if any) */
@@ -198,3 +198,5 @@ export interface DocumentCharge {
   /** Array of documents in the charge */
   documents: Document[];
 }
+
+export * from './__generated__/types.js';