@accounter/server 0.0.8-alpha-20251030162201-d2f279aafe537912ec3546af855cbd3a38ac0f5c → 0.0.8-alpha-20251030164843-d2f490daba879840366288d1f62974ab25081876

package/src/modules/contracts/resolvers/contracts.resolver.ts

@@ -29,6 +29,30 @@ export const contractsResolvers: ContractsModule.Resolvers = {
         throw new GraphQLError(message);
       }
     },
+    contractsByAdmin: async (_, { adminId }, { injector }) => {
+      try {
+        return injector.get(ContractsProvider).getContractsByAdminBusinessIdLoader.load(adminId);
+      } catch (e) {
+        const message = 'Error fetching contracts by admin';
+        console.error(message, e);
+        throw new GraphQLError(message);
+      }
+    },
+    contractsById: async (_, { id }, { injector }) => {
+      try {
+        return injector
+          .get(ContractsProvider)
+          .getContractsByIdLoader.load(id)
+          .then(res => {
+            if (!res) throw new GraphQLError('Contract not found');
+            return res;
+          });
+      } catch (e) {
+        const message = 'Error fetching contracts by id';
+        console.error(message, e);
+        throw new GraphQLError(message);
+      }
+    },
   },
   Mutation: {
     createContract: async (_, { input }, { injector }) => {

package/src/modules/contracts/typeDefs/contracts.graphql.ts

@@ -4,6 +4,8 @@ export default gql`
   extend type Query {
     allOpenContracts: [Contract!]! @auth(role: ACCOUNTANT)
     contractsByClient(clientId: UUID!): [Contract!]! @auth(role: ACCOUNTANT)
+    contractsByAdmin(adminId: UUID!): [Contract!]! @auth(role: ACCOUNTANT)
+    contractsById(id: UUID!): Contract! @auth(role: ACCOUNTANT)
   }
 
   extend type Mutation {

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

@@ -1,9 +1,4 @@
 /** Types generated for queries found in "src/modules/financial-entities/providers/admin-businesses.provider.ts" */
-export type DateOrString = Date | string;
-
-export type Json = null | boolean | number | string | Json[] | { [key: string]: Json };
-
-export type JsonArray = (Json)[];
 
 /** 'GetAdminBusinessesByIds' parameters type */
 export interface IGetAdminBusinessesByIdsParams {
@@ -13,9 +8,6 @@ export interface IGetAdminBusinessesByIdsParams {
 /** 'GetAdminBusinessesByIds' return type */
 export interface IGetAdminBusinessesByIdsResult {
   advance_tax_rate: number | null;
-  advance_tax_rates: JsonArray;
-  business_registration_start_date: Date | null;
-  company_tax_id: string | null;
   id: string;
   name: string;
   nikuim: string | null;
@@ -23,8 +15,6 @@ export interface IGetAdminBusinessesByIdsResult {
   pinkas_social_security_2021: string | null;
   pinkas_social_security_2022: string | null;
   registration_date: Date | null;
-  social_security_employer_ids: JsonArray;
-  tax_advances_ids: JsonArray;
   tax_nikuim_pinkas_number: string | null;
   tax_pinkas_number_2020: string | null;
   tax_siduri_number_2021: string | null;
@@ -33,7 +23,6 @@ export interface IGetAdminBusinessesByIdsResult {
   vat_number: string | null;
   vat_report_cadence: number | null;
   website_login_screenshot: string | null;
-  withholding_tax_annual_ids: JsonArray;
   wizcloud_company_id: string | null;
   wizcloud_token: string | null;
 }
@@ -50,9 +39,6 @@ export type IGetAllAdminBusinessesParams = void;
 /** 'GetAllAdminBusinesses' return type */
 export interface IGetAllAdminBusinessesResult {
   advance_tax_rate: number | null;
-  advance_tax_rates: JsonArray;
-  business_registration_start_date: Date | null;
-  company_tax_id: string | null;
   id: string;
   name: string;
   nikuim: string | null;
@@ -60,8 +46,6 @@ export interface IGetAllAdminBusinessesResult {
   pinkas_social_security_2021: string | null;
   pinkas_social_security_2022: string | null;
   registration_date: Date | null;
-  social_security_employer_ids: JsonArray;
-  tax_advances_ids: JsonArray;
   tax_nikuim_pinkas_number: string | null;
   tax_pinkas_number_2020: string | null;
   tax_siduri_number_2021: string | null;
@@ -70,7 +54,6 @@ export interface IGetAllAdminBusinessesResult {
   vat_number: string | null;
   vat_report_cadence: number | null;
   website_login_screenshot: string | null;
-  withholding_tax_annual_ids: JsonArray;
   wizcloud_company_id: string | null;
   wizcloud_token: string | null;
 }
@@ -81,46 +64,3 @@ export interface IGetAllAdminBusinessesQuery {
   result: IGetAllAdminBusinessesResult;
 }
 
-/** 'UpdateAdminBusinesses' parameters type */
-export interface IUpdateAdminBusinessesParams {
-  advanceTaxRates?: JsonArray | null | void;
-  businessRegistrationStartDate?: DateOrString | null | void;
-  companyTaxId?: string | null | void;
-  id?: string | null | void;
-  socialSecurityEmployerIds?: JsonArray | null | void;
-  taxAdvancesIds?: JsonArray | null | void;
-  withholdingTaxAnnualIds?: JsonArray | null | void;
-}
-
-/** 'UpdateAdminBusinesses' return type */
-export interface IUpdateAdminBusinessesResult {
-  advance_tax_rate: number | null;
-  advance_tax_rates: JsonArray;
-  business_registration_start_date: Date | null;
-  company_tax_id: string | null;
-  id: string;
-  nikuim: string | null;
-  password: string | null;
-  pinkas_social_security_2021: string | null;
-  pinkas_social_security_2022: string | null;
-  registration_date: Date | null;
-  social_security_employer_ids: JsonArray;
-  tax_advances_ids: JsonArray;
-  tax_nikuim_pinkas_number: string | null;
-  tax_pinkas_number_2020: string | null;
-  tax_siduri_number_2021: string | null;
-  tax_siduri_number_2022: string | null;
-  username_vat_website: string | null;
-  vat_report_cadence: number | null;
-  website_login_screenshot: string | null;
-  withholding_tax_annual_ids: JsonArray;
-  wizcloud_company_id: string | null;
-  wizcloud_token: string | null;
-}
-
-/** 'UpdateAdminBusinesses' query type */
-export interface IUpdateAdminBusinessesQuery {
-  params: IUpdateAdminBusinessesParams;
-  result: IUpdateAdminBusinessesResult;
-}
-

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

@@ -4,9 +4,7 @@ export namespace FinancialEntitiesModule {
   interface DefinedFields {
     Query: 'adminBusiness' | 'allAdminBusinesses' | 'businessTransactionsSumFromLedgerRecords' | 'businessTransactionsFromLedgerRecords' | 'business' | 'businesses' | 'allBusinesses' | 'client' | 'allClients' | 'financialEntity' | 'allFinancialEntities' | 'taxCategories' | 'taxCategory' | 'taxCategoryByBusinessId';
     Mutation: 'createAdminBusiness' | 'updateAdminBusiness' | 'deleteAdminBusiness' | 'updateBusiness' | 'insertNewBusiness' | 'mergeBusinesses' | 'batchGenerateBusinessesOutOfTransactions' | 'updateClient' | 'insertClient' | 'updateTaxCategory' | 'insertTaxCategory';
-    AdminBusiness: 'id' | 'name' | 'governmentId' | 'registrationDate' | 'business' | 'taxAdvancesAnnualIds' | 'taxAdvancesRates' | 'withholdingTaxCompanyId' | 'withholdingTaxAnnualIds' | 'socialSecurityDeductionsId' | 'socialSecurityEmployerIds';
-    AnnualId: 'year' | 'id';
-    TaxAdvancesRate: 'date' | 'rate';
+    AdminBusiness: 'id' | 'name' | 'governmentId' | 'business' | 'withholdingTaxBookNumber' | 'withholdingTaxFileNumber' | 'socialSecurityEmployerId' | 'taxAdvancesRate' | 'taxAdvancesId' | 'registrationDate';
     BusinessTransactionsSumFromLedgerRecordsSuccessfulResult: 'businessTransactionsSum';
     BusinessTransactionSum: 'business' | 'credit' | 'debit' | 'total' | 'foreignCurrenciesSum';
     ForeignCurrencySum: 'credit' | 'debit' | 'total' | 'currency';
@@ -52,10 +50,8 @@ export namespace FinancialEntitiesModule {
   };
   
   interface DefinedInputFields {
-    CreateAdminBusinessInput: 'businessId' | 'registrationDate' | 'companyTaxId' | 'taxAdvancesAnnualId' | 'taxAdvancesRate' | 'withholdingTaxAnnualId' | 'socialSecurityEmployerId';
-    UpdateAdminBusinessInput: 'name' | 'governmentId' | 'registrationDate' | 'taxAdvancesAnnualIds' | 'taxAdvancesRates' | 'withholdingTaxCompanyId' | 'withholdingTaxAnnualIds' | 'socialSecurityEmployerIds';
-    AnnualIdInput: 'year' | 'id';
-    TaxAdvancesRateInput: 'date' | 'rate';
+    CreateAdminBusinessInput: 'businessId' | 'withholdingTaxBookNumber' | 'withholdingTaxFileNumber' | 'socialSecurityEmployerId' | 'taxAdvancesRate' | 'taxAdvancesId' | 'registrationDate';
+    UpdateAdminBusinessInput: 'withholdingTaxBookNumber' | 'withholdingTaxFileNumber' | 'socialSecurityEmployerId' | 'taxAdvancesRate' | 'taxAdvancesId' | 'registrationDate';
     BusinessTransactionsFilter: 'businessIDs' | 'ownerIds' | 'type' | 'fromDate' | 'toDate' | 'includeRevaluation';
     UpdateBusinessInput: 'name' | 'sortCode' | 'country' | 'hebrewName' | 'address' | 'email' | 'website' | 'phoneNumber' | 'governmentId' | 'taxCategory' | 'exemptDealer' | 'suggestions' | 'optionalVAT' | 'isReceiptEnough' | 'isDocumentsOptional' | 'pcn874RecordType' | 'irsCode' | 'isActive';
     InsertNewBusinessInput: 'name' | 'sortCode' | 'country' | 'hebrewName' | 'address' | 'email' | 'website' | 'phoneNumber' | 'governmentId' | 'taxCategory' | 'exemptDealer' | 'suggestions' | 'optionalVAT' | 'isReceiptEnough' | 'isDocumentsOptional' | 'pcn874RecordType' | 'irsCode' | 'isActive';
@@ -74,12 +70,8 @@ export namespace FinancialEntitiesModule {
   export type Mutation = Pick<Types.Mutation, DefinedFields['Mutation']>;
   export type CreateAdminBusinessInput = Pick<Types.CreateAdminBusinessInput, DefinedInputFields['CreateAdminBusinessInput']>;
   export type UpdateAdminBusinessInput = Pick<Types.UpdateAdminBusinessInput, DefinedInputFields['UpdateAdminBusinessInput']>;
-  export type TimelessDate = Types.TimelessDate;
   export type LtdFinancialEntity = Pick<Types.LtdFinancialEntity, DefinedFields['LtdFinancialEntity']>;
-  export type AnnualId = Pick<Types.AnnualId, DefinedFields['AnnualId']>;
-  export type TaxAdvancesRate = Pick<Types.TaxAdvancesRate, DefinedFields['TaxAdvancesRate']>;
-  export type AnnualIdInput = Pick<Types.AnnualIdInput, DefinedInputFields['AnnualIdInput']>;
-  export type TaxAdvancesRateInput = Pick<Types.TaxAdvancesRateInput, DefinedInputFields['TaxAdvancesRateInput']>;
+  export type TimelessDate = Types.TimelessDate;
   export type BusinessTransactionsSumFromLedgerRecordsResult = Types.BusinessTransactionsSumFromLedgerRecordsResult;
   export type BusinessTransactionsFilter = Pick<Types.BusinessTransactionsFilter, DefinedInputFields['BusinessTransactionsFilter']>;
   export type BusinessTransactionsFromLedgerRecordsResult = Types.BusinessTransactionsFromLedgerRecordsResult;
@@ -147,8 +139,6 @@ export namespace FinancialEntitiesModule {
   export type QueryResolvers = Pick<Types.QueryResolvers, DefinedFields['Query']>;
   export type MutationResolvers = Pick<Types.MutationResolvers, DefinedFields['Mutation']>;
   export type AdminBusinessResolvers = Pick<Types.AdminBusinessResolvers, DefinedFields['AdminBusiness']>;
-  export type AnnualIdResolvers = Pick<Types.AnnualIdResolvers, DefinedFields['AnnualId']>;
-  export type TaxAdvancesRateResolvers = Pick<Types.TaxAdvancesRateResolvers, DefinedFields['TaxAdvancesRate']>;
   export type BusinessTransactionsSumFromLedgerRecordsSuccessfulResultResolvers = Pick<Types.BusinessTransactionsSumFromLedgerRecordsSuccessfulResultResolvers, DefinedFields['BusinessTransactionsSumFromLedgerRecordsSuccessfulResult'] | '__isTypeOf'>;
   export type BusinessTransactionSumResolvers = Pick<Types.BusinessTransactionSumResolvers, DefinedFields['BusinessTransactionSum']>;
   export type ForeignCurrencySumResolvers = Pick<Types.ForeignCurrencySumResolvers, DefinedFields['ForeignCurrencySum']>;
@@ -191,8 +181,6 @@ export namespace FinancialEntitiesModule {
     Query?: QueryResolvers;
     Mutation?: MutationResolvers;
     AdminBusiness?: AdminBusinessResolvers;
-    AnnualId?: AnnualIdResolvers;
-    TaxAdvancesRate?: TaxAdvancesRateResolvers;
     BusinessTransactionsSumFromLedgerRecordsSuccessfulResult?: BusinessTransactionsSumFromLedgerRecordsSuccessfulResultResolvers;
     BusinessTransactionSum?: BusinessTransactionSumResolvers;
     ForeignCurrencySum?: ForeignCurrencySumResolvers;
@@ -267,24 +255,13 @@ export namespace FinancialEntitiesModule {
       id?: gm.Middleware[];
       name?: gm.Middleware[];
       governmentId?: gm.Middleware[];
-      registrationDate?: gm.Middleware[];
       business?: gm.Middleware[];
-      taxAdvancesAnnualIds?: gm.Middleware[];
-      taxAdvancesRates?: gm.Middleware[];
-      withholdingTaxCompanyId?: gm.Middleware[];
-      withholdingTaxAnnualIds?: gm.Middleware[];
-      socialSecurityDeductionsId?: gm.Middleware[];
-      socialSecurityEmployerIds?: gm.Middleware[];
-    };
-    AnnualId?: {
-      '*'?: gm.Middleware[];
-      year?: gm.Middleware[];
-      id?: gm.Middleware[];
-    };
-    TaxAdvancesRate?: {
-      '*'?: gm.Middleware[];
-      date?: gm.Middleware[];
-      rate?: gm.Middleware[];
+      withholdingTaxBookNumber?: gm.Middleware[];
+      withholdingTaxFileNumber?: gm.Middleware[];
+      socialSecurityEmployerId?: gm.Middleware[];
+      taxAdvancesRate?: gm.Middleware[];
+      taxAdvancesId?: gm.Middleware[];
+      registrationDate?: gm.Middleware[];
     };
     LtdFinancialEntity?: {
       '*'?: gm.Middleware[];

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

@@ -3,14 +3,10 @@ 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 { adminBusinessUpdateSchema } from '../helpers/admin-businesses.helper.js';
 import type {
   IGetAdminBusinessesByIdsQuery,
   IGetAllAdminBusinessesQuery,
   IGetAllAdminBusinessesResult,
-  IUpdateAdminBusinessesParams,
-  IUpdateAdminBusinessesQuery,
-  IUpdateAdminBusinessesResult,
 } from '../types.js';
 
 const getAdminBusinessesByIds = sql<IGetAdminBusinessesByIdsQuery>`
@@ -32,37 +28,6 @@ const getAllAdminBusinesses = sql<IGetAllAdminBusinessesQuery>`
     INNER JOIN accounter_schema.financial_entities fe
       USING (id);`;
 
-const updateAdminBusinesses = sql<IUpdateAdminBusinessesQuery>`
-    UPDATE accounter_schema.businesses_admin
-    SET
-    business_registration_start_date = COALESCE(
-      $businessRegistrationStartDate,
-      business_registration_start_date
-    ),
-    company_tax_id = COALESCE(
-      $companyTaxId,
-      company_tax_id
-    ),
-    advance_tax_rates = COALESCE(
-      $advanceTaxRates,
-      advance_tax_rates
-    ),
-    tax_advances_ids = COALESCE(
-      $taxAdvancesIds,
-      tax_advances_ids
-    ),
-    social_security_employer_ids = COALESCE(
-      $socialSecurityEmployerIds,
-      social_security_employer_ids
-    ),
-    withholding_tax_annual_ids = COALESCE(
-      $withholdingTaxAnnualIds,
-      withholding_tax_annual_ids
-    )
-    WHERE
-      id = $id
-    RETURNING *;`;
-
 @Injectable({
   scope: Scope.Operation,
   global: true,
@@ -104,15 +69,6 @@ export class AdminBusinessesProvider {
     });
   }
 
-  public async updateAdminBusiness(
-    params: IUpdateAdminBusinessesParams,
-  ): Promise<IUpdateAdminBusinessesResult> {
-    const inputParams = adminBusinessUpdateSchema.parse(params);
-    const [result] = await updateAdminBusinesses.run(inputParams, this.dbProvider);
-    this.clearCache();
-    return result;
-  }
-
   public clearCache() {
     this.cache.clear();
   }

package/src/modules/financial-entities/resolvers/admin-businesses.resolver.ts

@@ -1,7 +1,5 @@
 import { GraphQLError } from 'graphql';
 import { dateToTimelessDateString } from '@shared/helpers';
-import { TimelessDateString } from '@shared/types';
-import { taxAdvancesRatesSchema, yearlyIdsSchema } from '../helpers/admin-businesses.helper.js';
 import { AdminBusinessesProvider } from '../providers/admin-businesses.provider.js';
 import { BusinessesProvider } from '../providers/businesses.provider.js';
 import type { FinancialEntitiesModule } from '../types.js';
@@ -24,41 +22,6 @@ export const adminBusinessesResolvers: FinancialEntitiesModule.Resolvers = {
       return adminBusinesses;
     },
   },
-  Mutation: {
-    updateAdminBusiness: async (_, { businessId, fields }, { injector }) => {
-      try {
-        await injector.get(AdminBusinessesProvider).updateAdminBusiness({
-          id: businessId,
-          businessRegistrationStartDate: fields.registrationDate,
-          companyTaxId: fields.withholdingTaxCompanyId,
-          taxAdvancesIds: fields.taxAdvancesAnnualIds
-            ? [...fields.taxAdvancesAnnualIds]
-            : undefined,
-          advanceTaxRates: fields.taxAdvancesRates ? [...fields.taxAdvancesRates] : undefined,
-          withholdingTaxAnnualIds: fields.withholdingTaxAnnualIds
-            ? [...fields.withholdingTaxAnnualIds]
-            : undefined,
-          socialSecurityEmployerIds: fields.socialSecurityEmployerIds
-            ? [...fields.socialSecurityEmployerIds]
-            : undefined,
-        });
-
-        const updatedAdminBusiness = await injector
-          .get(AdminBusinessesProvider)
-          .getAdminBusinessByIdLoader.load(businessId);
-
-        if (!updatedAdminBusiness) {
-          throw new GraphQLError(`Error updating Admin business ID="${businessId}"`);
-        }
-
-        return updatedAdminBusiness;
-      } catch (error) {
-        const message = `Error updating Admin business ID="${businessId}"`;
-        console.error(message, error);
-        throw new GraphQLError(message);
-      }
-    },
-  },
   AdminBusiness: {
     id: admin => admin.id,
     name: admin => admin.name,
@@ -68,12 +31,6 @@ export const adminBusinessesResolvers: FinancialEntitiesModule.Resolvers = {
       }
       return admin.vat_number;
     },
-    registrationDate: admin => {
-      if (!admin.registration_date) {
-        throw new GraphQLError(`Admin business ID="${admin.id}" has no registration date`);
-      }
-      return dateToTimelessDateString(admin.registration_date);
-    },
     business: async (admin, _, { injector }) => {
       const business = await injector.get(BusinessesProvider).getBusinessByIdLoader.load(admin.id);
       if (!business) {
@@ -81,16 +38,17 @@ export const adminBusinessesResolvers: FinancialEntitiesModule.Resolvers = {
       }
       return business;
     },
-    taxAdvancesAnnualIds: admin => yearlyIdsSchema.parse(admin.tax_advances_ids),
-    taxAdvancesRates: admin =>
-      taxAdvancesRatesSchema.parse(admin.advance_tax_rates) as Array<{
-        date: TimelessDateString;
-        rate: number;
-      }>,
-    withholdingTaxCompanyId: admin => admin.company_tax_id,
-    withholdingTaxAnnualIds: admin => yearlyIdsSchema.parse(admin.withholding_tax_annual_ids),
-    socialSecurityDeductionsId: admin => `${admin.company_tax_id}00`,
-    socialSecurityEmployerIds: admin => yearlyIdsSchema.parse(admin.social_security_employer_ids),
+    withholdingTaxBookNumber: admin => admin.tax_nikuim_pinkas_number,
+    withholdingTaxFileNumber: admin => admin.nikuim,
+    socialSecurityEmployerId: admin => admin.pinkas_social_security_2022,
+    taxAdvancesRate: admin => admin.advance_tax_rate,
+    taxAdvancesId: admin => admin.tax_siduri_number_2022,
+    registrationDate: admin => {
+      if (!admin.registration_date) {
+        throw new GraphQLError(`Admin business ID="${admin.id}" has no registration date`);
+      }
+      return dateToTimelessDateString(admin.registration_date);
+    },
   },
   LtdFinancialEntity: {
     adminInfo: async (parentBusiness, _, { injector }) => {

package/src/modules/financial-entities/typeDefs/admin-businesses.graphql.ts

@@ -19,67 +19,34 @@ export default gql`
     id: UUID!
     name: String!
     governmentId: String!
-    registrationDate: TimelessDate!
     business: LtdFinancialEntity!
-    " Tax Advances Info "
-    taxAdvancesAnnualIds: [AnnualId!]!
-    taxAdvancesRates: [TaxAdvancesRate!]!
-    " Withholding Tax Info "
-    withholdingTaxCompanyId: String
-    withholdingTaxAnnualIds: [AnnualId!]!
-    " Social Security Info "
-    socialSecurityDeductionsId: String
-    socialSecurityEmployerIds: [AnnualId!]!
-  }
-
-  " Represents an annual identifier for tax purposes. "
-  type AnnualId {
-    year: Int!
-    id: String!
-  }
-
-  " Represents the tax advance rate for a specific date. "
-  type TaxAdvancesRate {
-    date: TimelessDate!
-    rate: Float!
+    withholdingTaxBookNumber: String
+    withholdingTaxFileNumber: String
+    socialSecurityEmployerId: String
+    taxAdvancesRate: Float
+    taxAdvancesId: String
+    registrationDate: TimelessDate!
   }
 
   " Input type for creating a new admin business. "
   input CreateAdminBusinessInput {
     businessId: UUID!
-    registrationDate: TimelessDate!
-    companyTaxId: String!
-    taxAdvancesAnnualId: String
-    taxAdvancesRate: Float
-    withholdingTaxAnnualId: String
+    withholdingTaxBookNumber: String
+    withholdingTaxFileNumber: String
     socialSecurityEmployerId: String
+    taxAdvancesRate: Float
+    taxAdvancesId: String
+    registrationDate: TimelessDate!
   }
 
   " Input type for updating admin business details. "
   input UpdateAdminBusinessInput {
-    name: String
-    governmentId: String
+    withholdingTaxBookNumber: String
+    withholdingTaxFileNumber: String
+    socialSecurityEmployerId: String
+    taxAdvancesRate: Float
+    taxAdvancesId: String
     registrationDate: TimelessDate
-    " Tax Advances Info "
-    taxAdvancesAnnualIds: [AnnualIdInput!]
-    taxAdvancesRates: [TaxAdvancesRateInput!]
-    " Withholding Tax Info "
-    withholdingTaxCompanyId: String
-    withholdingTaxAnnualIds: [AnnualIdInput!]
-    " Social Security Info "
-    socialSecurityEmployerIds: [AnnualIdInput!]
-  }
-
-  " Input type representing an annual identifier for tax purposes. "
-  input AnnualIdInput {
-    year: Int!
-    id: String!
-  }
-
-  " Input type representing the tax advance rate for a specific date. "
-  input TaxAdvancesRateInput {
-    date: TimelessDate!
-    rate: Float!
   }
 
   extend type LtdFinancialEntity {

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

@@ -1,5 +1,5 @@
 export * from './__generated__/types.js';
-export type { Json, pcn874_record_type, DateOrString } from './__generated__/businesses.types.js';
+export type { Json, pcn874_record_type } from './__generated__/businesses.types.js';
 export * from './__generated__/businesses.types.js';
 export * from './__generated__/businesses-operation.types.js';
 export * from './__generated__/admin-businesses.types.js';

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

@@ -2,7 +2,7 @@ import * as Types from "../../../__generated__/types.js";
 import * as gm from "graphql-modules";
 export namespace GreenInvoiceModule {
   interface DefinedFields {
-    Query: 'newDocumentInfoDraftByCharge' | 'newDocumentInfoDraftByDocument' | 'clientMonthlyChargesDrafts' | 'clientMonthlyChargeDraft' | 'greenInvoiceClient';
+    Query: 'newDocumentInfoDraftByCharge' | 'newDocumentInfoDraftByDocument' | 'clientMonthlyChargesDrafts' | 'clientChargesDraftsByContracts' | 'clientMonthlyChargeDraft' | 'greenInvoiceClient';
     Mutation: 'fetchIncomeDocuments' | 'issueGreenInvoiceDocuments' | 'previewGreenInvoiceDocument' | 'issueGreenInvoiceDocument';
     GenerateMonthlyClientDocumentsResult: 'success' | 'errors';
     NewDocumentInfo: 'description' | 'remarks' | 'footer' | 'type' | 'date' | 'dueDate' | 'lang' | 'currency' | 'vatType' | 'discount' | 'rounding' | 'signed' | 'maxPayments' | 'client' | 'income' | 'payment' | 'linkedDocumentIds' | 'linkedPaymentId' | 'linkType';
@@ -97,6 +97,7 @@ export namespace GreenInvoiceModule {
       newDocumentInfoDraftByCharge?: gm.Middleware[];
       newDocumentInfoDraftByDocument?: gm.Middleware[];
       clientMonthlyChargesDrafts?: gm.Middleware[];
+      clientChargesDraftsByContracts?: gm.Middleware[];
       clientMonthlyChargeDraft?: gm.Middleware[];
       greenInvoiceClient?: gm.Middleware[];
     };

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

@@ -0,0 +1,75 @@
+import { addMonths, endOfMonth, format, startOfMonth, subMonths } from 'date-fns';
+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 { 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 './issue-document.helper.js';
+
+export const convertContractToDraft = async (
+  contract: IGetContractsByIdsResult,
+  injector: Injector,
+  issueMonth: TimelessDateString,
+) => {
+  const businessPromise = injector
+    .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,
+  ]);
+
+  if (!business) {
+    throw new GraphQLError(`Business ID="${contract.client_id}" not found`);
+  }
+
+  if (!client) {
+    throw new GraphQLError(`Client not found for business ID="${contract.client_id}"`);
+  }
+
+  if (!greenInvoiceClient) {
+    throw new GraphQLError(`Green invoice match not found for business ID="${contract.client_id}"`);
+  }
+
+  const today = issueMonth ? addMonths(new Date(issueMonth), 1) : new Date();
+  const monthStart = dateToTimelessDateString(startOfMonth(today));
+  const monthEnd = dateToTimelessDateString(endOfMonth(today));
+  const year = today.getFullYear() + (today.getMonth() === 0 ? -1 : 0);
+  const month = format(subMonths(today, 1), 'MMMM');
+
+  const documentInput: 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),
+    date: monthStart,
+    dueDate: monthEnd,
+    lang: 'ENGLISH',
+    currency: contract.currency as Currency,
+    vatType: 'EXEMPT',
+    rounding: false,
+    signed: true,
+    client: {
+      ...greenInvoiceClient,
+      emails: [...((client.emails?.filter(Boolean) as string[]) ?? [])],
+    },
+    income: [
+      {
+        description: `GraphQL Hive Enterprise License - ${month} ${year}`,
+        quantity: 1,
+        price: contract.amount,
+        currency: contract.currency as Currency,
+        vatType: 'EXEMPT',
+      },
+    ],
+  };
+
+  return documentInput;
+};