@accounter/server 0.0.8-alpha-20251109135308-a84f8e3eb2a8a6f57c2ecf91b0965dfafbc40bf8 → 0.0.8-alpha-20251109140515-1fd3ef8170a6718d943f932cd779f9d9207c78f7

package/src/modules/financial-accounts/providers/financial-accounts.provider.ts

@@ -12,22 +12,22 @@ import type {
 } from '../types.js';
 
 const getFinancialAccountsByOwnerIds = sql<IGetFinancialAccountsByOwnerIdsQuery>`
-    SELECT *
+    SELECT id, account_number, private_business, owner, type
     FROM accounter_schema.financial_accounts
     WHERE owner IN $$ownerIds;`;
 
 const getFinancialAccountsByAccountNumbers = sql<IGetFinancialAccountsByAccountNumbersQuery>`
-SELECT *
+SELECT id, account_number, private_business, owner, type
 FROM accounter_schema.financial_accounts
 WHERE account_number IN $$accountNumbers;`;
 
 const getFinancialAccountsByAccountIDs = sql<IGetFinancialAccountsByAccountIDsQuery>`
-SELECT *
+SELECT id, account_number, private_business, owner, type
 FROM accounter_schema.financial_accounts
 WHERE id IN $$accountIDs;`;
 
 const getAllFinancialAccounts = sql<IGetAllFinancialAccountsQuery>`
-    SELECT *
+    SELECT id, account_number, private_business, owner, type
     FROM accounter_schema.financial_accounts;`;
 
 @Injectable({

package/src/modules/financial-accounts/providers/financial-bank-accounts.provider.ts

@@ -0,0 +1,241 @@
+import DataLoader from 'dataloader';
+import { Injectable, Scope } from 'graphql-modules';
+import { DBProvider } from '@modules/app-providers/db.provider.js';
+import { sql } from '@pgtyped/runtime';
+import { getCacheInstance } from '@shared/helpers';
+import type {
+  IDeleteBankAccountParams,
+  IDeleteBankAccountQuery,
+  IGetAllFinancialBankAccountsQuery,
+  IGetAllFinancialBankAccountsResult,
+  IGetFinancialBankAccountsByIdsQuery,
+  IInsertBankAccountsParams,
+  IInsertBankAccountsQuery,
+  IUpdateBankAccountParams,
+  IUpdateBankAccountQuery,
+} from '../types.js';
+
+const getFinancialBankAccountsByIds = sql<IGetFinancialBankAccountsByIdsQuery>`
+  SELECT id,
+    bank_number,
+    branch_number,
+    extended_bank_number,
+    party_preferred_indication,
+    party_account_involvement_code,
+    account_deal_date,
+    account_update_date,
+    meteg_doar_net,
+    kod_harshaat_peilut,
+    account_closing_reason_code,
+    account_agreement_opening_date,
+    service_authorization_desc,
+    branch_type_code,
+    mymail_entitlement_switch,
+    product_label
+  FROM accounter_schema.financial_bank_accounts
+  WHERE id IN $$bankAccountIds;`;
+
+const getAllFinancialBankAccounts = sql<IGetAllFinancialBankAccountsQuery>`
+  SELECT id,
+    bank_number,
+    branch_number,
+    extended_bank_number,
+    party_preferred_indication,
+    party_account_involvement_code,
+    account_deal_date,
+    account_update_date,
+    meteg_doar_net,
+    kod_harshaat_peilut,
+    account_closing_reason_code,
+    account_agreement_opening_date,
+    service_authorization_desc,
+    branch_type_code,
+    mymail_entitlement_switch,
+    product_label
+  FROM accounter_schema.financial_bank_accounts;`;
+
+const updateBankAccount = sql<IUpdateBankAccountQuery>`
+  UPDATE accounter_schema.financial_bank_accounts
+  SET
+  bank_number =COALESCE(
+    $bankNumber,
+    bank_number
+  ),
+  branch_number =COALESCE(
+    $branchNumber,
+    branch_number
+  ),
+  extended_bank_number =COALESCE(
+    $extendedBankNumber,
+    extended_bank_number
+  ),
+  party_preferred_indication =COALESCE(
+    $partyPreferredIndication,
+    party_preferred_indication
+  ),
+  party_account_involvement_code =COALESCE(
+    $partyAccountInvolvementCode,
+    party_account_involvement_code
+  ),
+  account_deal_date =COALESCE(
+    $accountDealDate,
+    account_deal_date
+  ),
+  account_update_date =COALESCE(
+    $accountUpdateDate,
+    account_update_date
+  ),
+  meteg_doar_net =COALESCE(
+    $metegDoarNet,
+    meteg_doar_net
+  ),
+  kod_harshaat_peilut =COALESCE(
+    $kodHarshaatPeilut,
+    kod_harshaat_peilut
+  ),
+  account_closing_reason_code =COALESCE(
+    $accountClosingReasonCode,
+    account_closing_reason_code
+  ),
+  account_agreement_opening_date =COALESCE(
+    $accountAgreementOpeningDate,
+    account_agreement_opening_date
+  ),
+  service_authorization_desc =COALESCE(
+    $serviceAuthorizationDesc,
+    service_authorization_desc
+  ),
+  branch_type_code =COALESCE(
+    $branchTypeCode,
+    branch_type_code
+  ),
+  mymail_entitlement_switch =COALESCE(
+    $mymailEntitlementSwitch,
+    mymail_entitlement_switch
+  ),
+  product_label =COALESCE(
+    $productLabel,
+    product_label
+  )
+  WHERE
+    id = $bankAccountId
+  RETURNING *;
+`;
+
+const insertBankAccounts = sql<IInsertBankAccountsQuery>`
+  INSERT INTO accounter_schema.financial_bank_accounts (
+    bank_number,
+    branch_number,
+    extended_bank_number,
+    party_preferred_indication,
+    party_account_involvement_code,
+    account_deal_date,
+    account_update_date,
+    meteg_doar_net,
+    kod_harshaat_peilut,
+    account_closing_reason_code,
+    account_agreement_opening_date,
+    service_authorization_desc,
+    branch_type_code,
+    mymail_entitlement_switch,
+    product_label
+  )
+  VALUES $$bankAccounts(
+    bankNumber,
+    branchNumber,
+    extendedBankNumber,
+    partyPreferredIndication,
+    partyAccountInvolvementCode,
+    accountDealDate,
+    accountUpdateDate,
+    metegDoarNet,
+    kodHarshaatPeilut,
+    accountClosingReasonCode,
+    accountAgreementOpeningDate,
+    serviceAuthorizationDesc,
+    branchTypeCode,
+    mymailEntitlementSwitch,
+    productLabel
+  )
+  RETURNING *;`;
+
+const deleteBankAccount = sql<IDeleteBankAccountQuery>`
+    DELETE FROM accounter_schema.financial_bank_accounts
+    WHERE id = $bankAccountId
+    RETURNING id;
+  `;
+
+@Injectable({
+  scope: Scope.Singleton,
+  global: true,
+})
+export class FinancialBankAccountsProvider {
+  cache = getCacheInstance({
+    stdTTL: 60 * 5,
+  });
+
+  constructor(private dbProvider: DBProvider) {}
+
+  private async batchFinancialBankAccountsByIds(bankAccountIds: readonly string[]) {
+    const accounts = await getFinancialBankAccountsByIds.run(
+      {
+        bankAccountIds,
+      },
+      this.dbProvider,
+    );
+    return bankAccountIds.map(id => accounts.find(account => account.id === id));
+  }
+
+  public getFinancialBankAccountByIdLoader = new DataLoader(
+    (bankAccountIds: readonly string[]) => this.batchFinancialBankAccountsByIds(bankAccountIds),
+    {
+      cacheKeyFn: key => `bank-account-id-${key}`,
+      cacheMap: this.cache,
+    },
+  );
+
+  public getAllFinancialBankAccounts() {
+    const cached = this.cache.get<IGetAllFinancialBankAccountsResult[]>('all-bank-accounts');
+    if (cached) {
+      return Promise.resolve(cached);
+    }
+    return getAllFinancialBankAccounts.run(undefined, this.dbProvider).then(res => {
+      this.cache.set('all-bank-accounts', res);
+      res.map(account => {
+        this.getFinancialBankAccountByIdLoader.prime(account.id, account);
+      });
+      return res;
+    });
+  }
+
+  public async updateBankAccount(params: IUpdateBankAccountParams) {
+    const updatedAccounts = await updateBankAccount.run(params, this.dbProvider);
+    const updatedAccount = updatedAccounts[0];
+    if (updatedAccount) {
+      this.invalidateById(updatedAccount.id);
+      this.getFinancialBankAccountByIdLoader.prime(updatedAccount.id, updatedAccount);
+    }
+    return updatedAccount;
+  }
+
+  public async deleteBankAccount(params: IDeleteBankAccountParams) {
+    if (params.bankAccountId) {
+      this.invalidateById(params.bankAccountId);
+    }
+    return deleteBankAccount.run(params, this.dbProvider);
+  }
+
+  public async insertBankAccounts(params: IInsertBankAccountsParams) {
+    this.cache.delete('all-bank-accounts');
+    return insertBankAccounts.run(params, this.dbProvider);
+  }
+
+  public invalidateById(bankAccountId: string) {
+    this.cache.delete(`bank-account-id-${bankAccountId}`);
+    this.cache.delete('all-bank-accounts');
+  }
+
+  public clearCache() {
+    this.cache.clear();
+  }
+}

package/src/modules/financial-accounts/resolvers/financial-accounts.resolver.ts

@@ -12,14 +12,6 @@ export const financialAccountsResolvers: FinancialAccountsModule.Resolvers = {
       return injector.get(FinancialAccountsProvider).getAllFinancialAccounts();
     },
   },
-  BankFinancialAccount: {
-    __isTypeOf: DbAccount => DbAccount.type === 'BANK_ACCOUNT',
-    ...commonFinancialAccountFields,
-    accountNumber: DbAccount => DbAccount.account_number,
-    bankNumber: DbAccount => DbAccount.bank_number!.toString(),
-    branchNumber: DbAccount => DbAccount.branch_number!.toString(),
-    name: DbAccount => `${DbAccount.bank_number}-${DbAccount.account_number}`,
-  },
   CardFinancialAccount: {
     __isTypeOf: DbAccount => DbAccount.type === 'CREDIT_CARD',
     ...commonFinancialAccountFields,

package/src/modules/financial-accounts/resolvers/financial-bank-accounts.resolver.ts

@@ -0,0 +1,47 @@
+import { GraphQLError } from 'graphql';
+import { Injector } from 'graphql-modules';
+import { FinancialBankAccountsProvider } from '../providers/financial-bank-accounts.provider.js';
+import type {
+  FinancialAccountsModule,
+  IGetFinancialAccountsByOwnerIdsResult,
+  IGetFinancialBankAccountsByIdsResult,
+} from '../types.js';
+import { commonFinancialAccountFields } from './common.js';
+
+async function getBankAccountByFinancialAccount(
+  financialAccount: IGetFinancialAccountsByOwnerIdsResult,
+  injector: Injector,
+): Promise<IGetFinancialBankAccountsByIdsResult> {
+  const bankAccount = await injector
+    .get(FinancialBankAccountsProvider)
+    .getFinancialBankAccountByIdLoader.load(financialAccount.id);
+  if (!bankAccount) {
+    throw new GraphQLError('Bank account not found');
+  }
+  return bankAccount;
+}
+
+export const financialBankAccountsResolvers: FinancialAccountsModule.Resolvers = {
+  Query: {
+    // allFinancialAccounts: async (_, __, { injector }) => {
+    //   return injector.get(FinancialAccountsProvider).getAllFinancialAccounts();
+    // },
+  },
+  BankFinancialAccount: {
+    __isTypeOf: DbAccount => DbAccount.type === 'BANK_ACCOUNT',
+    ...commonFinancialAccountFields,
+    accountNumber: DbAccount => DbAccount.account_number,
+    bankNumber: async (DbAccount, _, { injector }) =>
+      getBankAccountByFinancialAccount(DbAccount, injector).then(bankAccount =>
+        bankAccount.bank_number.toString(),
+      ),
+    branchNumber: async (DbAccount, _, { injector }) =>
+      getBankAccountByFinancialAccount(DbAccount, injector).then(bankAccount =>
+        bankAccount.branch_number.toString(),
+      ),
+    name: async (DbAccount, _, { injector }) =>
+      getBankAccountByFinancialAccount(DbAccount, injector).then(
+        bankAccount => `${bankAccount.bank_number}-${DbAccount.account_number}`,
+      ),
+  },
+};

package/src/modules/financial-accounts/typeDefs/financial-accounts.graphql.ts

@@ -14,17 +14,6 @@ export default gql`
     type: String!
   }
 
-  " represent a single bank account"
-  type BankFinancialAccount implements FinancialAccount {
-    id: UUID!
-    name: String!
-    type: String!
-    " the external identifier of the bank account "
-    accountNumber: String!
-    bankNumber: String!
-    branchNumber: String!
-  }
-
   " represent a single credit card "
   type CardFinancialAccount implements FinancialAccount {
     id: UUID!

package/src/modules/financial-accounts/typeDefs/financial-bank-accounts.graphql.ts

@@ -0,0 +1,14 @@
+import { gql } from 'graphql-modules';
+
+export default gql`
+  " represent a single bank account"
+  type BankFinancialAccount implements FinancialAccount {
+    id: UUID!
+    name: String!
+    type: String!
+    " the external identifier of the bank account "
+    accountNumber: String!
+    bankNumber: String!
+    branchNumber: String!
+  }
+`;

package/src/modules/financial-accounts/types.ts

@@ -1,2 +1,3 @@
 export * from './__generated__/types.js';
 export * from './__generated__/financial-accounts.types.js';
+export * from './__generated__/financial-bank-accounts.types.js';

package/src/modules/green-invoice/helpers/issue-document.helper.ts

@@ -9,6 +9,8 @@ import {
   IGetIssuedDocumentsByIdsResult,
 } from '@modules/documents/types';
 import { FinancialAccountsProvider } from '@modules/financial-accounts/providers/financial-accounts.provider.js';
+import { FinancialBankAccountsProvider } from '@modules/financial-accounts/providers/financial-bank-accounts.provider.js';
+import { IGetFinancialBankAccountsByIdsResult } from '@modules/financial-accounts/types.js';
 import { BusinessesProvider } from '@modules/financial-entities/providers/businesses.provider.js';
 import { IGetTransactionsByChargeIdsResult } from '@modules/transactions/types';
 import { DocumentType } from '@shared/enums';
@@ -57,6 +59,18 @@ export async function getPaymentsFromTransactions(
           break;
       }
 
+      let bankAccount: IGetFinancialBankAccountsByIdsResult | undefined = undefined;
+      if (account.type === 'BANK_ACCOUNT') {
+        bankAccount = await injector
+          .get(FinancialBankAccountsProvider)
+          .getFinancialBankAccountByIdLoader.load(account.id);
+        if (!bankAccount) {
+          throw new GraphQLError(
+            `Bank account details not found for financial account ID "${account.id}"`,
+          );
+        }
+      }
+
       // get further fields
       let paymentTypeSpecificAttributes: Partial<GreenInvoicePayment> = {};
       switch (type as string) {
@@ -76,8 +90,8 @@ export async function getPaymentsFromTransactions(
           break;
         case 'WIRE_TRANSFER':
           paymentTypeSpecificAttributes = {
-            bankName: account.bank_number?.toString(),
-            bankBranch: account.branch_number?.toString(),
+            bankName: bankAccount?.bank_number?.toString(),
+            bankBranch: bankAccount?.branch_number?.toString(),
             bankAccount: account.account_number?.toString(),
           };
           break;