@accounter/server 0.0.9-alpha-20251210155614-e6e65aaecafef9e8fedd0b933f613ffcf478cecf → 0.0.9-alpha-20251210170728-fe2c044a6279c36a9ba58b13bae56b181e8f85f5

package/src/__tests__/factories/document.ts

@@ -11,7 +11,7 @@
  * @see packages/server/src/modules/documents/providers/documents.provider.ts (insertDocuments query)
  */
 
-import { makeUUID } from './ids.js';
+import { makeUUIDLegacy } from '../../demo-fixtures/helpers/deterministic-uuid.js';
 
 /**
  * Document insert parameters shape
@@ -67,9 +67,9 @@ export interface DocumentInsertParams {
  * ```typescript
  * // Minimal invoice document
  * const invoice = createDocument({
- *   charge_id: makeUUID('charge-1'),
- *   creditor_id: makeUUID('supplier-1'),
- *   debtor_id: makeUUID('my-business'),
+ *   charge_id: makeUUID('charge', 'charge-1'),
+ *   creditor_id: makeUUID('business', 'supplier-1'),
+ *   debtor_id: makeUUID('business', 'my-business'),
  *   type: 'INVOICE',
  *   total_amount: 1000.0,
  *   currency_code: 'ILS',
@@ -78,9 +78,9 @@ export interface DocumentInsertParams {
  *
  * // Receipt with VAT
  * const receipt = createDocument({
- *   charge_id: makeUUID('charge-2'),
- *   creditor_id: makeUUID('customer-1'),
- *   debtor_id: makeUUID('my-business'),
+ *   charge_id: makeUUID('charge', 'charge-2'),
+ *   creditor_id: makeUUID('business', 'customer-1'),
+ *   debtor_id: makeUUID('business', 'my-business'),
  *   type: 'RECEIPT',
  *   total_amount: 500.0,
  *   currency_code: 'USD',
@@ -93,9 +93,9 @@ export interface DocumentInsertParams {
  * // Invoice with full metadata
  * const detailedInvoice = createDocument(
  *   {
- *     charge_id: makeUUID('charge-3'),
- *     creditor_id: makeUUID('supplier-2'),
- *     debtor_id: makeUUID('my-business'),
+ *     charge_id: makeUUID('charge', 'charge-3'),
+ *     creditor_id: makeUUID('business', 'supplier-2'),
+ *     debtor_id: makeUUID('business', 'my-business'),
  *     type: 'INVOICE',
  *     total_amount: 2500.0,
  *     currency_code: 'EUR',
@@ -123,7 +123,7 @@ export function createDocument(
   overrides?: Partial<DocumentInsertParams>,
 ): DocumentInsertParams {
   return {
-    id: makeUUID(),
+    id: makeUUIDLegacy(),
     image_url: null,
     file_url: null,
     type: params.type,

package/src/__tests__/factories/financial-account.test.ts

@@ -3,7 +3,7 @@ import {
   createFinancialAccount,
   FINANCIAL_ACCOUNT_TYPES,
 } from './financial-account.js';
-import { makeUUID } from './ids.js';
+import { makeUUID } from '../../demo-fixtures/helpers/deterministic-uuid.js';
 
 describe('Factory: Financial Account', () => {
   describe('FINANCIAL_ACCOUNT_TYPES', () => {
@@ -47,7 +47,7 @@ describe('Factory: Financial Account', () => {
     });
 
     it('should apply overrides correctly', () => {
-      const ownerId = makeUUID('business-owner');
+      const ownerId = makeUUID('business', 'business-owner');
       const account = createFinancialAccount({
         accountNumber: '123456789',
         name: 'Main Business Account',
@@ -96,7 +96,7 @@ describe('Factory: Financial Account', () => {
     });
 
     it('should create bank account scenario', () => {
-      const ownerId = makeUUID('business');
+      const ownerId = makeUUID('business', 'business');
       const account = createFinancialAccount({
         accountNumber: '12-345-6789',
         type: 'BANK_ACCOUNT',
@@ -113,7 +113,7 @@ describe('Factory: Financial Account', () => {
     });
 
     it('should create credit card scenario', () => {
-      const ownerId = makeUUID('business');
+      const ownerId = makeUUID('business', 'business');
       const account = createFinancialAccount({
         accountNumber: '4580-****-****-1234',
         type: 'CREDIT_CARD',
@@ -127,7 +127,7 @@ describe('Factory: Financial Account', () => {
     });
 
     it('should create crypto wallet scenario', () => {
-      const ownerId = makeUUID('business');
+      const ownerId = makeUUID('business', 'business');
       const account = createFinancialAccount({
         accountNumber: '0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb',
         type: 'CRYPTO_WALLET',
@@ -141,7 +141,7 @@ describe('Factory: Financial Account', () => {
     });
 
     it('should create bank deposit account scenario', () => {
-      const ownerId = makeUUID('business');
+      const ownerId = makeUUID('business', 'business');
       const account = createFinancialAccount({
         accountNumber: 'DEP-123456',
         type: 'BANK_DEPOSIT_ACCOUNT',
@@ -154,7 +154,7 @@ describe('Factory: Financial Account', () => {
     });
 
     it('should create foreign securities account scenario', () => {
-      const ownerId = makeUUID('business');
+      const ownerId = makeUUID('business', 'business');
       const account = createFinancialAccount({
         accountNumber: 'SEC-US-789',
         type: 'FOREIGN_SECURITIES',

package/src/__tests__/factories/financial-account.ts

@@ -2,7 +2,7 @@ import type {
   financial_account_type,
   IInsertFinancialAccountsParams,
 } from '../../modules/financial-accounts/__generated__/financial-accounts.types.js';
-import { makeUUID } from './ids.js';
+import { makeUUIDLegacy } from '../../demo-fixtures/helpers/deterministic-uuid.js';
 
 /**
  * Valid financial account types
@@ -59,11 +59,11 @@ export function createFinancialAccount(
   overrides?: Partial<IInsertFinancialAccountsParams['bankAccounts'][number]>,
 ): IInsertFinancialAccountsParams['bankAccounts'][number] {
   return {
-    accountNumber: makeUUID().slice(0, 13), // Default: unique short string
+    accountNumber: makeUUIDLegacy().slice(0, 13), // Default: unique short string
     name: null,
     privateBusiness: 'PRIVATE',
     ownerId: null,
     type: 'BANK_ACCOUNT',
     ...overrides,
   };
-}
+}

package/src/__tests__/factories/index.test.ts

@@ -36,18 +36,18 @@ describe('Factory Integration', () => {
 
   it('should create a complete expense scenario using factories', () => {
     // Setup: Create supporting entities
-    const supplierId = makeUUID('supplier-local');
+    const supplierId = makeUUID('business', 'supplier-local');
     const supplier = createBusiness({
       id: supplierId,
       hebrewName: 'ספק מקומי',
     });
 
-    const taxCategoryId = makeUUID('tax-expense');
+    const taxCategoryId = makeUUID('tax-category', 'tax-expense');
     const taxCategory = createTaxCategory({
       id: taxCategoryId,
     });
 
-    const accountId = makeUUID('bank-account');
+    const accountId = makeUUID('financial-account', 'bank-account');
     const account = createFinancialAccount({
       accountNumber: accountId,
       type: 'BANK_ACCOUNT',
@@ -55,7 +55,7 @@ describe('Factory Integration', () => {
     });
 
     // Act: Create charge with transaction and document
-    const chargeId = makeUUID('expense-charge');
+    const chargeId = makeUUID('charge', 'expense-charge');
     const charge = createCharge(
       {
         owner_id: supplierId,
@@ -106,8 +106,8 @@ describe('Factory Integration', () => {
 
   it('should create deterministic UUIDs with seeds', () => {
     // Create same entities twice with same seeds
-    const business1 = createBusiness({ id: makeUUID('biz-1') });
-    const business2 = createBusiness({ id: makeUUID('biz-1') });
+    const business1 = createBusiness({ id: makeUUID('business', 'biz-1') });
+    const business2 = createBusiness({ id: makeUUID('business', 'biz-1') });
 
     expect(business1.id).toBe(business2.id);
   });
@@ -118,7 +118,7 @@ describe('Factory Integration', () => {
     types.forEach((type, index) => {
       const account = createFinancialAccount({
         type,
-        ownerId: makeUUID(`owner-${index}`),
+        ownerId: makeUUID('business', `owner-${index}`),
       });
 
       expect(account.type).toBe(type);
@@ -128,8 +128,8 @@ describe('Factory Integration', () => {
 
   it('should handle numeric conversions correctly', () => {
     const transaction = createTransaction({
-      charge_id: makeUUID('charge-1'),
-      business_id: makeUUID('business-1'),
+      charge_id: makeUUID('charge', 'charge-1'),
+      business_id: makeUUID('business', 'business-1'),
       amount: -123.45, // Number input
       currency: 'USD',
       event_date: '2024-01-15',
@@ -140,9 +140,9 @@ describe('Factory Integration', () => {
   });
 
   it('should create documents with different types', () => {
-    const chargeId = makeUUID('charge-doc');
-    const creditorId = makeUUID('creditor');
-    const debtorId = makeUUID('debtor');
+    const chargeId = makeUUID('charge', 'charge-doc');
+    const creditorId = makeUUID('business', 'creditor');
+    const debtorId = makeUUID('business', 'debtor');
 
     const invoice = createDocument({
       charge_id: chargeId,

package/src/__tests__/factories/index.ts

@@ -18,7 +18,7 @@
  * } from '../factories';
  *
  * // Create a complete charge scenario
- * const businessId = makeUUID('supplier-1');
+ * const businessId = makeUUID('business', 'supplier-1');
  * const business = createBusiness({ id: businessId });
  * const charge = createCharge({ owner_id: businessId });
  * const transaction = createTransaction({
@@ -51,6 +51,6 @@ export { createDocument } from './document.js';
 export type { DocumentInsertParams } from './document.js';
 
 // Helper utilities
-export { makeUUID } from './ids.js';
+export { makeUUID } from '../../demo-fixtures/helpers/deterministic-uuid.js';
 export { iso, isoToday, addDays } from './dates.js';
 export { formatNumeric, formatMoney, formatDecimal, parseNumeric } from './money.js';

package/src/__tests__/factories/tax-category.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { UUID_REGEX } from '../../shared/constants.js';
-import { makeUUID } from './ids.js';
+import { makeUUID } from '../../demo-fixtures/helpers/deterministic-uuid.js';
 import { createTaxCategory } from './tax-category.js';
 
 describe('Factory: Tax Category', () => {
@@ -27,7 +27,7 @@ describe('Factory: Tax Category', () => {
     });
 
     it('should apply overrides correctly', () => {
-      const customId = makeUUID('tax-cat-expense');
+      const customId = makeUUID('tax-category', 'tax-cat-expense');
       const category = createTaxCategory({
         id: customId,
         hashavshevetName: 'משרדיות',
@@ -84,8 +84,8 @@ describe('Factory: Tax Category', () => {
     });
 
     it('should create deterministic categories with seed', () => {
-      const category1 = createTaxCategory({ id: makeUUID('default-category') });
-      const category2 = createTaxCategory({ id: makeUUID('default-category') });
+      const category1 = createTaxCategory({ id: makeUUID('tax-category', 'default-category') });
+      const category2 = createTaxCategory({ id: makeUUID('tax-category', 'default-category') });
 
       expect(category1.id).toBe(category2.id);
     });

package/src/__tests__/factories/tax-category.ts

@@ -1,5 +1,5 @@
 import type { IInsertTaxCategoryParams } from '../../modules/financial-entities/__generated__/tax-categories.types.js';
-import { makeUUID } from './ids.js';
+import { makeUUIDLegacy } from '../../demo-fixtures/helpers/deterministic-uuid.js';
 
 /**
  * Tax category factory for test fixtures
@@ -17,17 +17,17 @@ import { makeUUID } from './ids.js';
  * @example
  * ```typescript
  * // Minimal tax category
- * const category = createTaxCategory({ id: makeUUID('expense-general') });
+ * const category = createTaxCategory({ id: makeUUID('tax-category', 'expense-general') });
  *
  * // Tax category with Hashavshevet integration
  * const integrated = createTaxCategory({
- *   id: makeUUID('expense-office'),
+ *   id: makeUUID('tax-category', 'expense-office'),
  *   hashavshevetName: 'משרדיות',
  * });
  *
  * // Tax-excluded category
  * const excluded = createTaxCategory({
- *   id: makeUUID('income-exempt'),
+ *   id: makeUUID('tax-category', 'income-exempt'),
  *   taxExcluded: true,
  * });
  * ```
@@ -35,10 +35,11 @@ import { makeUUID } from './ids.js';
 export function createTaxCategory(
   overrides?: Partial<IInsertTaxCategoryParams>,
 ): IInsertTaxCategoryParams {
+  const defaultId = makeUUIDLegacy();
   return {
-    id: makeUUID(),
+    id: defaultId,
     hashavshevetName: null,
     taxExcluded: false,
     ...overrides,
   };
-}
+}

package/src/__tests__/factories/transaction.test.ts

@@ -1,13 +1,13 @@
 import { describe, expect, it } from 'vitest';
 import { UUID_REGEX } from '../../shared/constants.js';
 import { createTransaction } from './transaction.js';
-import { makeUUID } from './ids.js';
+import { makeUUID } from '../../demo-fixtures/helpers/deterministic-uuid.js';
 
 describe('Factory: Transaction', () => {
   describe('createTransaction', () => {
     it('should create transaction with required fields', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('business-1');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'business-1');
 
       const transaction = createTransaction({
         charge_id: chargeId,
@@ -40,8 +40,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should generate unique IDs by default', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('business-1');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'business-1');
 
       const transaction1 = createTransaction({
         charge_id: chargeId,
@@ -63,8 +63,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should accept numeric amount and convert to string', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('business-1');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'business-1');
 
       const transaction = createTransaction({
         charge_id: chargeId,
@@ -78,8 +78,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should accept Date object for event_date and convert to ISO string', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('business-1');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'business-1');
       const date = new Date('2024-03-15T12:00:00Z');
 
       const transaction = createTransaction({
@@ -94,8 +94,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should handle is_fee parameter', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('bank');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'bank');
 
       const feeTransaction = createTransaction({
         charge_id: chargeId,
@@ -110,10 +110,10 @@ describe('Factory: Transaction', () => {
     });
 
     it('should apply overrides correctly', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('business-1');
-      const customId = makeUUID('custom-tx');
-      const accountId = makeUUID('eur-account');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'business-1');
+      const customId = makeUUID('transaction', 'custom-tx');
+      const accountId = makeUUID('financial-account', 'eur-account');
 
       const transaction = createTransaction(
         {
@@ -140,8 +140,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should allow partial overrides', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('business-1');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'business-1');
 
       const transaction = createTransaction(
         {
@@ -162,8 +162,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should preserve all required fields', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('business-1');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'business-1');
 
       const transaction = createTransaction({
         charge_id: chargeId,
@@ -189,8 +189,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should handle different currency types', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('business-1');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'business-1');
 
       const ilsTransaction = createTransaction({
         charge_id: chargeId,
@@ -222,8 +222,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should handle negative amounts (expenses)', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('supplier');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'supplier');
 
       const expense = createTransaction({
         charge_id: chargeId,
@@ -237,8 +237,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should handle positive amounts (income)', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('customer');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'customer');
 
       const income = createTransaction({
         charge_id: chargeId,
@@ -252,8 +252,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should allow explicit null overrides', () => {
-      const chargeId = makeUUID('charge-1');
-      const businessId = makeUUID('business-1');
+      const chargeId = makeUUID('charge', 'charge-1');
+      const businessId = makeUUID('business', 'business-1');
 
       const transaction = createTransaction(
         {

package/src/__tests__/factories/transaction.ts

@@ -10,7 +10,7 @@
  * @see packages/migrations/src/actions/2024-01-29T13-15-23.initial.ts (transactions table)
  */
 
-import { makeUUID } from './ids.js';
+import { makeUUID, makeUUIDLegacy } from '../../demo-fixtures/helpers/deterministic-uuid.js';
 import { formatNumeric } from './money.js';
 
 /**
@@ -61,8 +61,8 @@ export interface TransactionInsertParams {
  * ```typescript
  * // Minimal transaction with required fields
  * const transaction = createTransaction({
- *   charge_id: makeUUID('charge-1'),
- *   business_id: makeUUID('supplier-1'),
+ *   charge_id: makeUUID('charge', 'charge-1'),
+ *   business_id: makeUUID('business', 'supplier-1'),
  *   amount: '-100.50',
  *   currency: 'ILS',
  *   event_date: '2024-01-15',
@@ -70,8 +70,8 @@ export interface TransactionInsertParams {
  *
  * // Transaction with optional is_fee flag
  * const feeTransaction = createTransaction({
- *   charge_id: makeUUID('charge-1'),
- *   business_id: makeUUID('bank'),
+ *   charge_id: makeUUID('charge', 'charge-1'),
+ *   business_id: makeUUID('business', 'bank'),
  *   amount: '-5.00',
  *   currency: 'USD',
  *   event_date: '2024-01-15',
@@ -81,14 +81,14 @@ export interface TransactionInsertParams {
  * // Transaction with full overrides
  * const customTransaction = createTransaction(
  *   {
- *     charge_id: makeUUID('charge-1'),
- *     business_id: makeUUID('supplier-1'),
+ *     charge_id: makeUUID('charge', 'charge-1'),
+ *     business_id: makeUUID('business', 'supplier-1'),
  *     amount: '500.00',
  *     currency: 'EUR',
  *     event_date: '2024-03-10',
  *   },
  *   {
- *     account_id: makeUUID('eur-account'),
+ *     account_id: makeUUID('account', 'eur-account'),
  *     source_description: 'Invoice payment EUR',
  *     debit_date: '2024-03-12',
  *     current_balance: '15000.00',
@@ -108,10 +108,10 @@ export function createTransaction(
   overrides?: Partial<TransactionInsertParams>,
 ): TransactionInsertParams {
   return {
-    id: makeUUID(),
-    account_id: makeUUID('default-account'),
+    id: makeUUIDLegacy(),
+    account_id: makeUUID('account', 'default-account'),
     charge_id: params.charge_id,
-    source_id: makeUUID('source-raw-tx'),
+    source_id: makeUUID('transaction-source', 'source-raw-tx'),
     source_description: null,
     currency: params.currency,
     event_date:

package/src/__tests__/fixtures/expenses/expense-scenario-a.ts

@@ -23,7 +23,7 @@ import {
   createTaxCategory,
   createFinancialAccount,
 } from '../../factories';
-import { makeUUID } from '../../factories/ids';
+import { makeUUID } from '../../../demo-fixtures/helpers/deterministic-uuid.js';
 import type { Fixture } from '../../helpers/fixture-types';
 import { CountryCode } from '../../../modules/countries/types.js';
 import { Currency } from '../../../shared/enums.js';
@@ -55,13 +55,13 @@ export const expenseScenarioA: Fixture = {
     businesses: [
       // Admin business (owner of the expense)
       createBusiness({
-        id: makeUUID('admin-business'),
+        id: makeUUID('business', 'admin-business-scenario-a'),
         hebrewName: 'חשבונאות ניהול',
         country: CountryCode.Israel,
       }),
       // Supplier business
       createBusiness({
-        id: makeUUID('supplier-local-ltd'),
+        id: makeUUID('business', 'supplier-local-ltd'),
         hebrewName: 'ספק מקומי בע"מ',
         country: CountryCode.Israel,
         exemptDealer: false,
@@ -73,11 +73,11 @@ export const expenseScenarioA: Fixture = {
   taxCategories: {
     taxCategories: [
       createTaxCategory({
-        id: makeUUID('expense-general'),
+        id: makeUUID('tax-category', 'expense-general'),
         hashavshevetName: 'General Expenses',
       }),
       createTaxCategory({
-        id: makeUUID('bank-account-tax-category'),
+        id: makeUUID('tax-category', 'bank-account-tax-category'),
         hashavshevetName: 'Bank Account',
       }),
     ],
@@ -88,7 +88,7 @@ export const expenseScenarioA: Fixture = {
       createFinancialAccount({
         accountNumber: 'BANK-ACCOUNT-001',
         type: 'BANK_ACCOUNT',
-        ownerId: makeUUID('admin-business'),
+        ownerId: makeUUID('business', 'admin-business-scenario-a'),
       }),
     ],
   },
@@ -98,7 +98,7 @@ export const expenseScenarioA: Fixture = {
       {
         accountNumber: 'BANK-ACCOUNT-001',
           currency: Currency.Ils,
-        taxCategoryId: makeUUID('bank-account-tax-category'),
+        taxCategoryId: makeUUID('tax-category', 'bank-account-tax-category'),
       },
     ],
   },
@@ -107,12 +107,12 @@ export const expenseScenarioA: Fixture = {
     charges: [
       createCharge(
         {
-          owner_id: makeUUID('admin-business'),
-          tax_category_id: makeUUID('expense-general'),
+          owner_id: makeUUID('business', 'admin-business-scenario-a'),
+          tax_category_id: makeUUID('tax-category', 'expense-general'),
           user_description: 'Office supplies purchase',
         },
         {
-          id: makeUUID('charge-office-supplies'),
+          id: makeUUID('charge', 'charge-office-supplies'),
         },
       ),
     ],
@@ -122,15 +122,15 @@ export const expenseScenarioA: Fixture = {
     transactions: [
       createTransaction(
         {
-          charge_id: makeUUID('charge-office-supplies'),
-          business_id: makeUUID('supplier-local-ltd'),
+          charge_id: makeUUID('charge', 'charge-office-supplies'),
+          business_id: makeUUID('business', 'supplier-local-ltd'),
           amount: '-500.00', // Negative = expense/outflow
             currency: Currency.Ils,
           event_date: '2024-01-15',
           is_fee: false,
         },
         {
-          id: makeUUID('transaction-supplies-payment'),
+          id: makeUUID('transaction', 'transaction-supplies-payment'),
           account_id: 'BANK-ACCOUNT-001', // Will be resolved to UUID by loader
           source_description: 'Office supplies - Local Supplier Ltd',
           debit_date: '2024-01-15',
@@ -144,16 +144,16 @@ export const expenseScenarioA: Fixture = {
     documents: [
       createDocument(
         {
-          charge_id: makeUUID('charge-office-supplies'),
-          creditor_id: makeUUID('supplier-local-ltd'), // Supplier is creditor
-          debtor_id: makeUUID('admin-business'), // Admin is debtor (owes money)
+          charge_id: makeUUID('charge', 'charge-office-supplies'),
+          creditor_id: makeUUID('business', 'supplier-local-ltd'), // Supplier is creditor
+          debtor_id: makeUUID('business', 'admin-business-scenario-a'), // Admin is debtor (owes money)
           type: 'RECEIPT',
           total_amount: 500.0, // Matches transaction amount (positive in document)
             currency_code: Currency.Ils,
           date: '2024-01-15', // Receipt date matches transaction
         },
         {
-          id: makeUUID('document-supplies-receipt'),
+          id: makeUUID('document', 'document-supplies-receipt'),
           serial_number: 'RCP-2024-001',
           vat_amount: null, // For simplicity, no VAT breakdown on receipt
         },
@@ -164,10 +164,10 @@ export const expenseScenarioA: Fixture = {
   expectations: {
     ledger: [
       {
-        chargeId: makeUUID('charge-office-supplies'),
+        chargeId: makeUUID('charge', 'charge-office-supplies'),
         recordCount: 2, // Debit expense + credit bank
-        debitEntities: [makeUUID('expense-general')],
-        creditEntities: [makeUUID('bank-account-tax-category')],
+        debitEntities: [makeUUID('tax-category', 'expense-general')],
+        creditEntities: [makeUUID('tax-category', 'bank-account-tax-category')],
         totalDebitLocal: 500.0,
         totalCreditLocal: 500.0,
         balanced: true,