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

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

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

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

@@ -0,0 +1,80 @@
+import { describe, expect, it } from 'vitest';
+import { UUID_REGEX } from '../../shared/constants.js';
+import { makeUUID } from './ids.js';
+
+describe('Factory Helpers: IDs', () => {
+  describe('makeUUID', () => {
+    it('should generate a valid UUID format', () => {
+      const id = makeUUID();
+      expect(id).toMatch(UUID_REGEX);
+    });
+
+    it('should generate different UUIDs without seed', () => {
+      const id1 = makeUUID();
+      const id2 = makeUUID();
+      expect(id1).not.toBe(id2);
+    });
+
+    it('should generate deterministic UUID with seed', () => {
+      const seed = 'admin-business';
+      const id1 = makeUUID(seed);
+      const id2 = makeUUID(seed);
+      expect(id1).toBe(id2);
+    });
+
+    it('should generate different UUIDs for different seeds', () => {
+      const id1 = makeUUID('seed-one');
+      const id2 = makeUUID('seed-two');
+      expect(id1).not.toBe(id2);
+    });
+
+    it('should generate valid UUID v4 format with seed', () => {
+      const id = makeUUID('test-seed');
+      expect(id).toMatch(UUID_REGEX);
+      // Version bits should be 4
+      expect(id.charAt(14)).toBe('4');
+    });
+
+    it('should handle empty string seed', () => {
+      const id1 = makeUUID('');
+      const id2 = makeUUID('');
+      // Empty string seed should produce same deterministic UUID
+      expect(id1).toBe(id2);
+      expect(id1).toMatch(UUID_REGEX);
+      // Empty string produces specific deterministic UUID (hash of '' = 0)
+      expect(id1).toBe('00000000-0000-4000-8000-000000000000');
+    });
+
+    it('should handle complex seed strings', () => {
+      const seeds = [
+        'admin-business-123',
+        'supplier_with_underscores',
+        'UPPERCASE-SEED',
+        'seed with spaces',
+        'seed-with-special-chars-!@#$%',
+      ];
+
+      seeds.forEach(seed => {
+        const id = makeUUID(seed);
+        const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+        expect(id).toMatch(uuidRegex);
+      });
+    });
+
+    it('should be consistent across multiple calls with same seed', () => {
+      const seed = 'consistent-seed';
+      const ids = Array.from({ length: 10 }, () => makeUUID(seed));
+      const uniqueIds = new Set(ids);
+      expect(uniqueIds.size).toBe(1);
+    });
+
+    it('should generate different IDs for similar but different seeds', () => {
+      const id1 = makeUUID('test');
+      const id2 = makeUUID('test1');
+      const id3 = makeUUID('test-');
+      expect(id1).not.toBe(id2);
+      expect(id1).not.toBe(id3);
+      expect(id2).not.toBe(id3);
+    });
+  });
+});

package/src/__tests__/factories/ids.ts

@@ -0,0 +1,49 @@
+import { randomUUID } from 'node:crypto';
+
+/**
+ * Generate a UUID for use in test fixtures
+ *
+ * @param seed - Optional seed string for deterministic UUID generation
+ * @returns A valid UUID v4 string
+ *
+ * @remarks
+ * - When seed is provided, generates a deterministic UUID based on the seed
+ * - When seed is omitted, generates a random UUID
+ * - Deterministic mode uses a simple hash-based approach for test reproducibility
+ *
+ * @example
+ * ```typescript
+ * // Random UUID
+ * const id1 = makeUUID(); // e.g., '123e4567-e89b-12d3-a456-426614174000'
+ *
+ * // Deterministic UUID (same seed always produces same UUID)
+ * const id2 = makeUUID('admin-business'); // Always same UUID
+ * const id3 = makeUUID('admin-business'); // Same as id2
+ * ```
+ */
+export function makeUUID(seed?: string): string {
+  // Check for undefined or null (not provided), but treat empty string as valid seed
+  if (seed === undefined || seed === null) {
+    return randomUUID();
+  }
+
+  // Simple deterministic UUID generation from seed
+  // Use a basic hash to convert seed to hex values
+  let hash = 0;
+  for (let i = 0; i < seed.length; i++) {
+    hash = (hash << 5) - hash + seed.charCodeAt(i);
+    hash = hash & hash; // Convert to 32-bit integer
+  }
+
+  // Generate deterministic hex values
+  const hex = (Math.abs(hash) * 123456789).toString(16).padStart(32, '0').slice(0, 32);
+
+  // Format as UUID v4 (with version and variant bits set correctly)
+  return [
+    hex.slice(0, 8),
+    hex.slice(8, 12),
+    `4${hex.slice(13, 16)}`, // Version 4
+    `${((parseInt(hex.slice(16, 18), 16) & 0x3f) | 0x80).toString(16)}${hex.slice(18, 20)}`, // Variant bits
+    hex.slice(20, 32),
+  ].join('-');
+}

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('business', 'supplier-local');
+    const supplierId = makeUUID('supplier-local');
     const supplier = createBusiness({
       id: supplierId,
       hebrewName: 'ספק מקומי',
     });
 
-    const taxCategoryId = makeUUID('tax-category', 'tax-expense');
+    const taxCategoryId = makeUUID('tax-expense');
     const taxCategory = createTaxCategory({
       id: taxCategoryId,
     });
 
-    const accountId = makeUUID('financial-account', 'bank-account');
+    const accountId = makeUUID('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('charge', 'expense-charge');
+    const chargeId = makeUUID('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('business', 'biz-1') });
-    const business2 = createBusiness({ id: makeUUID('business', 'biz-1') });
+    const business1 = createBusiness({ id: makeUUID('biz-1') });
+    const business2 = createBusiness({ id: makeUUID('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('business', `owner-${index}`),
+        ownerId: makeUUID(`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', 'charge-1'),
-      business_id: makeUUID('business', 'business-1'),
+      charge_id: makeUUID('charge-1'),
+      business_id: makeUUID('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', 'charge-doc');
-    const creditorId = makeUUID('business', 'creditor');
-    const debtorId = makeUUID('business', 'debtor');
+    const chargeId = makeUUID('charge-doc');
+    const creditorId = makeUUID('creditor');
+    const debtorId = makeUUID('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('business', 'supplier-1');
+ * const businessId = makeUUID('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 '../../demo-fixtures/helpers/deterministic-uuid.js';
+export { makeUUID } from './ids.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 '../../demo-fixtures/helpers/deterministic-uuid.js';
+import { makeUUID } from './ids.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-category', 'tax-cat-expense');
+      const customId = makeUUID('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('tax-category', 'default-category') });
-      const category2 = createTaxCategory({ id: makeUUID('tax-category', 'default-category') });
+      const category1 = createTaxCategory({ id: makeUUID('default-category') });
+      const category2 = createTaxCategory({ id: makeUUID('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 { makeUUIDLegacy } from '../../demo-fixtures/helpers/deterministic-uuid.js';
+import { makeUUID } from './ids.js';
 
 /**
  * Tax category factory for test fixtures
@@ -17,17 +17,17 @@ import { makeUUIDLegacy } from '../../demo-fixtures/helpers/deterministic-uuid.j
  * @example
  * ```typescript
  * // Minimal tax category
- * const category = createTaxCategory({ id: makeUUID('tax-category', 'expense-general') });
+ * const category = createTaxCategory({ id: makeUUID('expense-general') });
  *
  * // Tax category with Hashavshevet integration
  * const integrated = createTaxCategory({
- *   id: makeUUID('tax-category', 'expense-office'),
+ *   id: makeUUID('expense-office'),
  *   hashavshevetName: 'משרדיות',
  * });
  *
  * // Tax-excluded category
  * const excluded = createTaxCategory({
- *   id: makeUUID('tax-category', 'income-exempt'),
+ *   id: makeUUID('income-exempt'),
  *   taxExcluded: true,
  * });
  * ```
@@ -35,11 +35,10 @@ import { makeUUIDLegacy } from '../../demo-fixtures/helpers/deterministic-uuid.j
 export function createTaxCategory(
   overrides?: Partial<IInsertTaxCategoryParams>,
 ): IInsertTaxCategoryParams {
-  const defaultId = makeUUIDLegacy();
   return {
-    id: defaultId,
+    id: makeUUID(),
     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 '../../demo-fixtures/helpers/deterministic-uuid.js';
+import { makeUUID } from './ids.js';
 
 describe('Factory: Transaction', () => {
   describe('createTransaction', () => {
     it('should create transaction with required fields', () => {
-      const chargeId = makeUUID('charge', 'charge-1');
-      const businessId = makeUUID('business', 'business-1');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('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', 'charge-1');
-      const businessId = makeUUID('business', 'business-1');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('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', 'charge-1');
-      const businessId = makeUUID('business', 'business-1');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('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', 'charge-1');
-      const businessId = makeUUID('business', 'business-1');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('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', 'charge-1');
-      const businessId = makeUUID('business', 'bank');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('bank');
 
       const feeTransaction = createTransaction({
         charge_id: chargeId,
@@ -110,10 +110,10 @@ describe('Factory: Transaction', () => {
     });
 
     it('should apply overrides correctly', () => {
-      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 chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('business-1');
+      const customId = makeUUID('custom-tx');
+      const accountId = makeUUID('eur-account');
 
       const transaction = createTransaction(
         {
@@ -140,8 +140,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should allow partial overrides', () => {
-      const chargeId = makeUUID('charge', 'charge-1');
-      const businessId = makeUUID('business', 'business-1');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('business-1');
 
       const transaction = createTransaction(
         {
@@ -162,8 +162,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should preserve all required fields', () => {
-      const chargeId = makeUUID('charge', 'charge-1');
-      const businessId = makeUUID('business', 'business-1');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('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', 'charge-1');
-      const businessId = makeUUID('business', 'business-1');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('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', 'charge-1');
-      const businessId = makeUUID('business', 'supplier');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('supplier');
 
       const expense = createTransaction({
         charge_id: chargeId,
@@ -237,8 +237,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should handle positive amounts (income)', () => {
-      const chargeId = makeUUID('charge', 'charge-1');
-      const businessId = makeUUID('business', 'customer');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('customer');
 
       const income = createTransaction({
         charge_id: chargeId,
@@ -252,8 +252,8 @@ describe('Factory: Transaction', () => {
     });
 
     it('should allow explicit null overrides', () => {
-      const chargeId = makeUUID('charge', 'charge-1');
-      const businessId = makeUUID('business', 'business-1');
+      const chargeId = makeUUID('charge-1');
+      const businessId = makeUUID('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, makeUUIDLegacy } from '../../demo-fixtures/helpers/deterministic-uuid.js';
+import { makeUUID } from './ids.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', 'charge-1'),
- *   business_id: makeUUID('business', 'supplier-1'),
+ *   charge_id: makeUUID('charge-1'),
+ *   business_id: makeUUID('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', 'charge-1'),
- *   business_id: makeUUID('business', 'bank'),
+ *   charge_id: makeUUID('charge-1'),
+ *   business_id: makeUUID('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', 'charge-1'),
- *     business_id: makeUUID('business', 'supplier-1'),
+ *     charge_id: makeUUID('charge-1'),
+ *     business_id: makeUUID('supplier-1'),
  *     amount: '500.00',
  *     currency: 'EUR',
  *     event_date: '2024-03-10',
  *   },
  *   {
- *     account_id: makeUUID('account', 'eur-account'),
+ *     account_id: makeUUID('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: makeUUIDLegacy(),
-    account_id: makeUUID('account', 'default-account'),
+    id: makeUUID(),
+    account_id: makeUUID('default-account'),
     charge_id: params.charge_id,
-    source_id: makeUUID('transaction-source', 'source-raw-tx'),
+    source_id: makeUUID('source-raw-tx'),
     source_description: null,
     currency: params.currency,
     event_date: