@accounter/server 0.0.9-alpha-20251210180846-69e726b23ba814acaf7af8af75df20475e55a7d7 → 0.0.9-alpha-20251210183522-3f6d1965667d05308b9ebddd784f4937b36d594c

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

@@ -44,7 +44,7 @@ describe('Fixture Loader', () => {
             businesses: [
               createBusiness({
                 id: businessId,
-                hebrewName: 'Test Business',
+                name: 'Test Business',
               }),
             ],
           },
@@ -52,7 +52,7 @@ describe('Fixture Loader', () => {
             taxCategories: [
               createTaxCategory({
                 id: taxCategoryId,
-                hashavshevetName: 'Test Tax Category',
+                name: 'Test Tax Category 1',
               }),
             ],
           },
@@ -84,7 +84,7 @@ describe('Fixture Loader', () => {
         );
         expect(businessResult.rows).toHaveLength(1);
         expect(businessResult.rows[0].id).toBe(businessId);
-        expect(businessResult.rows[0].hebrew_name).toBe('Test Business');
+        expect(businessResult.rows[0].hebrew_name).toBeNull();
 
         const taxCatResult = await client.query(
           `SELECT * FROM ${qualifyTable('tax_categories')} WHERE id = $1`,
@@ -92,7 +92,7 @@ describe('Fixture Loader', () => {
         );
         expect(taxCatResult.rows).toHaveLength(1);
         expect(taxCatResult.rows[0].id).toBe(taxCategoryId);
-        expect(taxCatResult.rows[0].hashavshevet_name).toBe('Test Tax Category');
+        expect(taxCatResult.rows[0].hashavshevet_name).toBeNull();
 
         const chargeResult = await client.query(
           `SELECT * FROM ${qualifyTable('charges')} WHERE id = $1`,
@@ -115,12 +115,12 @@ describe('Fixture Loader', () => {
         const fixture: Fixture = {
           businesses: {
             businesses: [
-              createBusiness({ id: supplierId, hebrewName: 'Supplier Ltd' }),
-              createBusiness({ id: customerId, hebrewName: 'Customer Inc' }),
+              createBusiness({ id: supplierId, name: 'Supplier Ltd' }),
+              createBusiness({ id: customerId, name: 'Customer Inc' }),
             ],
           },
           taxCategories: {
-            taxCategories: [createTaxCategory({ id: taxCategoryId })],
+            taxCategories: [createTaxCategory({ id: taxCategoryId, name: 'Tax Category 1' })],
           },
           accounts: {
             accounts: [
@@ -222,7 +222,7 @@ describe('Fixture Loader', () => {
 
         const fixture: Fixture = {
           businesses: {
-            businesses: [createBusiness({ id: businessId })],
+            businesses: [createBusiness({ id: businessId, name: 'Lonely Business' })],
           },
           // No tax categories, accounts, charges, etc.
         };
@@ -245,7 +245,7 @@ describe('Fixture Loader', () => {
 
         const fixture: Fixture = {
           businesses: {
-            businesses: [createBusiness({ id: businessId })],
+            businesses: [createBusiness({ id: businessId, name: 'Test Biz' })],
           },
           charges: {
             charges: [
@@ -322,14 +322,14 @@ describe('Fixture Loader', () => {
         const fixture: Fixture = {
           businesses: {
             businesses: [
-              createBusiness({ id: biz1, hebrewName: 'Business 1' }),
-              createBusiness({ id: biz2, hebrewName: 'Business 2' }),
+              createBusiness({ id: biz1, name: 'Business 1' }),
+              createBusiness({ id: biz2, name: 'Business 2' }),
             ],
           },
           taxCategories: {
             taxCategories: [
-              createTaxCategory({ id: tax1, hashavshevetName: 'Tax 1' }),
-              createTaxCategory({ id: tax2, hashavshevetName: 'Tax 2' }),
+              createTaxCategory({ id: tax1, name: 'Tax 1' }),
+              createTaxCategory({ id: tax2, name: 'Tax 2' }),
             ],
           },
           charges: {
@@ -366,7 +366,7 @@ describe('Fixture Loader', () => {
 
         const fixture: Fixture = {
           businesses: {
-            businesses: [createBusiness({ id: businessId, hebrewName: 'Original Name' })],
+            businesses: [createBusiness({ id: businessId, name: 'Original Name' })],
           },
         };
 
@@ -376,7 +376,7 @@ describe('Fixture Loader', () => {
         // Insert again (should not error due to ON CONFLICT DO NOTHING)
         const fixtureModified: Fixture = {
           businesses: {
-            businesses: [createBusiness({ id: businessId, hebrewName: 'Modified Name' })],
+            businesses: [createBusiness({ id: businessId, name: 'Modified Name' })],
           },
         };
 
@@ -386,10 +386,10 @@ describe('Fixture Loader', () => {
 
         // Original data should be preserved (ON CONFLICT DO NOTHING)
         const result = await client.query(
-          `SELECT * FROM ${qualifyTable('businesses')} WHERE id = $1`,
+          `SELECT * FROM ${qualifyTable('financial_entities')} WHERE id = $1`,
           [businessId],
         );
-        expect(result.rows[0].hebrew_name).toBe('Original Name');
+        expect(result.rows[0].name).toBe('Original Name');
       }));
 
     it('should insert transactions with generated source_id', () =>
@@ -402,10 +402,10 @@ describe('Fixture Loader', () => {
 
         const fixture: Fixture = {
           businesses: {
-            businesses: [createBusiness({ id: businessId })],
+            businesses: [createBusiness({ id: businessId, name: 'Biz Tx' })],
           },
           taxCategories: {
-            taxCategories: [createTaxCategory({ id: taxCatId })],
+            taxCategories: [createTaxCategory({ id: taxCatId, name: 'Tax Tx' })],
           },
           accounts: {
             accounts: [

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

@@ -148,12 +148,13 @@ export async function insertFixture(
     await executeSavepointSection('businesses', async () => {
       for (const business of fixture.businesses!.businesses) {
         // Insert financial entity first (type='business')
+        // Field mapping: business.name used for display (required); hebrewName is legacy/optional
         const entityResult = await client.query(
           `INSERT INTO ${qualifyTable('financial_entities')} (id, name, type)
            VALUES ($1, $2, 'business')
            ON CONFLICT (id) DO NOTHING
            RETURNING id`,
-          [business.id, business.hebrewName || business.id],
+          [business.id, business.name || business.id],
         );
 
         // Insert business details - note: vat_number column maps to governmentId field

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

@@ -5,16 +5,18 @@
  * database state for integration tests. Each fixture represents a complete
  * scenario with all related entities (businesses, charges, transactions, documents, etc.).
  *
+ * **Type Independence**: These types are decoupled from pgtyped-generated database types
+ * to maintain test independence and flexibility. Fixtures define their own minimal interfaces
+ * that are converted to database-specific structures by the fixture-loader.
+ *
  * @see packages/server/src/__tests__/helpers/fixture-validation.ts for validation logic
  * @see packages/server/src/__tests__/helpers/fixture-loader.ts for insertion logic
  */
 
-import type { IInsertBusinessesParams } from '../../modules/financial-entities/__generated__/businesses.types.js';
-import type { IInsertTaxCategoryParams } from '../../modules/financial-entities/__generated__/tax-categories.types.js';
-import type { IInsertFinancialAccountsParams } from '../../modules/financial-accounts/__generated__/financial-accounts.types.js';
 import type { ChargeInsertParams } from '../factories/charge.js';
 import type { TransactionInsertParams } from '../factories/transaction.js';
 import type { DocumentInsertParams } from '../factories/document.js';
+import type { financial_account_type } from '../../modules/transactions/types.js';
 
 /**
  * Business entities in a fixture
@@ -29,7 +31,23 @@ export interface FixtureBusinesses {
    * Each business must have a unique id. The id will be referenced by
    * charges (owner_id), transactions (business_id), and documents (creditor_id/debtor_id).
    */
-  businesses: IInsertBusinessesParams['businesses'];
+  businesses: Array<{
+    id: string,
+    name: string,
+    hebrewName?: string | null,
+    address?: string | null,
+    email?: string | null,
+    website?: string | null,
+    phoneNumber?: string | null,
+    governmentId?: string | null,
+    exemptDealer?: boolean | null,
+    suggestions?: object | null,
+    optionalVat?: boolean | null,
+    country?: string | null,
+    pcn874RecordTypeOverride?: unknown | null,
+    isReceiptEnough?: boolean | null,
+    isDocumentsOptional?: boolean | null;
+  }>;
 }
 
 /**
@@ -44,7 +62,12 @@ export interface FixtureTaxCategories {
    * Each tax category must have a unique id. The id will be referenced by
    * charges (tax_category_id) and financial accounts.
    */
-  taxCategories: IInsertTaxCategoryParams[];
+  taxCategories: Array<{
+    id: string;
+    name: string;
+    hashavshevetName?: string | null;
+    taxExcluded?: boolean | null;
+  }>;
 }
 
 /**
@@ -60,7 +83,12 @@ export interface FixtureAccounts {
    * Each account must have a unique id. The id will be referenced by
    * transactions (account_id).
    */
-  accounts: IInsertFinancialAccountsParams['bankAccounts'];
+  accounts: Array<{
+      accountNumber?: string | null,
+      name?: string | null,
+      privateBusiness?: string | null,
+      ownerId?: string | null,
+      type?: financial_account_type | null}>;
 }
 
 /**
@@ -217,7 +245,7 @@ export interface LedgerExpectation {
  * const expenseScenarioA: Fixture = {
  *   businesses: {
  *     businesses: [
- *       createBusiness({ id: makeUUID('supplier-1'), hebrewName: 'Local Supplier Ltd' }),
+ *       createBusiness({ id: makeUUID('business', 'supplier-1'), hebrewName: 'Local Supplier Ltd' }),
  *     ],
  *   },
  *   charges: {
@@ -228,8 +256,8 @@ export interface LedgerExpectation {
  *   transactions: {
  *     transactions: [
  *       createTransaction({
- *         charge_id: makeUUID('charge-1'),
- *         business_id: makeUUID('supplier-1'),
+ *         charge_id: makeUUID('charge', 'charge-1'),
+ *         business_id: makeUUID('business', 'supplier-1'),
  *         amount: '-1000.00',
  *         currency: 'ILS',
  *         event_date: '2024-01-15',
@@ -239,8 +267,8 @@ export interface LedgerExpectation {
  *   documents: {
  *     documents: [
  *       createDocument({
- *         charge_id: makeUUID('charge-1'),
- *         creditor_id: makeUUID('supplier-1'),
+ *         charge_id: makeUUID('charge', 'charge-1'),
+ *         creditor_id: makeUUID('business', 'supplier-1'),
  *         debtor_id: ADMIN_ID,
  *         type: 'RECEIPT',
  *         total_amount: 1000.0,
@@ -252,7 +280,7 @@ export interface LedgerExpectation {
  *   expectations: {
  *     ledger: [
  *       {
- *         chargeId: makeUUID('charge-1'),
+ *         chargeId: makeUUID('charge', 'charge-1'),
  *         recordCount: 2,
  *         debitEntities: [EXPENSE_TAX_CATEGORY_ID],
  *         creditEntities: [BANK_TAX_CATEGORY_ID],

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

@@ -21,12 +21,12 @@ describe('Fixture Validation', () => {
       const fixture: Fixture = {
         businesses: {
           businesses: [
-            createBusiness({ id: adminId }),
-            createBusiness({ id: supplierId }),
+            createBusiness({ id: adminId, name: 'Admin' }),
+            createBusiness({ id: supplierId, name: 'Supplier' }),
           ],
         },
         taxCategories: {
-          taxCategories: [createTaxCategory({ id: taxCatId })],
+          taxCategories: [createTaxCategory({ id: taxCatId, name: 'Tax Category' })],
         },
         accounts: {
           accounts: [createFinancialAccount({ accountNumber: accountId, ownerId: adminId })],
@@ -73,10 +73,10 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' })],
         },
         taxCategories: {
-          taxCategories: [createTaxCategory({ id: taxCatId })],
+          taxCategories: [createTaxCategory({ id: taxCatId, name: 'Tax Category' })],
         },
         charges: {
           charges: [
@@ -96,7 +96,7 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId }), createBusiness({ id: supplierId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' }), createBusiness({ id: supplierId, name: 'Supplier' })],
         },
         transactions: {
           transactions: [
@@ -127,7 +127,7 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId }), createBusiness({ id: supplierId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' }), createBusiness({ id: supplierId, name: 'Supplier' })],
         },
         documents: {
           documents: [
@@ -181,7 +181,7 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' })],
         },
         charges: {
           charges: [
@@ -209,7 +209,7 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' })],
         },
         charges: {
           charges: [createCharge({ owner_id: adminId }, { id: chargeId })],
@@ -243,7 +243,7 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' })],
         },
         charges: {
           charges: [createCharge({ owner_id: adminId }, { id: chargeId })],
@@ -280,7 +280,7 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId }), createBusiness({ id: supplierId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' }), createBusiness({ id: supplierId, name: 'Supplier' })],
         },
         charges: {
           charges: [createCharge({ owner_id: adminId }, { id: chargeId })],
@@ -342,7 +342,7 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' })],
         },
         charges: {
           charges: [createCharge({ owner_id: adminId }, { id: chargeId })],
@@ -384,7 +384,7 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' })],
         },
         charges: {
           charges: [createCharge({ owner_id: adminId }, { id: chargeId })],
@@ -435,8 +435,8 @@ describe('Fixture Validation', () => {
       const fixture: Fixture = {
         businesses: {
           businesses: [
-            createBusiness({ id: duplicateId }),
-            createBusiness({ id: duplicateId }), // Duplicate
+            createBusiness({ id: duplicateId, name: 'Duplicate Business' }),
+            createBusiness({ id: duplicateId, name: 'Duplicate Business' }), // Duplicate
           ],
         },
       };
@@ -454,7 +454,7 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' })],
         },
         charges: {
           charges: [
@@ -514,10 +514,10 @@ describe('Fixture Validation', () => {
 
       const fixture: Fixture = {
         businesses: {
-          businesses: [createBusiness({ id: adminId })],
+          businesses: [createBusiness({ id: adminId, name: 'Admin' })],
         },
         taxCategories: {
-          taxCategories: [createTaxCategory({ id: taxCatId })],
+          taxCategories: [createTaxCategory({ id: taxCatId, name: 'Tax Category' })],
         },
         charges: {
           charges: [

package/src/modules/accountant-approval/resolvers/accountant-approval.resolver.ts

@@ -1,7 +1,7 @@
-import { BusinessTripsTypes } from '../../../modules/business-trips/index.js';
-import { BusinessTripsProvider } from '../../../modules/business-trips/providers/business-trips.provider.js';
-import type { ChargesTypes } from '../../../modules/charges';
-import { ChargesProvider } from '../../../modules/charges/providers/charges.provider.js';
+import { BusinessTripsTypes } from '../../business-trips/index.js';
+import { BusinessTripsProvider } from '../../business-trips/providers/business-trips.provider.js';
+import type { ChargesTypes } from '../../charges';
+import { ChargesProvider } from '../../charges/providers/charges.provider.js';
 import type { AccountantApprovalModule } from '../types.js';
 import { commonChargeFields } from './common.js';
 

package/src/modules/admin-context/providers/admin-context.provider.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
 import type {
   IGetAdminContextsQuery,
   IUpdateAdminContextParams,

package/src/modules/admin-context/resolvers/admin-context.resolvers.ts

@@ -1,7 +1,7 @@
 import { GraphQLError } from 'graphql';
-import { TagsProvider } from '../../../modules/tags/providers/tags.provider.js';
 import { Currency } from '../../../shared/enums.js';
 import { dateToTimelessDateString } from '../../../shared/helpers/index.js';
+import { TagsProvider } from '../../tags/providers/tags.provider.js';
 import { fetchBusiness, fetchTaxCategory } from '../helpers/admin-context.helper.js';
 import { AdminContextProvider } from '../providers/admin-context.provider.js';
 import type { AdminContextModule } from '../types.js';

package/src/modules/app-providers/gmail-listener/gmail-service.provider.ts

@@ -3,21 +3,21 @@ import { Inject, Injectable, Scope } from 'graphql-modules';
 import inlineCss from 'inline-css';
 import { Browser, chromium } from 'playwright';
 import type { EmailAttachmentType } from '../../../__generated__/types.js';
-import { ChargesProvider } from '../../../modules/charges/providers/charges.provider.js';
+import { DocumentType } from '../../../shared/enums.js';
+import { hashStringToInt } from '../../../shared/helpers/index.js';
+import { ENVIRONMENT } from '../../../shared/tokens.js';
+import type { Environment } from '../../../shared/types/index.js';
+import { ChargesProvider } from '../../charges/providers/charges.provider.js';
 import {
   getDocumentFromUrlsAndOcrData,
   type OcrData,
-} from '../../../modules/documents/helpers/upload.helper.js';
-import { DocumentsProvider } from '../../../modules/documents/providers/documents.provider.js';
+} from '../../documents/helpers/upload.helper.js';
+import { DocumentsProvider } from '../../documents/providers/documents.provider.js';
 import {
   EmailListenerConfig,
   suggestionDataSchema,
-} from '../../../modules/financial-entities/helpers/business-suggestion-data-schema.helper.js';
-import { BusinessesProvider } from '../../../modules/financial-entities/providers/businesses.provider.js';
-import { DocumentType } from '../../../shared/enums.js';
-import { hashStringToInt } from '../../../shared/helpers/index.js';
-import { ENVIRONMENT } from '../../../shared/tokens.js';
-import type { Environment } from '../../../shared/types/index.js';
+} from '../../financial-entities/helpers/business-suggestion-data-schema.helper.js';
+import { BusinessesProvider } from '../../financial-entities/providers/businesses.provider.js';
 import { AnthropicProvider } from '../anthropic.js';
 import { CloudinaryProvider } from '../cloudinary.js';
 import { troubleshootOAuth } from './config.js';

package/src/modules/bank-deposits/providers/bank-deposit-transactions.provider.ts

@@ -1,10 +1,10 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
-import { identifyInterestTransactionIds } from '../../../modules/ledger/helpers/bank-deposit-ledger-generation.helper.js';
-import { TransactionsProvider } from '../../../modules/transactions/providers/transactions.provider.js';
 import { dateToTimelessDateString } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
+import { identifyInterestTransactionIds } from '../../ledger/helpers/bank-deposit-ledger-generation.helper.js';
+import { TransactionsProvider } from '../../transactions/providers/transactions.provider.js';
 import type {
   IGetAllDepositsWithTransactionsQuery,
   IGetDepositTransactionsByChargeIdQuery,

package/src/modules/bank-deposits/resolvers/bank-deposit-transactions.resolver.ts

@@ -1,7 +1,7 @@
 import { GraphQLError } from 'graphql';
-import { identifyInterestTransactionIds } from '../../../modules/ledger/helpers/bank-deposit-ledger-generation.helper.js';
 import { Currency } from '../../../shared/enums.js';
 import { dateToTimelessDateString, formatFinancialAmount } from '../../../shared/helpers/index.js';
+import { identifyInterestTransactionIds } from '../../ledger/helpers/bank-deposit-ledger-generation.helper.js';
 import { BankDepositTransactionsProvider } from '../providers/bank-deposit-transactions.provider.js';
 import type { BankDepositsModule } from '../types.js';
 

package/src/modules/business-trips/helpers/business-trip-report.helper.ts

@@ -2,13 +2,13 @@ import type {
   BusinessTripSummaryCategories,
   BusinessTripSummaryRow,
 } from '../../../__generated__/types.js';
-import { CountryCode } from '../../../modules/countries/types.js';
-import { ExchangeProvider } from '../../../modules/exchange-rates/providers/exchange.provider.js';
-import { getTransactionDebitDate } from '../../../modules/transactions/helpers/debit-date.helper.js';
-import { TransactionsProvider } from '../../../modules/transactions/providers/transactions.provider.js';
-import type { IGetTransactionsByIdsResult } from '../../../modules/transactions/types.js';
 import { Currency } from '../../../shared/enums.js';
 import { formatCurrency, formatFinancialAmount } from '../../../shared/helpers/index.js';
+import { CountryCode } from '../../countries/types.js';
+import { ExchangeProvider } from '../../exchange-rates/providers/exchange.provider.js';
+import { getTransactionDebitDate } from '../../transactions/helpers/debit-date.helper.js';
+import { TransactionsProvider } from '../../transactions/providers/transactions.provider.js';
+import type { IGetTransactionsByIdsResult } from '../../transactions/types.js';
 import { BusinessTripError } from '../resolvers/business-trip-summary.resolver.js';
 import type {
   flight_class,

package/src/modules/business-trips/helpers/business-trips-expenses.helper.ts

@@ -4,13 +4,13 @@ import type {
   AddBusinessTripTravelAndSubsistenceExpenseInput,
   BusinessTripExpenseCategories,
 } from '../../../__generated__/types.js';
-import { ChargesProvider } from '../../../modules/charges/providers/charges.provider.js';
-import { isSupplementalFeeTransaction } from '../../../modules/ledger/helpers/fee-transactions.js';
-import { LedgerError } from '../../../modules/ledger/helpers/utils.helper.js';
-import { generateLedgerRecordsForBusinessTrip } from '../../../modules/ledger/resolvers/ledger-generation/business-trip-ledger-generation.resolver.js';
-import type { IGetExpensesByChargeIdsResult } from '../../../modules/misc-expenses/types.js';
-import { ChargeTagsProvider } from '../../../modules/tags/providers/charge-tags.provider.js';
-import type { IGetTransactionsByChargeIdsResult } from '../../../modules/transactions/types.js';
+import { ChargesProvider } from '../../charges/providers/charges.provider.js';
+import { isSupplementalFeeTransaction } from '../../ledger/helpers/fee-transactions.js';
+import { LedgerError } from '../../ledger/helpers/utils.helper.js';
+import { generateLedgerRecordsForBusinessTrip } from '../../ledger/resolvers/ledger-generation/business-trip-ledger-generation.resolver.js';
+import type { IGetExpensesByChargeIdsResult } from '../../misc-expenses/types.js';
+import { ChargeTagsProvider } from '../../tags/providers/charge-tags.provider.js';
+import type { IGetTransactionsByChargeIdsResult } from '../../transactions/types.js';
 import { BusinessTripEmployeePaymentsProvider } from '../providers/business-trips-employee-payments.provider.js';
 import { BusinessTripAccommodationsExpensesProvider } from '../providers/business-trips-expenses-accommodations.provider.js';
 import { BusinessTripCarRentalExpensesProvider } from '../providers/business-trips-expenses-car-rental.provider.js';

package/src/modules/business-trips/providers/business-trips-attendees.provider.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
 import type {
   DateOrString,
   IAddBusinessTripAttendeesParams,

package/src/modules/business-trips/providers/business-trips-employee-payments.provider.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
 import type {
   IDeleteBusinessTripEmployeePaymentParams,
   IDeleteBusinessTripEmployeePaymentQuery,

package/src/modules/business-trips/providers/business-trips-expenses-accommodations.provider.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
 import type {
   IDeleteBusinessTripAccommodationsExpenseParams,
   IDeleteBusinessTripAccommodationsExpenseQuery,

package/src/modules/business-trips/providers/business-trips-expenses-car-rental.provider.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
 import type {
   IDeleteBusinessTripCarRentalExpenseParams,
   IDeleteBusinessTripCarRentalExpenseQuery,

package/src/modules/business-trips/providers/business-trips-expenses-flights.provider.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
 import type {
   IDeleteBusinessTripFlightsExpenseParams,
   IDeleteBusinessTripFlightsExpenseQuery,

package/src/modules/business-trips/providers/business-trips-expenses-other.provider.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
 import type {
   IDeleteBusinessTripOtherExpenseParams,
   IDeleteBusinessTripOtherExpenseQuery,

package/src/modules/business-trips/providers/business-trips-expenses-transactions-match.provider.ts

@@ -1,9 +1,9 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
-import { stringArray } from '../../../modules/charges/types.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
+import { stringArray } from '../../charges/types.js';
 import type {
   IDeleteBusinessTripExpenseMatchParams,
   IDeleteBusinessTripExpenseMatchQuery,

package/src/modules/business-trips/providers/business-trips-expenses-travel-and-subsistence.provider.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
 import type {
   IDeleteBusinessTripTravelAndSubsistenceExpenseParams,
   IDeleteBusinessTripTravelAndSubsistenceExpenseQuery,

package/src/modules/business-trips/providers/business-trips-expenses.provider.ts

@@ -2,10 +2,10 @@ import DataLoader from 'dataloader';
 import { GraphQLError } from 'graphql';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
-import { TransactionsProvider } from '../../../modules/transactions/providers/transactions.provider.js';
-import type { IGetTransactionsByChargeIdsResult } from '../../../modules/transactions/types.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
+import { TransactionsProvider } from '../../transactions/providers/transactions.provider.js';
+import type { IGetTransactionsByChargeIdsResult } from '../../transactions/types.js';
 import type {
   IDeleteBusinessTripExpenseParams,
   IDeleteBusinessTripExpenseQuery,

package/src/modules/business-trips/providers/business-trips-tax-variables.provider.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 import { Injectable, Scope } from 'graphql-modules';
 import { sql } from '@pgtyped/runtime';
-import { DBProvider } from '../../../modules/app-providers/db.provider.js';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
+import { DBProvider } from '../../app-providers/db.provider.js';
 import type { IGetAllTaxVariablesQuery } from '../types.js';
 
 const getAllTaxVariables = sql<IGetAllTaxVariablesQuery>`