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

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @accounter/server
 
-## 0.0.8-alpha-20251105183654-b3147b83bfda6ce62d09073ce81342ceadf5160c
+## 0.0.8-alpha-20251106080932-aeb05a6f60a5ad38f48a4149e31ae1c5482d7177
 
 ### Patch Changes
 
@@ -264,16 +264,6 @@
   - Updated dependency [`graphql@16.12.0` ↗︎](https://www.npmjs.com/package/graphql/v/16.12.0)
     (from `16.11.0`, in `dependencies`)
 
-- [#2655](https://github.com/Urigo/accounter-fullstack/pull/2655)
-  [`dd02669`](https://github.com/Urigo/accounter-fullstack/commit/dd02669a794e4debd032cd4a2c418795cba38563)
-  Thanks [@gilgardosh](https://github.com/gilgardosh)! - dependencies updates:
-  - Updated dependency
-    [`@graphql-yoga/plugin-defer-stream@3.16.1` ↗︎](https://www.npmjs.com/package/@graphql-yoga/plugin-defer-stream/v/3.16.1)
-    (from `3.16.0`, in `dependencies`)
-  - Updated dependency
-    [`graphql-yoga@5.16.1` ↗︎](https://www.npmjs.com/package/graphql-yoga/v/5.16.1) (from `5.16.0`,
-    in `dependencies`)
-
 - [#2662](https://github.com/Urigo/accounter-fullstack/pull/2662)
   [`fa15c75`](https://github.com/Urigo/accounter-fullstack/commit/fa15c754be3cf82893a3573b4ebe60776c96a296)
   Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
@@ -660,16 +650,6 @@
   `packages/server/src/modules/app-providers/green-invoice-client.ts`, the access patterns for these
   environment variables have been updated to use optional chaining (`?.`) to safely handle cases
   where the configuration might be `undefined`.
-
-- [#2655](https://github.com/Urigo/accounter-fullstack/pull/2655)
-  [`eee0a0e`](https://github.com/Urigo/accounter-fullstack/commit/eee0a0e586d6c5b49caa3a7ac308b8bd79f11b8a)
-  Thanks [@gilgardosh](https://github.com/gilgardosh)! - - Introduced a new `ClientIntegrations`
-  GraphQL type with a JSONB-backed structure
-  - Migrated `green_invoice_id` and `hive_id` columns to a unified `integrations` JSONB field
-  - Added validation helper using Zod schema for client integrations
-  - Updated GraphQL resolvers to use the new structure, with `GreenInvoiceClient` now resolving as a
-    string ID
-  - Activate integrations section in the client management UI to reflect backend changes
 - Updated dependencies
   [[`1ae19c6`](https://github.com/Urigo/accounter-fullstack/commit/1ae19c6f8dabd995120862795284dab6e363dc79),
   [`7fef068`](https://github.com/Urigo/accounter-fullstack/commit/7fef0682c7316153ae5ffde42f97ce7284dd4c9a),
@@ -678,10 +658,10 @@
   [`65e3c7f`](https://github.com/Urigo/accounter-fullstack/commit/65e3c7f01993eb4f41244a40feefefa08b31a4e6),
   [`7a898a0`](https://github.com/Urigo/accounter-fullstack/commit/7a898a0ff1ee15420ab2532370a1d2f618cc86ab),
   [`15ed6f9`](https://github.com/Urigo/accounter-fullstack/commit/15ed6f982a5d288a1159ccd069fca14b35801a18)]:
-  - @accounter/green-invoice-graphql@0.8.2-alpha-20251105183654-b3147b83bfda6ce62d09073ce81342ceadf5160c
-  - @accounter/pcn874-generator@0.6.3-alpha-20251105183654-b3147b83bfda6ce62d09073ce81342ceadf5160c
-  - @accounter/shaam-uniform-format-generator@0.2.2-alpha-20251105183654-b3147b83bfda6ce62d09073ce81342ceadf5160c
-  - @accounter/shaam6111-generator@0.1.4-alpha-20251105183654-b3147b83bfda6ce62d09073ce81342ceadf5160c
+  - @accounter/green-invoice-graphql@0.8.2-alpha-20251106080932-aeb05a6f60a5ad38f48a4149e31ae1c5482d7177
+  - @accounter/pcn874-generator@0.6.3-alpha-20251106080932-aeb05a6f60a5ad38f48a4149e31ae1c5482d7177
+  - @accounter/shaam-uniform-format-generator@0.2.2-alpha-20251106080932-aeb05a6f60a5ad38f48a4149e31ae1c5482d7177
+  - @accounter/shaam6111-generator@0.1.4-alpha-20251106080932-aeb05a6f60a5ad38f48a4149e31ae1c5482d7177
 
 ## 0.0.7
 

package/dist/server/src/__generated__/types.d.ts

@@ -916,8 +916,10 @@ 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;
 };
 /**  fields for inserting a new client  */
@@ -925,33 +927,15 @@ 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 integrations?: InputMaybe<ClientIntegrationsInput>;
+    readonly greenInvoiceId?: InputMaybe<Scalars['UUID']['input']>;
+    readonly hiveId?: InputMaybe<Scalars['String']['input']>;
     readonly newBusinessId?: InputMaybe<Scalars['UUID']['input']>;
 };
 /**  common charge  */
@@ -4273,8 +4257,6 @@ export type ResolversTypes = {
     }>;
     Client: ResolverTypeWrapper<IGetAllClientsResult>;
     ClientInsertInput: ClientInsertInput;
-    ClientIntegrations: ResolverTypeWrapper<IGetAllClientsResult>;
-    ClientIntegrationsInput: ClientIntegrationsInput;
     ClientUpdateInput: ClientUpdateInput;
     CommonCharge: ResolverTypeWrapper<IGetChargesByIdsResult>;
     CommonError: ResolverTypeWrapper<CommonError>;
@@ -4347,7 +4329,7 @@ export type ResolversTypes = {
     Fund: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['Fund']>;
     GenerateMonthlyClientDocumentsResult: ResolverTypeWrapper<GenerateMonthlyClientDocumentsResult>;
     GeneratedLedgerRecords: ResolverTypeWrapper<ResolversUnionTypes<ResolversTypes>['GeneratedLedgerRecords']>;
-    GreenInvoiceClient: ResolverTypeWrapper<string>;
+    GreenInvoiceClient: ResolverTypeWrapper<GreenInvoiceClient>;
     GreenInvoiceClientInput: GreenInvoiceClientInput;
     GreenInvoiceCountry: GreenInvoiceCountry;
     GreenInvoiceDiscount: ResolverTypeWrapper<GreenInvoiceDiscount>;
@@ -4646,8 +4628,6 @@ export type ResolversParentTypes = {
     };
     Client: IGetAllClientsResult;
     ClientInsertInput: ClientInsertInput;
-    ClientIntegrations: IGetAllClientsResult;
-    ClientIntegrationsInput: ClientIntegrationsInput;
     ClientUpdateInput: ClientUpdateInput;
     CommonCharge: IGetChargesByIdsResult;
     CommonError: CommonError;
@@ -4711,7 +4691,7 @@ export type ResolversParentTypes = {
     Fund: ResolversInterfaceTypes<ResolversParentTypes>['Fund'];
     GenerateMonthlyClientDocumentsResult: GenerateMonthlyClientDocumentsResult;
     GeneratedLedgerRecords: ResolversUnionTypes<ResolversParentTypes>['GeneratedLedgerRecords'];
-    GreenInvoiceClient: string;
+    GreenInvoiceClient: GreenInvoiceClient;
     GreenInvoiceClientInput: GreenInvoiceClientInput;
     GreenInvoiceDiscount: GreenInvoiceDiscount;
     GreenInvoiceDiscountInput: GreenInvoiceDiscountInput;
@@ -5388,19 +5368,11 @@ 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>;
-    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']> = {
+    greenInvoiceId?: Resolver<Maybe<ResolversTypes['UUID']>, ParentType, ContextType>;
     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>;
+    id?: Resolver<ResolversTypes['UUID'], ParentType, ContextType>;
+    originalBusiness?: Resolver<ResolversTypes['LtdFinancialEntity'], ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 export type CommonChargeResolvers<ContextType = GraphQLModules.Context, ParentType extends ResolversParentTypes['CommonCharge'] = ResolversParentTypes['CommonCharge']> = {
@@ -7117,7 +7089,6 @@ 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/dist/server/src/__generated__/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/__generated__/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAu5BrD,OAAO,EAAE,iBAAiB,EAAE,CAAC;AA2Y7B,OAAO,EAAE,QAAQ,EAAE,CAAC;AAuLpB,OAAO,EAAE,YAAY,EAAE,CAAC;AAomCxB,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAw6D7B,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/__generated__/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAu5BrD,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAyX7B,OAAO,EAAE,QAAQ,EAAE,CAAC;AAuLpB,OAAO,EAAE,YAAY,EAAE,CAAC;AAomCxB,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAw6D7B,OAAO,EAAE,oBAAoB,EAAE,CAAC"}

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

@@ -1,8 +1,5 @@
 /** 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 */
 export type IGetAllClientsParams = void;
@@ -13,7 +10,6 @@ export interface IGetAllClientsResult {
     emails: stringArray | null;
     green_invoice_id: string;
     hive_id: string | null;
-    integrations: Json | null;
     remark: string | null;
 }
 /** 'GetAllClients' query type */
@@ -32,7 +28,6 @@ export interface IGetClientsByIdsResult {
     emails: stringArray | null;
     green_invoice_id: string;
     hive_id: string | null;
-    integrations: Json | null;
     remark: string | null;
 }
 /** 'GetClientsByIds' query type */
@@ -49,10 +44,8 @@ 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;
 }
 /** 'GetClientsByGreenInvoiceIds' query type */
@@ -64,7 +57,8 @@ export interface IGetClientsByGreenInvoiceIdsQuery {
 export interface IUpdateClientParams {
     businessId?: string | null | void;
     emails?: stringArray | null | void;
-    integrations?: Json | null | void;
+    greenInvoiceId?: string | null | void;
+    hiveId?: string | null | void;
     newBusinessId?: string | null | void;
 }
 /** 'UpdateClient' return type */
@@ -74,7 +68,6 @@ export interface IUpdateClientResult {
     emails: stringArray | null;
     green_invoice_id: string;
     hive_id: string | null;
-    integrations: Json | null;
     remark: string | null;
 }
 /** 'UpdateClient' query type */
@@ -99,7 +92,8 @@ export interface IDeleteClientQuery {
 export interface IInsertClientParams {
     businessId?: string | null | void;
     emails?: stringArray | null | void;
-    integrations?: Json | null | void;
+    greenInvoiceId?: string | null | void;
+    hiveId?: string | null | void;
 }
 /** 'InsertClient' return type */
 export interface IInsertClientResult {
@@ -108,7 +102,6 @@ export interface IInsertClientResult {
     emails: stringArray | null;
     green_invoice_id: string;
     hive_id: string | null;
-    integrations: Json | null;
     remark: string | null;
 }
 /** 'InsertClient' query type */

package/dist/server/src/modules/financial-entities/__generated__/types.d.ts

@@ -17,8 +17,7 @@ export declare 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' | 'emails' | 'generatedDocumentType' | 'integrations';
-        ClientIntegrations: 'id' | 'hiveId' | 'linearId' | 'slackChannelKey' | 'notionId' | 'workflowyUrl';
+        Client: 'id' | 'originalBusiness' | 'greenInvoiceId' | 'hiveId' | 'emails' | 'generatedDocumentType' | 'greenInvoiceInfo';
         PaginatedFinancialEntities: 'nodes' | 'pageInfo';
         TaxCategory: 'id' | 'name' | 'irsCode' | 'createdAt' | 'updatedAt' | 'isActive';
         CommonCharge: 'owner' | 'counterparty' | 'taxCategory';
@@ -60,9 +59,8 @@ export declare 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' | 'emails' | 'generatedDocumentType' | 'integrations';
-        ClientUpdateInput: 'newBusinessId' | 'emails' | 'generatedDocumentType' | 'integrations';
-        ClientIntegrationsInput: 'greenInvoiceId' | 'hiveId' | 'linearId' | 'slackChannelKey' | 'notionId' | 'workflowyUrl';
+        ClientInsertInput: 'businessId' | 'greenInvoiceId' | 'hiveId' | 'emails' | 'generatedDocumentType';
+        ClientUpdateInput: 'greenInvoiceId' | 'hiveId' | 'emails' | 'generatedDocumentType' | 'newBusinessId';
         UpdateTaxCategoryInput: 'name' | 'sortCode' | 'irsCode' | 'isActive' | 'hashavshevetName' | 'taxExcluded';
         InsertTaxCategoryInput: 'name' | 'sortCode' | 'irsCode' | 'hashavshevetName' | 'taxExcluded' | 'isActive';
         UpdateChargeInput: 'counterpartyId' | 'ownerId';
@@ -125,8 +123,7 @@ export declare 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 ClientIntegrations = Pick<Types.ClientIntegrations, DefinedFields['ClientIntegrations']>;
-    export type ClientIntegrationsInput = Pick<Types.ClientIntegrationsInput, DefinedInputFields['ClientIntegrationsInput']>;
+    export type GreenInvoiceClient = Types.GreenInvoiceClient;
     export type PaginatedFinancialEntities = Pick<Types.PaginatedFinancialEntities, DefinedFields['PaginatedFinancialEntities']>;
     export type UpdateChargeInput = Types.UpdateChargeInput;
     export type Transaction = Types.Transaction;
@@ -159,7 +156,6 @@ export declare 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']>;
@@ -203,7 +199,6 @@ export declare namespace FinancialEntitiesModule {
         SuggestionsEmailListenerConfig?: SuggestionsEmailListenerConfigResolvers;
         PersonalFinancialEntity?: PersonalFinancialEntityResolvers;
         Client?: ClientResolvers;
-        ClientIntegrations?: ClientIntegrationsResolvers;
         PaginatedFinancialEntities?: PaginatedFinancialEntitiesResolvers;
         TaxCategory?: TaxCategoryResolvers;
         CommonCharge?: CommonChargeResolvers;
@@ -445,18 +440,11 @@ export declare namespace FinancialEntitiesModule {
             '*'?: gm.Middleware[];
             id?: gm.Middleware[];
             originalBusiness?: gm.Middleware[];
+            greenInvoiceId?: gm.Middleware[];
+            hiveId?: gm.Middleware[];
             emails?: gm.Middleware[];
             generatedDocumentType?: 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[];
+            greenInvoiceInfo?: gm.Middleware[];
         };
         PaginatedFinancialEntities?: {
             '*'?: gm.Middleware[];

package/dist/server/src/modules/financial-entities/__generated__/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/__generated__/types.ts"],"names":[],"mappings":"AAEA,MAAM,KAAW,uBAAuB,CAugBvC;AAvgBD,WAAiB,uBAAuB;IA6CrC,CAAC;IAKD,CAAC;IAkBD,CAAC;IAkKD,CAAC;IAgSD,CAAC;AACJ,CAAC,EAvgBgB,uBAAuB,KAAvB,uBAAuB,QAugBvC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/__generated__/types.ts"],"names":[],"mappings":"AAEA,MAAM,KAAW,uBAAuB,CA2fvC;AA3fD,WAAiB,uBAAuB;IA4CrC,CAAC;IAKD,CAAC;IAiBD,CAAC;IA+JD,CAAC;IAyRD,CAAC;AACJ,CAAC,EA3fgB,uBAAuB,KAAvB,uBAAuB,QA2fvC"}

package/dist/server/src/modules/financial-entities/providers/businesses.provider.js

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

package/dist/server/src/modules/financial-entities/providers/clients.provider.js

@@ -4,7 +4,6 @@ import { Injectable, Scope } from 'graphql-modules';
 import { DBProvider } from '../../app-providers/db.provider.js';
 import { sql } from '@pgtyped/runtime';
 import { getCacheInstance } from '../../../shared/helpers/index.js';
-import { validateClientIntegrations } from '../helpers/clients.helper.js';
 const getAllClients = sql `
   SELECT *
   FROM accounter_schema.clients;
@@ -15,13 +14,23 @@ const getClientsByIds = sql `
   WHERE business_id IN $$businessIds;
 `;
 const getClientsByGreenInvoiceIds = sql `
-  SELECT *, (integrations->>'greenInvoiceId')::uuid as green_invoice_business_id
+  SELECT *
   FROM accounter_schema.clients
-  WHERE (integrations->>'greenInvoiceId')::uuid in $$greenInvoiceBusinessIds;
+  WHERE green_invoice_id IN $$greenInvoiceBusinessIds;
 `;
 const updateClient = sql `
   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,
@@ -31,11 +40,6 @@ const updateClient = sql `
     $newBusinessId,
     business_id,
     NULL
-  ),
-  integrations = COALESCE(
-    $integrations,
-    integrations,
-    NULL
   )
   WHERE
     business_id = $businessId
@@ -47,8 +51,8 @@ const deleteClient = sql `
   RETURNING business_id;
 `;
 const insertClient = sql `
-    INSERT INTO accounter_schema.clients (business_id, emails, integrations)
-    VALUES ($businessId, $emails, $integrations)
+    INSERT INTO accounter_schema.clients (business_id, green_invoice_id, hive_id, emails)
+    VALUES ($businessId, $greenInvoiceId, $hiveId, $emails)
     RETURNING *;`;
 let ClientsProvider = class ClientsProvider {
     dbProvider;
@@ -67,13 +71,7 @@ let ClientsProvider = class ClientsProvider {
             this.cache.set('all-clients', data);
             data.map(client => {
                 this.cache.set(`client-id-${client.business_id}`, client);
-                try {
-                    const { greenInvoiceId } = validateClientIntegrations(client.integrations ?? {});
-                    this.cache.set(`client-green-invoice-id-${greenInvoiceId}`, client);
-                }
-                catch {
-                    // swallow errors
-                }
+                this.cache.set(`client-green-invoice-id-${client.green_invoice_id}`, client);
             });
             return data;
         });
@@ -95,7 +93,7 @@ let ClientsProvider = class ClientsProvider {
     async batchClientsByGreenInvoiceIds(greenInvoiceIds) {
         try {
             const matches = await getClientsByGreenInvoiceIds.run({ greenInvoiceBusinessIds: greenInvoiceIds }, this.dbProvider);
-            return greenInvoiceIds.map(id => matches.find(match => match.green_invoice_business_id === id));
+            return greenInvoiceIds.map(id => matches.find(match => match.green_invoice_id === id));
         }
         catch (e) {
             console.error(e);

package/dist/server/src/modules/financial-entities/providers/clients.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"clients.provider.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/providers/clients.provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clients.provider.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/providers/clients.provider.ts"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,7 @@
 import { GraphQLError } from 'graphql';
+import { GreenInvoiceClientProvider } from '../../app-providers/green-invoice-client.js';
 import { BusinessesProvider } from '../../financial-entities/providers/businesses.provider.js';
 import { addGreenInvoiceClient, updateGreenInvoiceClient, } from '../../green-invoice/helpers/green-invoice-clients.helper.js';
-import { validateClientIntegrations } from '../helpers/clients.helper.js';
 import { ClientsProvider } from '../providers/clients.provider.js';
 export const clientsResolvers = {
     Query: {
@@ -33,25 +33,12 @@ export const clientsResolvers = {
     },
     Mutation: {
         updateClient: async (_, { businessId, fields }, { injector }) => {
-            let updatedIntegrations = 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 = {
                 businessId,
                 emails: fields.emails ? [...fields.emails] : undefined,
+                greenInvoiceId: fields.greenInvoiceId,
+                hiveId: fields.hiveId,
                 newBusinessId: fields.newBusinessId,
-                integrations: updatedIntegrations,
             };
             try {
                 const [updatedClient] = await injector
@@ -81,7 +68,8 @@ export const clientsResolvers = {
                 const newClient = {
                     businessId: fields.businessId,
                     emails: fields.emails ? [...fields.emails] : [],
-                    integrations: fields.integrations,
+                    greenInvoiceId: fields.greenInvoiceId,
+                    hiveId: fields.hiveId,
                 };
                 const [insertClient] = await injector.get(ClientsProvider).insertClient(newClient);
                 if (!insertClient) {
@@ -111,16 +99,26 @@ export const clientsResolvers = {
             }
             return businessMatch;
         },
+        greenInvoiceId: business => business.green_invoice_id,
+        hiveId: business => business.hive_id,
         emails: business => business.emails ?? [],
-        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,
+        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) : [];
+            return {
+                ...client,
+                emails,
+                id: business.green_invoice_id,
+            };
+        },
     },
     LtdFinancialEntity: {
         clientInfo: async (business, _, { injector }) => {

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

@@ -1 +1 @@
-{"version":3,"file":"clients.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/resolvers/clients.resolvers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clients.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/resolvers/clients.resolvers.ts"],"names":[],"mappings":"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"}

package/dist/server/src/modules/financial-entities/typeDefs/clients.graphql.js

@@ -15,45 +15,29 @@ export default gql `
   type Client {
     id: UUID!
     originalBusiness: LtdFinancialEntity!
+    greenInvoiceId: UUID
+    hiveId: String
     emails: [String!]!
     generatedDocumentType: DocumentType!
-    integrations: ClientIntegrations!
-  }
-
-  " integrations associated with a client "
-  type ClientIntegrations {
-    id: ID!
-    hiveId: String
-    linearId: String
-    slackChannelKey: String
-    notionId: String
-    workflowyUrl: String
+    greenInvoiceInfo: GreenInvoiceClient
   }
 
   " 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 {
-    newBusinessId: UUID
-    emails: [String!]
-    generatedDocumentType: DocumentType
-    integrations: ClientIntegrationsInput
-  }
-
-  " integrations input for client insert/update "
-  input ClientIntegrationsInput {
     greenInvoiceId: UUID
     hiveId: String
-    linearId: String
-    slackChannelKey: String
-    notionId: String
-    workflowyUrl: String
+    emails: [String!]
+    generatedDocumentType: DocumentType
+    newBusinessId: UUID
   }
 
   " result type for updateClient "

package/dist/server/src/modules/financial-entities/typeDefs/clients.graphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"clients.graphql.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/typeDefs/clients.graphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,eAAe,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+DjB,CAAC"}
+{"version":3,"file":"clients.graphql.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/typeDefs/clients.graphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,eAAe,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+CjB,CAAC"}