@accounter/server 0.0.8-alpha-20251105180132-1c81096625a160ce926416f8206cb74fcf4f769f → 0.0.8-alpha-20251105183654-b3147b83bfda6ce62d09073ce81342ceadf5160c

package/src/modules/green-invoice/helpers/green-invoice-clients.helper.ts

@@ -5,51 +5,16 @@ import {
 } from '@accounter/green-invoice-graphql';
 import { GreenInvoiceClientProvider } from '@modules/app-providers/green-invoice-client.js';
 import { CountryCode } from '@modules/countries/types.js';
+import { validateClientIntegrations } from '@modules/financial-entities/helpers/clients.helper.js';
 import { BusinessesProvider } from '@modules/financial-entities/providers/businesses.provider.js';
 import { ClientsProvider } from '@modules/financial-entities/providers/clients.provider.js';
 import {
   IGetBusinessesByIdsResult,
   IGetClientsByIdsResult,
 } from '@modules/financial-entities/types.js';
-import { ClientUpdateInput, GreenInvoiceClient, UpdateBusinessInput } from '@shared/gql-types';
+import { ClientUpdateInput, UpdateBusinessInput } from '@shared/gql-types';
 import { countryCodeToGreenInvoiceCountry } from './green-invoice.helper.js';
 
-export async function getClientFromGreenInvoiceClient(
-  injector: Injector,
-  businessId: string,
-  useGreenInvoiceId = false,
-): Promise<GreenInvoiceClient | undefined> {
-  const client = await injector.get(ClientsProvider).getClientByIdLoader.load(businessId);
-  if (!client?.green_invoice_id) {
-    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,
-  };
-}
-
 function convertLocalClientToGreenInvoiceCreateClientInput(
   localClient: IGetClientsByIdsResult,
   localBusiness: IGetBusinessesByIdsResult,
@@ -134,10 +99,15 @@ export async function addGreenInvoiceClient(clientId: string, injector: Injector
       throw new Error('Failed to create Green Invoice client');
     }
 
+    const integrations = validateClientIntegrations(localClient.integrations);
+
     // add green invoice id to local client
     await injector.get(ClientsProvider).updateClient({
       businessId: clientId,
-      greenInvoiceId: greenInvoiceClient.id,
+      integrations: {
+        ...integrations,
+        greenInvoiceId: greenInvoiceClient.id,
+      },
     });
   } catch (error) {
     const message = 'Error adding Green Invoice client';
@@ -216,7 +186,16 @@ export async function updateGreenInvoiceClient(
     localBusinessPromise,
     localClientPromise,
   ]);
-  if (!localBusiness?.name || !localClient?.green_invoice_id) {
+
+  let greenInvoiceId: string | undefined = undefined;
+  try {
+    greenInvoiceId =
+      validateClientIntegrations(localClient?.integrations ?? {}).greenInvoiceId ?? undefined;
+  } catch {
+    // swallow errors
+    return;
+  }
+  if (!localBusiness?.name || !greenInvoiceId) {
     // We cannot update a client in Green Invoice without its ID.
     console.warn(
       `Cannot update Green Invoice client: missing local business name or client ID for business${clientId}`,
@@ -233,7 +212,7 @@ export async function updateGreenInvoiceClient(
   }
 
   const greenInvoiceClient = await injector.get(GreenInvoiceClientProvider).updateClient({
-    id: localClient.green_invoice_id,
+    id: greenInvoiceId,
     input: fieldsToUpdate,
   });
 

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

@@ -25,14 +25,15 @@ import { CountryCode } from '@modules/countries/types.js';
 import { DocumentsProvider } from '@modules/documents/providers/documents.provider.js';
 import { IssuedDocumentsProvider } from '@modules/documents/providers/issued-documents.provider.js';
 import type { document_status, IInsertDocumentsParams } from '@modules/documents/types';
+import { validateClientIntegrations } from '@modules/financial-entities/helpers/clients.helper.js';
 import { ClientsProvider } from '@modules/financial-entities/providers/clients.provider.js';
 import {
   Currency,
   DocumentType,
   GreenInvoiceCountry,
   GreenInvoicePaymentType,
-  NewDocumentInfo,
   NewDocumentInput,
+  ResolversTypes,
   type GreenInvoiceDiscountType,
   type GreenInvoiceDocumentLang,
   type GreenInvoiceLinkType,
@@ -1247,18 +1248,24 @@ export async function convertDocumentInputIntoGreenInvoiceInput(
     if (!clientInfo) {
       throw new GraphQLError(`Client with ID ${initialInput.client.id} not found`);
     }
-    if (!clientInfo.green_invoice_id) {
+    let greenInvoiceId: string | null = null;
+    try {
+      greenInvoiceId =
+        validateClientIntegrations(clientInfo.integrations ?? {}).greenInvoiceId ?? null;
+    } catch (error) {
+      console.error('Failed to validate client integrations', error);
+      throw new GraphQLError(`Client with ID ${initialInput.client.id} has invalid integrations`);
+    }
+    if (!greenInvoiceId) {
       throw new GraphQLError(`Client with ID ${initialInput.client.id} not found in Green Invoice`);
     }
     const greenInvoiceClient = await injector
       .get(GreenInvoiceClientProvider)
-      .clientLoader.load(clientInfo.green_invoice_id);
+      .clientLoader.load(greenInvoiceId);
     if (!greenInvoiceClient) {
-      throw new GraphQLError(
-        `Green Invoice client with ID ${clientInfo.green_invoice_id} not found`,
-      );
+      throw new GraphQLError(`Green Invoice client with ID ${greenInvoiceId} not found`);
     }
-    const emails: (string | null)[] = ['ap@the-guild.dev'];
+    const emails: (string | null)[] = ['ap@the-guild.dev']; // TODO: remove hardcoded email
     const inputEmails = initialInput.client?.emails?.filter(Boolean) ?? [];
     if (inputEmails.length) {
       emails.push(...inputEmails);
@@ -1266,7 +1273,7 @@ export async function convertDocumentInputIntoGreenInvoiceInput(
       emails.push(...(greenInvoiceClient.emails ?? []));
     }
     client = {
-      id: clientInfo.green_invoice_id,
+      id: greenInvoiceClient.id,
       country: greenInvoiceClient.country,
       name: greenInvoiceClient.name,
       phone: greenInvoiceClient.phone,
@@ -1323,18 +1330,10 @@ export async function convertDocumentInputIntoGreenInvoiceInput(
 
 export function convertGreenInvoiceDocumentToLocalDocumentInfo(
   greenInvoiceDocument: _DOLLAR_defs_Document,
-): NewDocumentInfo {
+): ResolversTypes['NewDocumentInfo'] {
   return {
     ...greenInvoiceDocument,
-    client: greenInvoiceDocument.client?.id
-      ? {
-          ...greenInvoiceDocument.client,
-          id: greenInvoiceDocument.client.id,
-          emails: greenInvoiceDocument.client.emails
-            ? (greenInvoiceDocument.client.emails.filter(Boolean) as string[])
-            : [],
-        }
-      : undefined,
+    client: greenInvoiceDocument.client?.id,
     currency: greenInvoiceDocument.currency as Currency,
     income: greenInvoiceDocument.income?.filter(Boolean).map(income => ({
       ...income!,

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

@@ -14,6 +14,7 @@ import type {
   IInsertDocumentsResult,
   IUpdateIssuedDocumentParams,
 } from '@modules/documents/types.js';
+import { validateClientIntegrations } from '@modules/financial-entities/helpers/clients.helper.js';
 import { BusinessesProvider } from '@modules/financial-entities/providers/businesses.provider.js';
 import { ClientsProvider } from '@modules/financial-entities/providers/clients.provider.js';
 import {
@@ -27,10 +28,9 @@ import {
 } from '@modules/green-invoice/helpers/green-invoice.helper.js';
 import { TransactionsProvider } from '@modules/transactions/providers/transactions.provider.js';
 import { Currency, DocumentType } from '@shared/enums';
-import { BillingCycle, NewDocumentInfo } from '@shared/gql-types';
+import { BillingCycle, ResolversTypes } 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,
@@ -105,18 +105,13 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
             }) as IGetIssuedDocumentsByIdsResult[],
         );
 
-      const clientPromise = charge.business_id
-        ? getClientFromGreenInvoiceClient(injector, charge.business_id)
-        : Promise.resolve(undefined);
-
       const paymentPromise = getPaymentsFromTransactions(injector, transactions);
 
       const vatTypePromise = deduceVatTypeFromBusiness(injector, locality, charge.business_id);
 
-      const [businessMatch, openIssuedDocuments, client, payment, vatType] = await Promise.all([
+      const [businessMatch, openIssuedDocuments, payment, vatType] = await Promise.all([
         businessMatchPromise,
         openIssuedDocumentsPromise,
-        clientPromise,
         paymentPromise,
         vatTypePromise,
       ]);
@@ -136,6 +131,10 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         ),
       ).then(res => res.filter(Boolean) as _DOLLAR_defs_Document[]);
 
+      const greenInvoiceClientId = validateClientIntegrations(
+        businessMatch?.integrations ?? {},
+      ).greenInvoiceId;
+
       const income = getIncomeFromDocuments(
         openIssuedDocuments.map(doc => ({
           document: documents.find(d => d.id === doc.id)!,
@@ -193,7 +192,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         vatType,
         rounding: false,
         signed: true,
-        client,
+        client: greenInvoiceClientId,
         income,
         payment,
         // linkedPaymentId: ____,
@@ -284,14 +283,13 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
 
       const paymentPromise = getPaymentsFromTransactions(injector, transactions ?? []);
 
-      const clientPromise = charge.business_id
-        ? getClientFromGreenInvoiceClient(injector, charge.business_id)
-        : Promise.resolve(undefined);
+      const greenInvoiceClientId = validateClientIntegrations(
+        businessMatch?.integrations ?? {},
+      ).greenInvoiceId;
 
-      const [greenInvoiceDocument, payment, client] = await Promise.all([
+      const [greenInvoiceDocument, payment] = await Promise.all([
         greenInvoiceDocumentPromise,
         paymentPromise,
-        clientPromise,
       ]);
 
       if (!greenInvoiceDocument) {
@@ -341,7 +339,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         vatType,
         rounding: false,
         signed: true,
-        client,
+        client: greenInvoiceClientId,
         income,
         payment,
         // linkedPaymentId: ____,
@@ -390,15 +388,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
       const clientPromise = injector
         .get(ClientsProvider)
         .getClientByIdLoader.load(contract.client_id);
-      const greenInvoiceClientPromise = getClientFromGreenInvoiceClient(
-        injector,
-        contract.client_id,
-      );
-      const [business, client, greenInvoiceClient] = await Promise.all([
-        businessPromise,
-        clientPromise,
-        greenInvoiceClientPromise,
-      ]);
+      const [business, client] = await Promise.all([businessPromise, clientPromise]);
 
       if (!business) {
         throw new GraphQLError(`Business ID="${contract.client_id}" not found`);
@@ -408,7 +398,9 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         throw new GraphQLError(`Client not found for business ID="${contract.client_id}"`);
       }
 
-      if (!greenInvoiceClient) {
+      const greenInvoiceId = validateClientIntegrations(client.integrations)?.greenInvoiceId;
+
+      if (!greenInvoiceId) {
         throw new GraphQLError(
           `Green invoice match not found for business ID="${contract.client_id}"`,
         );
@@ -420,7 +412,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
       const year = today.getFullYear() + (today.getMonth() === 0 ? -1 : 0);
       const month = format(subMonths(today, 1), 'MMMM');
 
-      const draft: NewDocumentInfo = {
+      const draft: ResolversTypes['NewDocumentInfo'] = {
         remarks: `${contract.purchase_orders[0] ? `PO: ${contract.purchase_orders[0]}${contract.remarks ? ', ' : ''}` : ''}${contract.remarks ?? ''}`,
         description: `GraphQL Hive Enterprise License - ${month} ${year}`,
         type: normalizeDocumentType(contract.document_type),
@@ -431,10 +423,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         vatType: 'EXEMPT',
         rounding: false,
         signed: true,
-        client: {
-          ...greenInvoiceClient,
-          emails: [...((client.emails?.filter(Boolean) as string[]) ?? [])],
-        },
+        client: greenInvoiceId,
         income: [
           {
             description: `GraphQL Hive Enterprise License - ${month} ${year}`,
@@ -455,12 +444,12 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
           throw new GraphQLError(`Client not found for ID="${clientId}"`);
         }
 
-        const greenInvoiceClient = await getClientFromGreenInvoiceClient(injector, clientId);
-        if (!greenInvoiceClient) {
-          throw new GraphQLError(`Green invoice match not found for client ID="${clientId}"`);
+        const greenInvoiceId = validateClientIntegrations(client.integrations)?.greenInvoiceId;
+        if (!greenInvoiceId) {
+          throw new GraphQLError(`Client ID="${clientId}" is missing Green Invoice integration`);
         }
 
-        return greenInvoiceClient;
+        return greenInvoiceId;
       } catch (error) {
         const message = 'Failed to fetch Green Invoice client';
         console.error(message, error);
@@ -659,4 +648,80 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
       }
     },
   },
+  ClientIntegrations: {
+    greenInvoiceInfo: business =>
+      validateClientIntegrations(business.integrations).greenInvoiceId ?? null,
+  },
+  GreenInvoiceClient: {
+    id: clientId => clientId,
+    country: async (clientId, _, { injector }) => {
+      return injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => {
+          if (client?.country) {
+            // TODO: use Country for server responses
+            // greenInvoiceCountryToCountryCode(client.country)
+            return client.country;
+          }
+          return null;
+        });
+    },
+    emails: async (clientId, _, { injector }) => {
+      const emails = await injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => client?.emails);
+
+      return [...((emails?.filter(Boolean) as string[]) ?? []), 'ap@the-guild.dev']; // TODO: remove hardcoded email
+    },
+    name: async (clientId, _, { injector }) => {
+      return injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => client?.name ?? null);
+    },
+    phone: async (clientId, _, { injector }) => {
+      return injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => client?.phone ?? null);
+    },
+    taxId: async (clientId, _, { injector }) => {
+      return injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => client?.taxId ?? null);
+    },
+    address: async (clientId, _, { injector }) => {
+      return injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => client?.address ?? null);
+    },
+    city: async (clientId, _, { injector }) => {
+      return injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => client?.city ?? null);
+    },
+    zip: async (clientId, _, { injector }) => {
+      return injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => client?.zip ?? null);
+    },
+    fax: async (clientId, _, { injector }) => {
+      return injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => client?.fax ?? null);
+    },
+    mobile: async (clientId, _, { injector }) => {
+      return injector
+        .get(GreenInvoiceClientProvider)
+        .clientLoader.load(clientId)
+        .then(client => client?.mobile ?? null);
+    },
+  },
 };

package/src/modules/green-invoice/typeDefs/green-invoice.graphql.ts

@@ -33,6 +33,10 @@ export default gql`
     originalDocument: NewDocumentInfo
   }
 
+  extend type ClientIntegrations {
+    greenInvoiceInfo: GreenInvoiceClient
+  }
+
   " result type for generateMonthlyClientDocuments" # eslint-disable-next-line @graphql-eslint/strict-id-in-types -- no current solution for this
   type GenerateMonthlyClientDocumentsResult {
     success: Boolean!