@accounter/server 0.0.8-alpha-20251105181339-4ce756e457f7145a4035565e526bc02285ab2675 → 0.0.8-alpha-20251105183654-b3147b83bfda6ce62d09073ce81342ceadf5160c

package/src/modules/financial-entities/providers/businesses.provider.ts

@@ -281,7 +281,7 @@ const replaceBusinesses = sql<IReplaceBusinessesQuery>`
     UPDATE accounter_schema.clients
     SET business_id = $targetBusinessId
     WHERE business_id = $businessIdToReplace
-    RETURNING green_invoice_id
+    RETURNING (integrations->>'greenInvoiceId')::uuid
   )
   UPDATE accounter_schema.transactions
   SET business_id = $targetBusinessId

package/src/modules/financial-entities/providers/clients.provider.ts

@@ -3,6 +3,7 @@ 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 { validateClientIntegrations } from '../helpers/clients.helper.js';
 import type {
   IDeleteClientQuery,
   IGetAllClientsQuery,
@@ -27,24 +28,14 @@ const getClientsByIds = sql<IGetClientsByIdsQuery>`
 `;
 
 const getClientsByGreenInvoiceIds = sql<IGetClientsByGreenInvoiceIdsQuery>`
-  SELECT *
+  SELECT *, (integrations->>'greenInvoiceId')::uuid as green_invoice_business_id
   FROM accounter_schema.clients
-  WHERE green_invoice_id IN $$greenInvoiceBusinessIds;
+  WHERE (integrations->>'greenInvoiceId')::uuid in $$greenInvoiceBusinessIds;
 `;
 
 const updateClient = sql<IUpdateClientQuery>`
   UPDATE accounter_schema.clients
   SET
-  green_invoice_id = COALESCE(
-    $greenInvoiceId,
-    green_invoice_id,
-    NULL
-  ),
-  hive_id = COALESCE(
-    $hiveId,
-    hive_id,
-    NULL
-  ),
   emails = COALESCE(
     $emails,
     emails,
@@ -54,6 +45,11 @@ const updateClient = sql<IUpdateClientQuery>`
     $newBusinessId,
     business_id,
     NULL
+  ),
+  integrations = COALESCE(
+    $integrations,
+    integrations,
+    NULL
   )
   WHERE
     business_id = $businessId
@@ -67,8 +63,8 @@ const deleteClient = sql<IDeleteClientQuery>`
 `;
 
 const insertClient = sql<IInsertClientQuery>`
-    INSERT INTO accounter_schema.clients (business_id, green_invoice_id, hive_id, emails)
-    VALUES ($businessId, $greenInvoiceId, $hiveId, $emails)
+    INSERT INTO accounter_schema.clients (business_id, emails, integrations)
+    VALUES ($businessId, $emails, $integrations)
     RETURNING *;`;
 
 @Injectable({
@@ -91,7 +87,12 @@ export class ClientsProvider {
       this.cache.set('all-clients', data);
       data.map(client => {
         this.cache.set(`client-id-${client.business_id}`, client);
-        this.cache.set(`client-green-invoice-id-${client.green_invoice_id}`, client);
+        try {
+          const { greenInvoiceId } = validateClientIntegrations(client.integrations ?? {});
+          this.cache.set(`client-green-invoice-id-${greenInvoiceId}`, client);
+        } catch {
+          // swallow errors
+        }
       });
       return data;
     });
@@ -123,7 +124,9 @@ export class ClientsProvider {
         this.dbProvider,
       );
 
-      return greenInvoiceIds.map(id => matches.find(match => match.green_invoice_id === id));
+      return greenInvoiceIds.map(id =>
+        matches.find(match => match.green_invoice_business_id === id),
+      );
     } catch (e) {
       console.error(e);
       return greenInvoiceIds.map(() => undefined);

package/src/modules/financial-entities/resolvers/clients.resolvers.ts

@@ -1,11 +1,11 @@
 import { GraphQLError } from 'graphql';
-import { GreenInvoiceClientProvider } from '@modules/app-providers/green-invoice-client.js';
 import { BusinessesProvider } from '@modules/financial-entities/providers/businesses.provider.js';
 import {
   addGreenInvoiceClient,
   updateGreenInvoiceClient,
 } from '@modules/green-invoice/helpers/green-invoice-clients.helper.js';
-import { Resolvers } from '@shared/gql-types';
+import { ClientIntegrationsInput, Resolvers } from '@shared/gql-types';
+import { validateClientIntegrations } from '../helpers/clients.helper.js';
 import { ClientsProvider } from '../providers/clients.provider.js';
 import type {
   FinancialEntitiesModule,
@@ -45,12 +45,26 @@ export const clientsResolvers: FinancialEntitiesModule.Resolvers &
   },
   Mutation: {
     updateClient: async (_, { businessId, fields }, { injector }) => {
+      let updatedIntegrations: ClientIntegrationsInput | undefined =
+        fields.integrations ?? undefined;
+      if (updatedIntegrations) {
+        const currentClient = await injector
+          .get(ClientsProvider)
+          .getClientByIdLoader.load(businessId);
+        if (!currentClient) {
+          throw new GraphQLError(`Client with ID="${businessId}" not found`);
+        }
+        const currentIntegrations = validateClientIntegrations(currentClient.integrations);
+        updatedIntegrations = {
+          ...currentIntegrations,
+          ...updatedIntegrations,
+        };
+      }
       const adjustedFields: IUpdateClientParams = {
         businessId,
         emails: fields.emails ? [...fields.emails] : undefined,
-        greenInvoiceId: fields.greenInvoiceId,
-        hiveId: fields.hiveId,
         newBusinessId: fields.newBusinessId,
+        integrations: updatedIntegrations,
       };
       try {
         const [updatedClient] = await injector
@@ -81,8 +95,7 @@ export const clientsResolvers: FinancialEntitiesModule.Resolvers &
         const newClient: IInsertClientParams = {
           businessId: fields.businessId,
           emails: fields.emails ? [...fields.emails] : [],
-          greenInvoiceId: fields.greenInvoiceId,
-          hiveId: fields.hiveId,
+          integrations: fields.integrations,
         };
         const [insertClient] = await injector.get(ClientsProvider).insertClient(newClient);
 
@@ -116,28 +129,18 @@ export const clientsResolvers: FinancialEntitiesModule.Resolvers &
 
       return businessMatch;
     },
-    greenInvoiceId: business => business.green_invoice_id,
-    hiveId: business => business.hive_id,
     emails: business => business.emails ?? [],
-    greenInvoiceInfo: async (business, _, { injector }) => {
-      if (!business.green_invoice_id) {
-        return null;
-      }
-      const client = await injector
-        .get(GreenInvoiceClientProvider)
-        .clientLoader.load(business.green_invoice_id);
-      if (!client) {
-        throw new GraphQLError(
-          `Green Invoice client with ID "${business.green_invoice_id}" not found`,
-        );
-      }
-      const emails = client.emails ? (client.emails.filter(Boolean) as string[]) : [];
-      return {
-        ...client,
-        emails,
-        id: business.green_invoice_id,
-      };
-    },
+    integrations: business => business,
+  },
+  ClientIntegrations: {
+    id: business => `${business.business_id}-integrations`,
+    hiveId: business => validateClientIntegrations(business.integrations).hiveId ?? null,
+    linearId: business => validateClientIntegrations(business.integrations).linearId ?? null,
+    slackChannelKey: business =>
+      validateClientIntegrations(business.integrations).slackChannelKey ?? null,
+    notionId: business => validateClientIntegrations(business.integrations).notionId ?? null,
+    workflowyUrl: business =>
+      validateClientIntegrations(business.integrations).workflowyUrl ?? null,
   },
   LtdFinancialEntity: {
     clientInfo: async (business, _, { injector }) => {

package/src/modules/financial-entities/typeDefs/clients.graphql.ts

@@ -16,29 +16,45 @@ export default gql`
   type Client {
     id: UUID!
     originalBusiness: LtdFinancialEntity!
-    greenInvoiceId: UUID
-    hiveId: String
     emails: [String!]!
     generatedDocumentType: DocumentType!
-    greenInvoiceInfo: GreenInvoiceClient
+    integrations: ClientIntegrations!
+  }
+
+  " integrations associated with a client "
+  type ClientIntegrations {
+    id: ID!
+    hiveId: String
+    linearId: String
+    slackChannelKey: String
+    notionId: String
+    workflowyUrl: String
   }
 
   " fields for inserting a new client "
   input ClientInsertInput {
     businessId: UUID!
-    greenInvoiceId: UUID
-    hiveId: String
     emails: [String!]
     generatedDocumentType: DocumentType!
+    integrations: ClientIntegrationsInput
   }
 
   " fields for updating an existing client "
   input ClientUpdateInput {
-    greenInvoiceId: UUID
-    hiveId: String
+    newBusinessId: UUID
     emails: [String!]
     generatedDocumentType: DocumentType
-    newBusinessId: UUID
+    integrations: ClientIntegrationsInput
+  }
+
+  " integrations input for client insert/update "
+  input ClientIntegrationsInput {
+    greenInvoiceId: UUID
+    hiveId: String
+    linearId: String
+    slackChannelKey: String
+    notionId: String
+    workflowyUrl: String
   }
 
   " result type for updateClient "

package/src/modules/green-invoice/__generated__/types.ts

@@ -11,6 +11,7 @@ export namespace GreenInvoiceModule {
     GreenInvoiceIncome: 'currency' | 'currencyRate' | 'description' | 'itemId' | 'price' | 'quantity' | 'vatRate' | 'vatType';
     GreenInvoicePayment: 'currency' | 'currencyRate' | 'date' | 'price' | 'type' | 'subType' | 'bankName' | 'bankBranch' | 'bankAccount' | 'chequeNum' | 'accountId' | 'transactionId' | 'appType' | 'cardType' | 'cardNum' | 'dealType' | 'numPayments' | 'firstPayment';
     IssuedDocumentInfo: 'originalDocument';
+    ClientIntegrations: 'greenInvoiceInfo';
   };
   
   interface DefinedEnumValues {
@@ -46,6 +47,7 @@ export namespace GreenInvoiceModule {
   export type FileScalar = Types.FileScalar;
   export type Charge = Types.Charge;
   export type IssuedDocumentInfo = Types.IssuedDocumentInfo;
+  export type ClientIntegrations = Types.ClientIntegrations;
   export type DocumentType = Types.DocumentType;
   export type GreenInvoiceDocumentLang = DefinedEnumValues['GreenInvoiceDocumentLang'];
   export type Currency = Types.Currency;
@@ -75,6 +77,7 @@ export namespace GreenInvoiceModule {
   export type GreenInvoiceIncomeResolvers = Pick<Types.GreenInvoiceIncomeResolvers, DefinedFields['GreenInvoiceIncome']>;
   export type GreenInvoicePaymentResolvers = Pick<Types.GreenInvoicePaymentResolvers, DefinedFields['GreenInvoicePayment']>;
   export type IssuedDocumentInfoResolvers = Pick<Types.IssuedDocumentInfoResolvers, DefinedFields['IssuedDocumentInfo']>;
+  export type ClientIntegrationsResolvers = Pick<Types.ClientIntegrationsResolvers, DefinedFields['ClientIntegrations']>;
   
   export interface Resolvers {
     Query?: QueryResolvers;
@@ -86,6 +89,7 @@ export namespace GreenInvoiceModule {
     GreenInvoiceIncome?: GreenInvoiceIncomeResolvers;
     GreenInvoicePayment?: GreenInvoicePaymentResolvers;
     IssuedDocumentInfo?: IssuedDocumentInfoResolvers;
+    ClientIntegrations?: ClientIntegrationsResolvers;
   };
   
   export interface MiddlewareMap {
@@ -112,6 +116,10 @@ export namespace GreenInvoiceModule {
       '*'?: gm.Middleware[];
       originalDocument?: gm.Middleware[];
     };
+    ClientIntegrations?: {
+      '*'?: gm.Middleware[];
+      greenInvoiceInfo?: gm.Middleware[];
+    };
     GenerateMonthlyClientDocumentsResult?: {
       '*'?: gm.Middleware[];
       success?: gm.Middleware[];

package/src/modules/green-invoice/helpers/contract-to-draft.helper.ts

@@ -3,13 +3,13 @@ import { GraphQLError } from 'graphql';
 import { Injector } from 'graphql-modules';
 import type { IGetContractsByIdsResult } from '@modules/contracts/types.js';
 import { normalizeDocumentType } from '@modules/documents/resolvers/common.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 { Currency } from '@shared/enums';
 import { NewDocumentInfo } from '@shared/gql-types';
 import { dateToTimelessDateString } from '@shared/helpers';
 import { TimelessDateString } from '@shared/types';
-import { getClientFromGreenInvoiceClient } from './green-invoice-clients.helper.js';
 
 export const convertContractToDraft = async (
   contract: IGetContractsByIdsResult,
@@ -20,12 +20,7 @@ export const convertContractToDraft = async (
     .get(BusinessesProvider)
     .getBusinessByIdLoader.load(contract.client_id);
   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`);
@@ -35,7 +30,9 @@ export const convertContractToDraft = async (
     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}"`);
   }
 
@@ -45,7 +42,7 @@ export const convertContractToDraft = async (
   const year = today.getFullYear() + (today.getMonth() === 0 ? -1 : 0);
   const month = format(subMonths(today, 1), 'MMMM');
 
-  const documentInput: NewDocumentInfo = {
+  const documentInput: Omit<NewDocumentInfo, 'client'> & { client: string | undefined } = {
     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),
@@ -56,10 +53,7 @@ export const convertContractToDraft = async (
     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}`,

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!,