@accounter/server 0.0.9-alpha-20251210153039-1cfd8df346dd211c95a70c76c63465a29236849b → 0.0.9-alpha-20251210155614-e6e65aaecafef9e8fedd0b933f613ffcf478cecf

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

@@ -23,7 +23,7 @@ import {
   createTaxCategory,
   createFinancialAccount,
 } from '../../factories';
-import { makeUUID } from '../../../demo-fixtures/helpers/deterministic-uuid.js';
+import { makeUUID } from '../../factories/ids';
 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('business', 'admin-business-scenario-a'),
+        id: makeUUID('admin-business'),
         hebrewName: 'חשבונאות ניהול',
         country: CountryCode.Israel,
       }),
       // Supplier business
       createBusiness({
-        id: makeUUID('business', 'supplier-local-ltd'),
+        id: makeUUID('supplier-local-ltd'),
         hebrewName: 'ספק מקומי בע"מ',
         country: CountryCode.Israel,
         exemptDealer: false,
@@ -73,11 +73,11 @@ export const expenseScenarioA: Fixture = {
   taxCategories: {
     taxCategories: [
       createTaxCategory({
-        id: makeUUID('tax-category', 'expense-general'),
+        id: makeUUID('expense-general'),
         hashavshevetName: 'General Expenses',
       }),
       createTaxCategory({
-        id: makeUUID('tax-category', 'bank-account-tax-category'),
+        id: makeUUID('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('business', 'admin-business-scenario-a'),
+        ownerId: makeUUID('admin-business'),
       }),
     ],
   },
@@ -98,7 +98,7 @@ export const expenseScenarioA: Fixture = {
       {
         accountNumber: 'BANK-ACCOUNT-001',
           currency: Currency.Ils,
-        taxCategoryId: makeUUID('tax-category', 'bank-account-tax-category'),
+        taxCategoryId: makeUUID('bank-account-tax-category'),
       },
     ],
   },
@@ -107,12 +107,12 @@ export const expenseScenarioA: Fixture = {
     charges: [
       createCharge(
         {
-          owner_id: makeUUID('business', 'admin-business-scenario-a'),
-          tax_category_id: makeUUID('tax-category', 'expense-general'),
+          owner_id: makeUUID('admin-business'),
+          tax_category_id: makeUUID('expense-general'),
           user_description: 'Office supplies purchase',
         },
         {
-          id: makeUUID('charge', 'charge-office-supplies'),
+          id: makeUUID('charge-office-supplies'),
         },
       ),
     ],
@@ -122,15 +122,15 @@ export const expenseScenarioA: Fixture = {
     transactions: [
       createTransaction(
         {
-          charge_id: makeUUID('charge', 'charge-office-supplies'),
-          business_id: makeUUID('business', 'supplier-local-ltd'),
+          charge_id: makeUUID('charge-office-supplies'),
+          business_id: makeUUID('supplier-local-ltd'),
           amount: '-500.00', // Negative = expense/outflow
             currency: Currency.Ils,
           event_date: '2024-01-15',
           is_fee: false,
         },
         {
-          id: makeUUID('transaction', 'transaction-supplies-payment'),
+          id: makeUUID('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', '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)
+          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)
           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', 'document-supplies-receipt'),
+          id: makeUUID('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', 'charge-office-supplies'),
+        chargeId: makeUUID('charge-office-supplies'),
         recordCount: 2, // Debit expense + credit bank
-        debitEntities: [makeUUID('tax-category', 'expense-general')],
-        creditEntities: [makeUUID('tax-category', 'bank-account-tax-category')],
+        debitEntities: [makeUUID('expense-general')],
+        creditEntities: [makeUUID('bank-account-tax-category')],
         totalDebitLocal: 500.0,
         totalCreditLocal: 500.0,
         balanced: true,

package/src/__tests__/fixtures/expenses/expense-scenario-b.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import { expenseScenarioB } from './expense-scenario-b';
 import { validateFixture } from '../../helpers/fixture-validation';
-import { makeUUID } from '../../../demo-fixtures/helpers/deterministic-uuid.js';
+import { makeUUID } from '../../factories/ids';
 import { CountryCode } from '../../../modules/countries/types.js';
 import { Currency } from '../../../shared/enums.js';
 
@@ -39,8 +39,8 @@ describe('Expense Scenario B - USD Invoice', () => {
 
   it('should have correct business entities', () => {
     const businesses = expenseScenarioB.businesses!.businesses;
-    const admin = businesses.find(b => b.id === makeUUID('business', 'admin-business-usd'));
-    const supplier = businesses.find(b => b.id === makeUUID('business', 'supplier-us-vendor-llc'));
+    const admin = businesses.find(b => b.id === makeUUID('admin-business-usd'));
+    const supplier = businesses.find(b => b.id === makeUUID('supplier-us-vendor-llc'));
 
     expect(admin).toBeDefined();
     expect(admin?.country).toBe(CountryCode.Israel);
@@ -51,7 +51,7 @@ describe('Expense Scenario B - USD Invoice', () => {
   });
 
   it('should have referential integrity between charge, transaction, and document', () => {
-    const chargeId = makeUUID('charge', 'charge-consulting-services');
+    const chargeId = makeUUID('charge-consulting-services');
     const charge = expenseScenarioB.charges!.charges[0];
     const transaction = expenseScenarioB.transactions!.transactions[0];
     const document = expenseScenarioB.documents!.documents[0];
@@ -94,7 +94,7 @@ describe('Expense Scenario B - USD Invoice', () => {
   it('should have ledger expectations with exchange rate', () => {
     const ledgerExpectation = expenseScenarioB.expectations!.ledger![0];
 
-    expect(ledgerExpectation.chargeId).toBe(makeUUID('charge', 'charge-consulting-services'));
+    expect(ledgerExpectation.chargeId).toBe(makeUUID('charge-consulting-services'));
     expect(ledgerExpectation.recordCount).toBe(2);
     expect(ledgerExpectation.balanced).toBe(true);
     expect(ledgerExpectation.foreignCurrency).toBe('USD');
@@ -116,14 +116,14 @@ describe('Expense Scenario B - USD Invoice', () => {
     const debitEntity = ledgerExpectation.debitEntities![0];
     const creditEntity = ledgerExpectation.creditEntities![0];
 
-    expect(debitEntity).toBe(makeUUID('tax-category', 'expense-consulting'));
-    expect(creditEntity).toBe(makeUUID('tax-category', 'usd-account-tax-category'));
+    expect(debitEntity).toBe(makeUUID('expense-consulting'));
+    expect(creditEntity).toBe(makeUUID('usd-account-tax-category'));
   });
 
   it('should have USD account mapped to tax category', () => {
     const accountMapping = expenseScenarioB.accountTaxCategories?.mappings[0];
     expect(accountMapping?.accountNumber).toBe('USD-ACCOUNT-001');
     expect(accountMapping?.currency).toBe(Currency.Usd);
-      expect(accountMapping?.taxCategoryId).toBe(makeUUID('tax-category', 'usd-account-tax-category'));
+      expect(accountMapping?.taxCategoryId).toBe(makeUUID('usd-account-tax-category'));
   });
 });

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

@@ -26,7 +26,7 @@ import {
   createTaxCategory,
   createFinancialAccount,
 } from '../../factories';
-import { makeUUID } from '../../../demo-fixtures/helpers/deterministic-uuid.js';
+import { makeUUID } from '../../factories/ids';
 import type { Fixture } from '../../helpers/fixture-types';
 import { CountryCode } from '../../../modules/countries/types.js';
 import { Currency } from '../../../shared/enums.js';
@@ -67,13 +67,13 @@ export const expenseScenarioB: Fixture = {
     businesses: [
       // Admin business (owner of the expense)
       createBusiness({
-        id: makeUUID('business', 'admin-business-usd'),
+        id: makeUUID('admin-business-usd'),
         hebrewName: 'חשבונאות ניהול',
         country: CountryCode.Israel,
       }),
       // US Supplier business
       createBusiness({
-        id: makeUUID('business', 'supplier-us-vendor-llc'),
+        id: makeUUID('supplier-us-vendor-llc'),
         hebrewName: 'ספק אמריקאי',
         country: CountryCode['United States of America (the)'],
         exemptDealer: false,
@@ -85,11 +85,11 @@ export const expenseScenarioB: Fixture = {
   taxCategories: {
     taxCategories: [
       createTaxCategory({
-        id: makeUUID('tax-category', 'expense-consulting'),
+        id: makeUUID('expense-consulting'),
         hashavshevetName: 'Consulting Expenses',
       }),
       createTaxCategory({
-        id: makeUUID('tax-category', 'usd-account-tax-category'),
+        id: makeUUID('usd-account-tax-category'),
         hashavshevetName: 'Foreign Currency Account',
       }),
     ],
@@ -100,7 +100,7 @@ export const expenseScenarioB: Fixture = {
       createFinancialAccount({
         accountNumber: 'USD-ACCOUNT-001',
         type: 'BANK_ACCOUNT',
-        ownerId: makeUUID('business', 'admin-business-usd'),
+        ownerId: makeUUID('admin-business-usd'),
       }),
     ],
   },
@@ -110,7 +110,7 @@ export const expenseScenarioB: Fixture = {
       {
         accountNumber: 'USD-ACCOUNT-001',
           currency: Currency.Usd,
-        taxCategoryId: makeUUID('tax-category', 'usd-account-tax-category'),
+        taxCategoryId: makeUUID('usd-account-tax-category'),
       },
     ],
   },
@@ -119,12 +119,12 @@ export const expenseScenarioB: Fixture = {
     charges: [
       createCharge(
         {
-          owner_id: makeUUID('business', 'admin-business-usd'),
-          tax_category_id: makeUUID('tax-category', 'expense-consulting'),
+          owner_id: makeUUID('admin-business-usd'),
+          tax_category_id: makeUUID('expense-consulting'),
           user_description: 'Consulting services from US vendor',
         },
         {
-          id: makeUUID('charge', 'charge-consulting-services'),
+          id: makeUUID('charge-consulting-services'),
         },
       ),
     ],
@@ -134,15 +134,15 @@ export const expenseScenarioB: Fixture = {
     transactions: [
       createTransaction(
         {
-          charge_id: makeUUID('charge', 'charge-consulting-services'),
-          business_id: makeUUID('business', 'supplier-us-vendor-llc'),
+          charge_id: makeUUID('charge-consulting-services'),
+          business_id: makeUUID('supplier-us-vendor-llc'),
           amount: '-200.00', // Negative = expense/outflow in USD
             currency: Currency.Usd,
           event_date: '2024-01-20',
           is_fee: false,
         },
         {
-          id: makeUUID('transaction', 'transaction-consulting-payment'),
+          id: makeUUID('transaction-consulting-payment'),
           account_id: 'USD-ACCOUNT-001', // Will be resolved to UUID by loader
           source_description: 'Consulting services - US Vendor LLC',
           debit_date: '2024-01-20',
@@ -156,16 +156,16 @@ export const expenseScenarioB: Fixture = {
     documents: [
       createDocument(
         {
-          charge_id: makeUUID('charge', 'charge-consulting-services'),
-          creditor_id: makeUUID('business', 'supplier-us-vendor-llc'), // Supplier is creditor
-          debtor_id: makeUUID('business', 'admin-business-usd'), // Admin is debtor
+          charge_id: makeUUID('charge-consulting-services'),
+          creditor_id: makeUUID('supplier-us-vendor-llc'), // Supplier is creditor
+          debtor_id: makeUUID('admin-business-usd'), // Admin is debtor
           type: 'INVOICE',
           total_amount: 200.0, // Amount in USD
             currency_code: Currency.Usd,
           date: '2024-01-20', // Invoice date matches transaction
         },
         {
-          id: makeUUID('document', 'document-consulting-invoice'),
+          id: makeUUID('document-consulting-invoice'),
           serial_number: 'INV-US-2024-001',
           vat_amount: null, // US invoice - no Israeli VAT
         },
@@ -176,10 +176,10 @@ export const expenseScenarioB: Fixture = {
   expectations: {
     ledger: [
       {
-        chargeId: makeUUID('charge', 'charge-consulting-services'),
+        chargeId: makeUUID('charge-consulting-services'),
         recordCount: 2, // Document + transaction entries
-        debitEntities: [makeUUID('tax-category', 'expense-consulting'), makeUUID('tax-category', 'usd-account-tax-category')],
-        creditEntities: [makeUUID('tax-category', 'usd-account-tax-category'), makeUUID('business', 'supplier-us-vendor-llc')],
+        debitEntities: [makeUUID('expense-consulting'), makeUUID('usd-account-tax-category')],
+        creditEntities: [makeUUID('usd-account-tax-category'), makeUUID('supplier-us-vendor-llc')],
         // Ledger processes document (700 ILS) + transaction (700 ILS) = 1400 ILS total
         // With exchange rate of 3.5 ILS/USD: 200 USD × 3.5 = 700 ILS per entry
         totalDebitLocal: 1400.0,

package/src/__tests__/helpers/fixture-loader.test.ts

@@ -18,8 +18,8 @@ import {
   createCharge,
   createTransaction,
   createDocument,
+  makeUUID,
 } from '../factories/index.js';
-import { makeUUID } from '../../demo-fixtures/helpers/deterministic-uuid.js';
 
 describe('Fixture Loader', () => {
   let pool: Pool;
@@ -35,9 +35,9 @@ describe('Fixture Loader', () => {
   describe('insertFixture', () => {
     it('should insert a complete minimal fixture successfully', () =>
       withTestTransaction(pool, async client => {
-        const businessId = makeUUID('business', 'test-business-1');
-        const taxCategoryId = makeUUID('tax-category', 'test-tax-cat-1');
-        const chargeId = makeUUID('charge', 'test-charge-1');
+        const businessId = makeUUID('test-business-1');
+        const taxCategoryId = makeUUID('test-tax-cat-1');
+        const chargeId = makeUUID('test-charge-1');
 
         const fixture: Fixture = {
           businesses: {
@@ -83,7 +83,6 @@ describe('Fixture Loader', () => {
           [businessId],
         );
         expect(businessResult.rows).toHaveLength(1);
-        expect(businessResult.rows[0].id).toBe(businessId);
         expect(businessResult.rows[0].hebrew_name).toBe('Test Business');
 
         const taxCatResult = await client.query(
@@ -91,7 +90,6 @@ describe('Fixture Loader', () => {
           [taxCategoryId],
         );
         expect(taxCatResult.rows).toHaveLength(1);
-        expect(taxCatResult.rows[0].id).toBe(taxCategoryId);
         expect(taxCatResult.rows[0].hashavshevet_name).toBe('Test Tax Category');
 
         const chargeResult = await client.query(
@@ -104,13 +102,13 @@ describe('Fixture Loader', () => {
 
     it('should insert fixture with transactions and documents', () =>
       withTestTransaction(pool, async client => {
-        const supplierId = makeUUID('business', 'supplier-1');
-        const customerId = makeUUID('business', 'customer-1');
-        const taxCategoryId = makeUUID('tax-category', 'tax-cat-1');
+        const supplierId = makeUUID('supplier-1');
+        const customerId = makeUUID('customer-1');
+        const taxCategoryId = makeUUID('tax-cat-1');
         const accountNumber = 'ACC-12345';
-        const chargeId = makeUUID('charge', 'charge-1');
-        const transactionId = makeUUID('transaction', 'tx-1');
-        const documentId = makeUUID('document', 'doc-1');
+        const chargeId = makeUUID('charge-1');
+        const transactionId = makeUUID('tx-1');
+        const documentId = makeUUID('doc-1');
 
         const fixture: Fixture = {
           businesses: {
@@ -218,7 +216,7 @@ describe('Fixture Loader', () => {
 
     it('should handle fixture with only some sections populated', () =>
       withTestTransaction(pool, async client => {
-        const businessId = makeUUID('business', 'lonely-business');
+        const businessId = makeUUID('lonely-business');
 
         const fixture: Fixture = {
           businesses: {
@@ -240,8 +238,8 @@ describe('Fixture Loader', () => {
 
     it('should throw validation error before insertion for invalid FK references', () =>
       withTestTransaction(pool, async client => {
-        const businessId = makeUUID('business', 'test-biz');
-        const invalidChargeId = makeUUID('charge', 'invalid-charge');
+        const businessId = makeUUID('test-biz');
+        const invalidChargeId = makeUUID('invalid-charge');
 
         const fixture: Fixture = {
           businesses: {
@@ -252,7 +250,7 @@ describe('Fixture Loader', () => {
               createCharge(
                 {
                   owner_id: 'non-existent-owner', // Invalid FK reference
-                  tax_category_id: makeUUID('tax-category', 'tax-cat'),
+                  tax_category_id: makeUUID('tax-cat'),
                 },
                 { id: invalidChargeId },
               ),
@@ -271,7 +269,7 @@ describe('Fixture Loader', () => {
             charges: [
               createCharge({
                 owner_id: 'non-existent-owner',
-                tax_category_id: makeUUID('tax-category', 'tax-cat'),
+                tax_category_id: makeUUID('tax-cat'),
               }),
             ],
           },
@@ -290,7 +288,7 @@ describe('Fixture Loader', () => {
 
     it('should validate fixture before insertion', () =>
       withTestTransaction(pool, async client => {
-        const chargeId = makeUUID('charge', 'orphan-charge');
+        const chargeId = makeUUID('orphan-charge');
 
         const fixture: Fixture = {
           // Missing businesses and tax categories
@@ -298,8 +296,8 @@ describe('Fixture Loader', () => {
             charges: [
               createCharge(
                 {
-                  owner_id: makeUUID('business', 'missing-owner'),
-                  tax_category_id: makeUUID('tax-category', 'missing-tax'),
+                  owner_id: makeUUID('missing-owner'),
+                  tax_category_id: makeUUID('missing-tax'),
                 },
                 { id: chargeId },
               ),
@@ -312,12 +310,12 @@ describe('Fixture Loader', () => {
 
     it('should insert multiple entities in correct order', () =>
       withTestTransaction(pool, async client => {
-        const biz1 = makeUUID('business', 'biz-1');
-        const biz2 = makeUUID('business', 'biz-2');
-        const tax1 = makeUUID('tax-category', 'tax-1');
-        const tax2 = makeUUID('tax-category', 'tax-2');
-        const charge1 = makeUUID('charge', 'charge-1');
-        const charge2 = makeUUID('charge', 'charge-2');
+        const biz1 = makeUUID('biz-1');
+        const biz2 = makeUUID('biz-2');
+        const tax1 = makeUUID('tax-1');
+        const tax2 = makeUUID('tax-2');
+        const charge1 = makeUUID('charge-1');
+        const charge2 = makeUUID('charge-2');
 
         const fixture: Fixture = {
           businesses: {
@@ -362,7 +360,7 @@ describe('Fixture Loader', () => {
 
     it('should handle ON CONFLICT for idempotent insertion', () =>
       withTestTransaction(pool, async client => {
-        const businessId = makeUUID('business', 'duplicate-biz');
+        const businessId = makeUUID('duplicate-biz');
 
         const fixture: Fixture = {
           businesses: {
@@ -394,11 +392,11 @@ describe('Fixture Loader', () => {
 
     it('should insert transactions with generated source_id', () =>
       withTestTransaction(pool, async client => {
-        const businessId = makeUUID('business', 'biz-tx');
-        const taxCatId = makeUUID('tax-category', 'tax-tx');
-        const chargeId = makeUUID('charge', 'charge-tx');
+        const businessId = makeUUID('biz-tx');
+        const taxCatId = makeUUID('tax-tx');
+        const chargeId = makeUUID('charge-tx');
         const accountNumber = 'ACC-TX-001';
-        const transactionId = makeUUID('transaction', 'tx-with-source');
+        const transactionId = makeUUID('tx-with-source');
 
         const fixture: Fixture = {
           businesses: {

package/src/__tests__/helpers/fixture-loader.ts

@@ -12,7 +12,7 @@ import type { PoolClient } from 'pg';
 import type { Fixture } from './fixture-types.js';
 import { assertValidFixture } from './fixture-validation.js';
 import { qualifyTable } from './test-db-config.js';
-import { makeUUID, makeUUIDLegacy } from '../../demo-fixtures/helpers/deterministic-uuid.js';
+import { makeUUID } from '../factories/ids.js';
 
 /**
  * Custom error for fixture insertion failures
@@ -334,7 +334,7 @@ export async function insertFixture(
         // Insert directly into transactions_raw_list with etherscan_id to satisfy check constraint
         // This avoids triggering any creditcard/bank transaction handlers which would auto-create charges
         // etherscan_id is used because it has no INSERT trigger and is a simple UUID reference
-        const dummyEtherscanId = transaction.id ? makeUUID('raw-transaction', `etherscan-${transaction.id}`) : makeUUIDLegacy();
+        const dummyEtherscanId = transaction.id ? makeUUID(`etherscan-${transaction.id}`) : makeUUID();
         const rawListResult = await client.query(
           `INSERT INTO ${qualifyTable('transactions_raw_list')} (etherscan_id)
            VALUES ($1)