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

package/src/__generated__/types.ts

@@ -942,10 +942,8 @@ export type Client = {
   readonly __typename?: 'Client';
   readonly emails: ReadonlyArray<Scalars['String']['output']>;
   readonly generatedDocumentType: DocumentType;
-  readonly greenInvoiceId?: Maybe<Scalars['UUID']['output']>;
-  readonly greenInvoiceInfo?: Maybe<GreenInvoiceClient>;
-  readonly hiveId?: Maybe<Scalars['String']['output']>;
   readonly id: Scalars['UUID']['output'];
+  readonly integrations: ClientIntegrations;
   readonly originalBusiness: LtdFinancialEntity;
 };
 
@@ -954,16 +952,36 @@ export type ClientInsertInput = {
   readonly businessId: Scalars['UUID']['input'];
   readonly emails?: InputMaybe<ReadonlyArray<Scalars['String']['input']>>;
   readonly generatedDocumentType: DocumentType;
+  readonly integrations?: InputMaybe<ClientIntegrationsInput>;
+};
+
+/**  integrations associated with a client  */
+export type ClientIntegrations = {
+  readonly __typename?: 'ClientIntegrations';
+  readonly greenInvoiceInfo?: Maybe<GreenInvoiceClient>;
+  readonly hiveId?: Maybe<Scalars['String']['output']>;
+  readonly id: Scalars['ID']['output'];
+  readonly linearId?: Maybe<Scalars['String']['output']>;
+  readonly notionId?: Maybe<Scalars['String']['output']>;
+  readonly slackChannelKey?: Maybe<Scalars['String']['output']>;
+  readonly workflowyUrl?: Maybe<Scalars['String']['output']>;
+};
+
+/**  integrations input for client insert/update  */
+export type ClientIntegrationsInput = {
   readonly greenInvoiceId?: InputMaybe<Scalars['UUID']['input']>;
   readonly hiveId?: InputMaybe<Scalars['String']['input']>;
+  readonly linearId?: InputMaybe<Scalars['String']['input']>;
+  readonly notionId?: InputMaybe<Scalars['String']['input']>;
+  readonly slackChannelKey?: InputMaybe<Scalars['String']['input']>;
+  readonly workflowyUrl?: InputMaybe<Scalars['String']['input']>;
 };
 
 /**  fields for updating an existing client  */
 export type ClientUpdateInput = {
   readonly emails?: InputMaybe<ReadonlyArray<Scalars['String']['input']>>;
   readonly generatedDocumentType?: InputMaybe<DocumentType>;
-  readonly greenInvoiceId?: InputMaybe<Scalars['UUID']['input']>;
-  readonly hiveId?: InputMaybe<Scalars['String']['input']>;
+  readonly integrations?: InputMaybe<ClientIntegrationsInput>;
   readonly newBusinessId?: InputMaybe<Scalars['UUID']['input']>;
 };
 
@@ -5162,6 +5180,8 @@ export type ResolversTypes = {
   ChargesWithLedgerChangesResult: ResolverTypeWrapper<Omit<ChargesWithLedgerChangesResult, 'charge'> & { charge?: Maybe<ResolversTypes['Charge']> }>;
   Client: ResolverTypeWrapper<IGetAllClientsResult>;
   ClientInsertInput: ClientInsertInput;
+  ClientIntegrations: ResolverTypeWrapper<IGetAllClientsResult>;
+  ClientIntegrationsInput: ClientIntegrationsInput;
   ClientUpdateInput: ClientUpdateInput;
   CommonCharge: ResolverTypeWrapper<IGetChargesByIdsResult>;
   CommonError: ResolverTypeWrapper<CommonError>;
@@ -5228,7 +5248,7 @@ export type ResolversTypes = {
   Fund: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['Fund']>;
   GenerateMonthlyClientDocumentsResult: ResolverTypeWrapper<GenerateMonthlyClientDocumentsResult>;
   GeneratedLedgerRecords: ResolverTypeWrapper<ResolversUnionTypes<ResolversTypes>['GeneratedLedgerRecords']>;
-  GreenInvoiceClient: ResolverTypeWrapper<GreenInvoiceClient>;
+  GreenInvoiceClient: ResolverTypeWrapper<string>;
   GreenInvoiceClientInput: GreenInvoiceClientInput;
   GreenInvoiceCountry: GreenInvoiceCountry;
   GreenInvoiceDiscount: ResolverTypeWrapper<GreenInvoiceDiscount>;
@@ -5451,6 +5471,8 @@ export type ResolversParentTypes = {
   ChargesWithLedgerChangesResult: Omit<ChargesWithLedgerChangesResult, 'charge'> & { charge?: Maybe<ResolversParentTypes['Charge']> };
   Client: IGetAllClientsResult;
   ClientInsertInput: ClientInsertInput;
+  ClientIntegrations: IGetAllClientsResult;
+  ClientIntegrationsInput: ClientIntegrationsInput;
   ClientUpdateInput: ClientUpdateInput;
   CommonCharge: IGetChargesByIdsResult;
   CommonError: CommonError;
@@ -5508,7 +5530,7 @@ export type ResolversParentTypes = {
   Fund: ResolversInterfaceTypes<ResolversParentTypes>['Fund'];
   GenerateMonthlyClientDocumentsResult: GenerateMonthlyClientDocumentsResult;
   GeneratedLedgerRecords: ResolversUnionTypes<ResolversParentTypes>['GeneratedLedgerRecords'];
-  GreenInvoiceClient: GreenInvoiceClient;
+  GreenInvoiceClient: string;
   GreenInvoiceClientInput: GreenInvoiceClientInput;
   GreenInvoiceDiscount: GreenInvoiceDiscount;
   GreenInvoiceDiscountInput: GreenInvoiceDiscountInput;
@@ -6165,14 +6187,23 @@ export type ChargesWithLedgerChangesResultResolvers<ContextType = GraphQLModules
 export type ClientResolvers<ContextType = GraphQLModules.Context, ParentType extends ResolversParentTypes['Client'] = ResolversParentTypes['Client']> = {
   emails?: Resolver<ReadonlyArray<ResolversTypes['String']>, ParentType, ContextType>;
   generatedDocumentType?: Resolver<ResolversTypes['DocumentType'], ParentType, ContextType>;
-  greenInvoiceId?: Resolver<Maybe<ResolversTypes['UUID']>, ParentType, ContextType>;
-  greenInvoiceInfo?: Resolver<Maybe<ResolversTypes['GreenInvoiceClient']>, ParentType, ContextType>;
-  hiveId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['UUID'], ParentType, ContextType>;
+  integrations?: Resolver<ResolversTypes['ClientIntegrations'], ParentType, ContextType>;
   originalBusiness?: Resolver<ResolversTypes['LtdFinancialEntity'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type ClientIntegrationsResolvers<ContextType = GraphQLModules.Context, ParentType extends ResolversParentTypes['ClientIntegrations'] = ResolversParentTypes['ClientIntegrations']> = {
+  greenInvoiceInfo?: Resolver<Maybe<ResolversTypes['GreenInvoiceClient']>, ParentType, ContextType>;
+  hiveId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  linearId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  notionId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  slackChannelKey?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  workflowyUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type CommonChargeResolvers<ContextType = GraphQLModules.Context, ParentType extends ResolversParentTypes['CommonCharge'] = ResolversParentTypes['CommonCharge']> = {
   accountantApproval?: Resolver<ResolversTypes['AccountantStatus'], ParentType, ContextType>;
   additionalDocuments?: Resolver<ReadonlyArray<ResolversTypes['Document']>, ParentType, ContextType>;
@@ -8010,6 +8041,7 @@ export type Resolvers<ContextType = GraphQLModules.Context> = {
   ChargeSuggestions?: ChargeSuggestionsResolvers<ContextType>;
   ChargesWithLedgerChangesResult?: ChargesWithLedgerChangesResultResolvers<ContextType>;
   Client?: ClientResolvers<ContextType>;
+  ClientIntegrations?: ClientIntegrationsResolvers<ContextType>;
   CommonCharge?: CommonChargeResolvers<ContextType>;
   CommonError?: CommonErrorResolvers<ContextType>;
   CommonTransaction?: CommonTransactionResolvers<ContextType>;

package/src/modules/financial-entities/__generated__/clients.types.ts

@@ -1,6 +1,8 @@
 /** Types generated for queries found in "src/modules/financial-entities/providers/clients.provider.ts" */
 export type document_type = 'CREDIT_INVOICE' | 'INVOICE' | 'INVOICE_RECEIPT' | 'OTHER' | 'PROFORMA' | 'RECEIPT' | 'UNPROCESSED';
 
+export type Json = null | boolean | number | string | Json[] | { [key: string]: Json };
+
 export type stringArray = (string)[];
 
 /** 'GetAllClients' parameters type */
@@ -13,6 +15,7 @@ export interface IGetAllClientsResult {
   emails: stringArray | null;
   green_invoice_id: string;
   hive_id: string | null;
+  integrations: Json | null;
   remark: string | null;
 }
 
@@ -34,6 +37,7 @@ export interface IGetClientsByIdsResult {
   emails: stringArray | null;
   green_invoice_id: string;
   hive_id: string | null;
+  integrations: Json | null;
   remark: string | null;
 }
 
@@ -53,8 +57,10 @@ export interface IGetClientsByGreenInvoiceIdsResult {
   business_id: string;
   document_type: document_type;
   emails: stringArray | null;
+  green_invoice_business_id: string | null;
   green_invoice_id: string;
   hive_id: string | null;
+  integrations: Json | null;
   remark: string | null;
 }
 
@@ -68,8 +74,7 @@ export interface IGetClientsByGreenInvoiceIdsQuery {
 export interface IUpdateClientParams {
   businessId?: string | null | void;
   emails?: stringArray | null | void;
-  greenInvoiceId?: string | null | void;
-  hiveId?: string | null | void;
+  integrations?: Json | null | void;
   newBusinessId?: string | null | void;
 }
 
@@ -80,6 +85,7 @@ export interface IUpdateClientResult {
   emails: stringArray | null;
   green_invoice_id: string;
   hive_id: string | null;
+  integrations: Json | null;
   remark: string | null;
 }
 
@@ -109,8 +115,7 @@ export interface IDeleteClientQuery {
 export interface IInsertClientParams {
   businessId?: string | null | void;
   emails?: stringArray | null | void;
-  greenInvoiceId?: string | null | void;
-  hiveId?: string | null | void;
+  integrations?: Json | null | void;
 }
 
 /** 'InsertClient' return type */
@@ -120,6 +125,7 @@ export interface IInsertClientResult {
   emails: stringArray | null;
   green_invoice_id: string;
   hive_id: string | null;
+  integrations: Json | null;
   remark: string | null;
 }
 

package/src/modules/financial-entities/__generated__/types.ts

@@ -17,7 +17,8 @@ export namespace FinancialEntitiesModule {
     Suggestions: 'phrases' | 'tags' | 'description' | 'emails' | 'emailListener' | 'priority';
     SuggestionsEmailListenerConfig: 'internalEmailLinks' | 'emailBody' | 'attachments';
     PersonalFinancialEntity: 'id' | 'name' | 'email' | 'pcn874RecordType' | 'irsCode' | 'isActive' | 'createdAt' | 'updatedAt';
-    Client: 'id' | 'originalBusiness' | 'greenInvoiceId' | 'hiveId' | 'emails' | 'generatedDocumentType' | 'greenInvoiceInfo';
+    Client: 'id' | 'originalBusiness' | 'emails' | 'generatedDocumentType' | 'integrations';
+    ClientIntegrations: 'id' | 'hiveId' | 'linearId' | 'slackChannelKey' | 'notionId' | 'workflowyUrl';
     PaginatedFinancialEntities: 'nodes' | 'pageInfo';
     TaxCategory: 'id' | 'name' | 'irsCode' | 'createdAt' | 'updatedAt' | 'isActive';
     CommonCharge: 'owner' | 'counterparty' | 'taxCategory';
@@ -61,8 +62,9 @@ export namespace FinancialEntitiesModule {
     InsertNewBusinessInput: 'name' | 'sortCode' | 'country' | 'hebrewName' | 'address' | 'email' | 'website' | 'phoneNumber' | 'governmentId' | 'taxCategory' | 'exemptDealer' | 'suggestions' | 'optionalVAT' | 'isReceiptEnough' | 'isDocumentsOptional' | 'pcn874RecordType' | 'irsCode' | 'isActive';
     SuggestionsInput: 'phrases' | 'tags' | 'description' | 'emails' | 'emailListener' | 'priority';
     SuggestionsEmailListenerConfigInput: 'internalEmailLinks' | 'emailBody' | 'attachments';
-    ClientInsertInput: 'businessId' | 'greenInvoiceId' | 'hiveId' | 'emails' | 'generatedDocumentType';
-    ClientUpdateInput: 'greenInvoiceId' | 'hiveId' | 'emails' | 'generatedDocumentType' | 'newBusinessId';
+    ClientInsertInput: 'businessId' | 'emails' | 'generatedDocumentType' | 'integrations';
+    ClientUpdateInput: 'newBusinessId' | 'emails' | 'generatedDocumentType' | 'integrations';
+    ClientIntegrationsInput: 'greenInvoiceId' | 'hiveId' | 'linearId' | 'slackChannelKey' | 'notionId' | 'workflowyUrl';
     UpdateTaxCategoryInput: 'name' | 'sortCode' | 'irsCode' | 'isActive' | 'hashavshevetName' | 'taxExcluded';
     InsertTaxCategoryInput: 'name' | 'sortCode' | 'irsCode' | 'hashavshevetName' | 'taxExcluded' | 'isActive';
     UpdateChargeInput: 'counterpartyId' | 'ownerId';
@@ -126,7 +128,8 @@ export namespace FinancialEntitiesModule {
   export type ClientUpdateInput = Pick<Types.ClientUpdateInput, DefinedInputFields['ClientUpdateInput']>;
   export type ClientInsertInput = Pick<Types.ClientInsertInput, DefinedInputFields['ClientInsertInput']>;
   export type DocumentType = Types.DocumentType;
-  export type GreenInvoiceClient = Types.GreenInvoiceClient;
+  export type ClientIntegrations = Pick<Types.ClientIntegrations, DefinedFields['ClientIntegrations']>;
+  export type ClientIntegrationsInput = Pick<Types.ClientIntegrationsInput, DefinedInputFields['ClientIntegrationsInput']>;
   export type PaginatedFinancialEntities = Pick<Types.PaginatedFinancialEntities, DefinedFields['PaginatedFinancialEntities']>;
   export type UpdateChargeInput = Types.UpdateChargeInput;
   export type Transaction = Types.Transaction;
@@ -160,6 +163,7 @@ export namespace FinancialEntitiesModule {
   export type SuggestionsEmailListenerConfigResolvers = Pick<Types.SuggestionsEmailListenerConfigResolvers, DefinedFields['SuggestionsEmailListenerConfig']>;
   export type PersonalFinancialEntityResolvers = Pick<Types.PersonalFinancialEntityResolvers, DefinedFields['PersonalFinancialEntity'] | '__isTypeOf'>;
   export type ClientResolvers = Pick<Types.ClientResolvers, DefinedFields['Client'] | '__isTypeOf'>;
+  export type ClientIntegrationsResolvers = Pick<Types.ClientIntegrationsResolvers, DefinedFields['ClientIntegrations']>;
   export type PaginatedFinancialEntitiesResolvers = Pick<Types.PaginatedFinancialEntitiesResolvers, DefinedFields['PaginatedFinancialEntities']>;
   export type TaxCategoryResolvers = Pick<Types.TaxCategoryResolvers, DefinedFields['TaxCategory'] | '__isTypeOf'>;
   export type CommonChargeResolvers = Pick<Types.CommonChargeResolvers, DefinedFields['CommonCharge']>;
@@ -204,6 +208,7 @@ export namespace FinancialEntitiesModule {
     SuggestionsEmailListenerConfig?: SuggestionsEmailListenerConfigResolvers;
     PersonalFinancialEntity?: PersonalFinancialEntityResolvers;
     Client?: ClientResolvers;
+    ClientIntegrations?: ClientIntegrationsResolvers;
     PaginatedFinancialEntities?: PaginatedFinancialEntitiesResolvers;
     TaxCategory?: TaxCategoryResolvers;
     CommonCharge?: CommonChargeResolvers;
@@ -446,11 +451,18 @@ export namespace FinancialEntitiesModule {
       '*'?: gm.Middleware[];
       id?: gm.Middleware[];
       originalBusiness?: gm.Middleware[];
-      greenInvoiceId?: gm.Middleware[];
-      hiveId?: gm.Middleware[];
       emails?: gm.Middleware[];
       generatedDocumentType?: gm.Middleware[];
-      greenInvoiceInfo?: gm.Middleware[];
+      integrations?: gm.Middleware[];
+    };
+    ClientIntegrations?: {
+      '*'?: gm.Middleware[];
+      id?: gm.Middleware[];
+      hiveId?: gm.Middleware[];
+      linearId?: gm.Middleware[];
+      slackChannelKey?: gm.Middleware[];
+      notionId?: gm.Middleware[];
+      workflowyUrl?: gm.Middleware[];
     };
     PaginatedFinancialEntities?: {
       '*'?: gm.Middleware[];

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

@@ -0,0 +1,28 @@
+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}`);
+  }
+}

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}`,