@accounter/server 0.0.8-alpha-20251105183654-b3147b83bfda6ce62d09073ce81342ceadf5160c → 0.0.8-alpha-20251106080932-aeb05a6f60a5ad38f48a4149e31ae1c5482d7177

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

@@ -14,7 +14,6 @@ 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 {
@@ -28,9 +27,10 @@ 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, ResolversTypes } from '@shared/gql-types';
+import { BillingCycle, 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,
@@ -105,13 +105,18 @@ 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, payment, vatType] = await Promise.all([
+      const [businessMatch, openIssuedDocuments, client, payment, vatType] = await Promise.all([
         businessMatchPromise,
         openIssuedDocumentsPromise,
+        clientPromise,
         paymentPromise,
         vatTypePromise,
       ]);
@@ -131,10 +136,6 @@ 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)!,
@@ -192,7 +193,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         vatType,
         rounding: false,
         signed: true,
-        client: greenInvoiceClientId,
+        client,
         income,
         payment,
         // linkedPaymentId: ____,
@@ -283,13 +284,14 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
 
       const paymentPromise = getPaymentsFromTransactions(injector, transactions ?? []);
 
-      const greenInvoiceClientId = validateClientIntegrations(
-        businessMatch?.integrations ?? {},
-      ).greenInvoiceId;
+      const clientPromise = charge.business_id
+        ? getClientFromGreenInvoiceClient(injector, charge.business_id)
+        : Promise.resolve(undefined);
 
-      const [greenInvoiceDocument, payment] = await Promise.all([
+      const [greenInvoiceDocument, payment, client] = await Promise.all([
         greenInvoiceDocumentPromise,
         paymentPromise,
+        clientPromise,
       ]);
 
       if (!greenInvoiceDocument) {
@@ -339,7 +341,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         vatType,
         rounding: false,
         signed: true,
-        client: greenInvoiceClientId,
+        client,
         income,
         payment,
         // linkedPaymentId: ____,
@@ -388,7 +390,15 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
       const clientPromise = injector
         .get(ClientsProvider)
         .getClientByIdLoader.load(contract.client_id);
-      const [business, client] = await Promise.all([businessPromise, clientPromise]);
+      const greenInvoiceClientPromise = getClientFromGreenInvoiceClient(
+        injector,
+        contract.client_id,
+      );
+      const [business, client, greenInvoiceClient] = await Promise.all([
+        businessPromise,
+        clientPromise,
+        greenInvoiceClientPromise,
+      ]);
 
       if (!business) {
         throw new GraphQLError(`Business ID="${contract.client_id}" not found`);
@@ -398,9 +408,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         throw new GraphQLError(`Client not found for business ID="${contract.client_id}"`);
       }
 
-      const greenInvoiceId = validateClientIntegrations(client.integrations)?.greenInvoiceId;
-
-      if (!greenInvoiceId) {
+      if (!greenInvoiceClient) {
         throw new GraphQLError(
           `Green invoice match not found for business ID="${contract.client_id}"`,
         );
@@ -412,7 +420,7 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
       const year = today.getFullYear() + (today.getMonth() === 0 ? -1 : 0);
       const month = format(subMonths(today, 1), 'MMMM');
 
-      const draft: ResolversTypes['NewDocumentInfo'] = {
+      const draft: 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),
@@ -423,7 +431,10 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         vatType: 'EXEMPT',
         rounding: false,
         signed: true,
-        client: greenInvoiceId,
+        client: {
+          ...greenInvoiceClient,
+          emails: [...((client.emails?.filter(Boolean) as string[]) ?? [])],
+        },
         income: [
           {
             description: `GraphQL Hive Enterprise License - ${month} ${year}`,
@@ -444,12 +455,12 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
           throw new GraphQLError(`Client not found for ID="${clientId}"`);
         }
 
-        const greenInvoiceId = validateClientIntegrations(client.integrations)?.greenInvoiceId;
-        if (!greenInvoiceId) {
-          throw new GraphQLError(`Client ID="${clientId}" is missing Green Invoice integration`);
+        const greenInvoiceClient = await getClientFromGreenInvoiceClient(injector, clientId);
+        if (!greenInvoiceClient) {
+          throw new GraphQLError(`Green invoice match not found for client ID="${clientId}"`);
         }
 
-        return greenInvoiceId;
+        return greenInvoiceClient;
       } catch (error) {
         const message = 'Failed to fetch Green Invoice client';
         console.error(message, error);
@@ -648,80 +659,4 @@ 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,10 +33,6 @@ 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!

package/dist/server/src/modules/financial-entities/helpers/clients.helper.d.ts

@@ -1,11 +0,0 @@
-import { z } from 'zod';
-export declare const ClientIntegrationsSchema: z.ZodObject<{
-    greenInvoiceId: z.ZodNullable<z.ZodOptional<z.ZodUUID>>;
-    hiveId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    linearId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    slackChannelKey: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    notionId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    workflowyUrl: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-}, z.core.$strict>;
-export type ClientIntegrations = z.infer<typeof ClientIntegrationsSchema>;
-export declare function validateClientIntegrations(input: unknown): ClientIntegrations;

package/dist/server/src/modules/financial-entities/helpers/clients.helper.js

@@ -1,26 +0,0 @@
-import { GraphQLError } from 'graphql';
-import { z } from 'zod';
-// Zod schema matching the GraphQL `ClientIntegrations` type
-export const ClientIntegrationsSchema = z
-    .object({
-    greenInvoiceId: z.uuid().optional().nullable(),
-    hiveId: z.string().optional().nullable(),
-    linearId: z.string().optional().nullable(),
-    slackChannelKey: z.string().optional().nullable(),
-    notionId: z.string().optional().nullable(),
-    workflowyUrl: z.string().optional().nullable(),
-})
-    .strict();
-export function validateClientIntegrations(input) {
-    try {
-        const { data, success, error } = ClientIntegrationsSchema.safeParse(input);
-        if (!success) {
-            throw new Error(`Parsing error: ${error}`);
-        }
-        return data;
-    }
-    catch (error) {
-        throw new GraphQLError(`Failed to validate client integrations: ${error}`);
-    }
-}
-//# sourceMappingURL=clients.helper.js.map

package/dist/server/src/modules/financial-entities/helpers/clients.helper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"clients.helper.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/helpers/clients.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,4DAA4D;AAC5D,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC;KACtC,MAAM,CAAC;IACN,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC9C,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACxC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC1C,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACjD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC1C,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CAC/C,CAAC;KACD,MAAM,EAAE,CAAC;AAIZ,MAAM,UAAU,0BAA0B,CAAC,KAAc;IACvD,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,wBAAwB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC3E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,YAAY,CAAC,2CAA2C,KAAK,EAAE,CAAC,CAAC;IAC7E,CAAC;AACH,CAAC"}

package/src/modules/financial-entities/helpers/clients.helper.ts

@@ -1,28 +0,0 @@
-import { GraphQLError } from 'graphql';
-import { z } from 'zod';
-
-// Zod schema matching the GraphQL `ClientIntegrations` type
-export const ClientIntegrationsSchema = z
-  .object({
-    greenInvoiceId: z.uuid().optional().nullable(),
-    hiveId: z.string().optional().nullable(),
-    linearId: z.string().optional().nullable(),
-    slackChannelKey: z.string().optional().nullable(),
-    notionId: z.string().optional().nullable(),
-    workflowyUrl: z.string().optional().nullable(),
-  })
-  .strict();
-
-export type ClientIntegrations = z.infer<typeof ClientIntegrationsSchema>;
-
-export function validateClientIntegrations(input: unknown): ClientIntegrations {
-  try {
-    const { data, success, error } = ClientIntegrationsSchema.safeParse(input);
-    if (!success) {
-      throw new Error(`Parsing error: ${error}`);
-    }
-    return data;
-  } catch (error) {
-    throw new GraphQLError(`Failed to validate client integrations: ${error}`);
-  }
-}