@accounter/server 0.0.8-alpha-20251102162844-adaba3b25910083f6ebd80bd580629e1c0871260 → 0.0.8-alpha-20251102200443-d7162b8ce1dfc629b8b454df17dcec9ed005a052

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

@@ -1,6 +1,6 @@
 import { GraphQLError } from 'graphql';
 import { Injector } from 'graphql-modules';
-import type { Document } from '@accounter/green-invoice-graphql';
+import type { _DOLLAR_defs_Document } from '@accounter/green-invoice-graphql';
 import { GreenInvoiceClientProvider } from '@modules/app-providers/green-invoice-client.js';
 import { ChargesProvider } from '@modules/charges/providers/charges.provider.js';
 import { IssuedDocumentsProvider } from '@modules/documents/providers/issued-documents.provider.js';
@@ -10,12 +10,10 @@ import {
 } from '@modules/documents/types';
 import { FinancialAccountsProvider } from '@modules/financial-accounts/providers/financial-accounts.provider.js';
 import { BusinessesProvider } from '@modules/financial-entities/providers/businesses.provider.js';
-import { ClientsProvider } from '@modules/financial-entities/providers/clients.provider.js';
 import { IGetTransactionsByChargeIdsResult } from '@modules/transactions/types';
 import { DocumentType } from '@shared/enums';
 import {
   Currency,
-  GreenInvoiceClient,
   GreenInvoiceIncome,
   GreenInvoiceLinkType,
   GreenInvoicePayment,
@@ -129,7 +127,7 @@ export function getIncomeFromDocuments(
   documents: {
     document: IGetDocumentsByChargeIdResult;
     issuedDocument: IGetIssuedDocumentsByIdsResult;
-    greenInvoiceDocument: Document;
+    greenInvoiceDocument: _DOLLAR_defs_Document;
   }[],
 ): GreenInvoiceIncome[] {
   const incomes = documents
@@ -156,7 +154,7 @@ export function getIncomeFromDocuments(
 }
 
 export function getTypeFromDocumentsAndTransactions(
-  greenInvoiceDocuments: Document[],
+  greenInvoiceDocuments: _DOLLAR_defs_Document[],
   transactions: IGetTransactionsByChargeIdsResult[],
 ): DocumentType {
   if (!greenInvoiceDocuments.length) {
@@ -251,42 +249,6 @@ export function getDocumentDateOutOfTransactions(
   return dateToTimelessDateString(firstDate);
 }
 
-export async function getClientFromGreenInvoiceClient(
-  injector: Injector,
-  businessId: string,
-  useGreenInvoiceId = false,
-): Promise<GreenInvoiceClient | undefined> {
-  const client = await injector.get(ClientsProvider).getClientByIdLoader.load(businessId);
-  if (!client) {
-    return useGreenInvoiceId ? undefined : { id: businessId };
-  }
-
-  const greenInvoiceClient = await injector
-    .get(GreenInvoiceClientProvider)
-    .clientLoader.load(client.green_invoice_id);
-
-  if (!greenInvoiceClient) {
-    return useGreenInvoiceId ? undefined : { id: businessId };
-  }
-
-  return {
-    id: useGreenInvoiceId && greenInvoiceClient.id ? greenInvoiceClient.id : businessId,
-    country: greenInvoiceClient.country,
-    emails: [
-      ...((greenInvoiceClient.emails?.filter(Boolean) as string[]) ?? []),
-      'ap@the-guild.dev',
-    ],
-    name: greenInvoiceClient.name,
-    phone: greenInvoiceClient.phone,
-    taxId: greenInvoiceClient.taxId,
-    address: greenInvoiceClient.address,
-    city: greenInvoiceClient.city,
-    zip: greenInvoiceClient.zip,
-    fax: greenInvoiceClient.fax,
-    mobile: greenInvoiceClient.mobile,
-  };
-}
-
 export async function deduceVatTypeFromBusiness(
   injector: Injector,
   locality: string,

package/src/modules/green-invoice/resolvers/green-invoice.resolvers.ts

@@ -1,6 +1,6 @@
 import { addMonths, endOfMonth, format, startOfMonth, subMonths } from 'date-fns';
 import { GraphQLError } from 'graphql';
-import type { Document } from '@accounter/green-invoice-graphql';
+import type { _DOLLAR_defs_Document } from '@accounter/green-invoice-graphql';
 import { GreenInvoiceClientProvider } from '@modules/app-providers/green-invoice-client.js';
 import { ChargesProvider } from '@modules/charges/providers/charges.provider.js';
 import { ContractsProvider } from '@modules/contracts/providers/contracts.provider.js';
@@ -30,11 +30,11 @@ import { Currency, DocumentType } from '@shared/enums';
 import { NewDocumentInfo } from '@shared/gql-types';
 import { dateToTimelessDateString } from '@shared/helpers';
 import { convertContractToDraft } from '../helpers/contract-to-draft.helper.js';
+import { getClientFromGreenInvoiceClient } from '../helpers/green-invoice-clients.helper.js';
 import {
   deduceVatTypeFromBusiness,
   executeDocumentIssue,
   filterAndHandleSwiftTransactions,
-  getClientFromGreenInvoiceClient,
   getDocumentDateOutOfTransactions,
   getIncomeFromDocuments,
   getLinkedDocumentsAttributes,
@@ -134,7 +134,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
               return res;
             }),
         ),
-      ).then(res => res.filter(Boolean) as Document[]);
+      ).then(res => res.filter(Boolean) as _DOLLAR_defs_Document[]);
 
       const income = getIncomeFromDocuments(
         openIssuedDocuments.map(doc => ({
@@ -268,7 +268,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         throw new GraphQLError(`Document with ID "${document.id}" is closed`);
       }
 
-      const greenInvoiceDocumentPromise: Promise<Document | null> = injector
+      const greenInvoiceDocumentPromise: Promise<_DOLLAR_defs_Document | null> = injector
         .get(GreenInvoiceClientProvider)
         .documentLoader.load(openIssuedDocument.external_id)
         .then(res => {
@@ -479,10 +479,10 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
       const issuedDocuments = await injector.get(IssuedDocumentsProvider).getAllIssuedDocuments();
 
       // check for new or updated documents
-      const newDocuments: Document[] = [];
+      const newDocuments: _DOLLAR_defs_Document[] = [];
       const documentToUpdate: {
         localDoc: IGetAllIssuedDocumentsResult;
-        externalDoc: Document;
+        externalDoc: _DOLLAR_defs_Document;
       }[] = [];
       await Promise.all(
         greenInvoiceDocuments.map(async item => {