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

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

@@ -4,6 +4,7 @@ import type { Document } from '@accounter/green-invoice-graphql';
 import { GreenInvoiceClientProvider } from '@modules/app-providers/green-invoice-client.js';
 import { ChargesProvider } from '@modules/charges/providers/charges.provider.js';
 import { ContractsProvider } from '@modules/contracts/providers/contracts.provider.js';
+import { IGetContractsByIdsResult } from '@modules/contracts/types.js';
 import { DocumentsProvider } from '@modules/documents/providers/documents.provider.js';
 import { IssuedDocumentsProvider } from '@modules/documents/providers/issued-documents.provider.js';
 import { normalizeDocumentType } from '@modules/documents/resolvers/common.js';
@@ -28,6 +29,7 @@ import { TransactionsProvider } from '@modules/transactions/providers/transactio
 import { Currency, DocumentType } from '@shared/enums';
 import { NewDocumentInfo } from '@shared/gql-types';
 import { dateToTimelessDateString } from '@shared/helpers';
+import { convertContractToDraft } from '../helpers/contract-to-draft.helper.js';
 import {
   deduceVatTypeFromBusiness,
   executeDocumentIssue,
@@ -354,71 +356,21 @@ export const greenInvoiceResolvers: GreenInvoiceModule.Resolvers = {
         contract => contract.billing_cycle === 'monthly',
       );
       const drafts = await Promise.all(
-        monthlyContracts.map(async contract => {
-          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}"`,
-            );
-          }
+        monthlyContracts.map(async contract =>
+          convertContractToDraft(contract, injector, issueMonth),
+        ),
+      );
 
-          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');
+      return drafts;
+    },
+    clientChargesDraftsByContracts: async (_, { issueMonth, contractIds }, { injector }) => {
+      const contracts = await injector
+        .get(ContractsProvider)
+        .getContractsByIdLoader.loadMany(contractIds)
+        .then(res => res.filter(c => !!c && !(c instanceof Error)) as IGetContractsByIdsResult[]);
 
-          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;
-        }),
+      const drafts = await Promise.all(
+        contracts.map(async contract => convertContractToDraft(contract, injector, issueMonth)),
       );
 
       return drafts;

package/src/modules/green-invoice/typeDefs/green-invoice.graphql.ts

@@ -6,6 +6,10 @@ export default gql`
     newDocumentInfoDraftByDocument(documentId: UUID!): NewDocumentInfo! @auth(role: ACCOUNTANT)
     clientMonthlyChargesDrafts(issueMonth: TimelessDate!): [NewDocumentInfo!]!
       @auth(role: ACCOUNTANT)
+    clientChargesDraftsByContracts(
+      issueMonth: TimelessDate!
+      contractIds: [UUID!]!
+    ): [NewDocumentInfo!]! @auth(role: ACCOUNTANT)
     clientMonthlyChargeDraft(clientId: UUID!, issueMonth: TimelessDate!): NewDocumentInfo!
       @auth(role: ACCOUNTANT)
     greenInvoiceClient(clientId: UUID!): GreenInvoiceClient! @auth(role: ACCOUNTANT)

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

@@ -1,31 +0,0 @@
-import { z } from 'zod';
-export declare const adminBusinessUpdateSchema: z.ZodObject<{
-    id: z.ZodUUID;
-    businessRegistrationStartDate: z.ZodOptional<z.ZodISODate>;
-    companyTaxId: z.ZodOptional<z.ZodString>;
-    advanceTaxRates: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        date: z.ZodISODate;
-        rate: z.ZodNumber;
-    }, z.core.$strict>>>;
-    taxAdvancesIds: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        year: z.ZodNumber;
-        id: z.ZodString;
-    }, z.core.$strict>>>;
-    socialSecurityEmployerIds: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        year: z.ZodNumber;
-        id: z.ZodString;
-    }, z.core.$strict>>>;
-    withholdingTaxAnnualIds: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        year: z.ZodNumber;
-        id: z.ZodString;
-    }, z.core.$strict>>>;
-}, z.core.$strict>;
-export type AdminBusinessUpdateSchema = z.infer<typeof adminBusinessUpdateSchema>;
-export declare const yearlyIdsSchema: z.ZodArray<z.ZodObject<{
-    year: z.ZodNumber;
-    id: z.ZodString;
-}, z.core.$strict>>;
-export declare const taxAdvancesRatesSchema: z.ZodArray<z.ZodObject<{
-    date: z.ZodISODate;
-    rate: z.ZodNumber;
-}, z.core.$strict>>;

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

@@ -1,27 +0,0 @@
-import { z } from 'zod';
-const yearlyIdSchema = z
-    .object({
-    year: z.number().min(2000).max(2100),
-    id: z.string().min(1, { message: 'ID is required' }),
-})
-    .strict();
-const taxAdvanceRateSchema = z
-    .object({
-    date: z.iso.date(),
-    rate: z.number().min(0).max(1),
-})
-    .strict();
-export const adminBusinessUpdateSchema = z
-    .object({
-    id: z.uuid(),
-    businessRegistrationStartDate: z.iso.date().optional(),
-    companyTaxId: z.string().optional(),
-    advanceTaxRates: z.array(taxAdvanceRateSchema).optional(),
-    taxAdvancesIds: z.array(yearlyIdSchema).optional(),
-    socialSecurityEmployerIds: z.array(yearlyIdSchema).optional(),
-    withholdingTaxAnnualIds: z.array(yearlyIdSchema).optional(),
-})
-    .strict();
-export const yearlyIdsSchema = z.array(yearlyIdSchema);
-export const taxAdvancesRatesSchema = z.array(taxAdvanceRateSchema);
-//# sourceMappingURL=admin-businesses.helper.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"admin-businesses.helper.js","sourceRoot":"","sources":["../../../../../../src/modules/financial-entities/helpers/admin-businesses.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,cAAc,GAAG,CAAC;KACrB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;IACpC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;CACrD,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,MAAM,oBAAoB,GAAG,CAAC;KAC3B,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;CAC/B,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC;KACvC,MAAM,CAAC;IACN,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE;IACZ,6BAA6B,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;IACtD,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE;IACzD,cAAc,EAAE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;IAClD,yBAAyB,EAAE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;IAC7D,uBAAuB,EAAE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;CAC5D,CAAC;KACD,MAAM,EAAE,CAAC;AAIZ,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC"}

package/src/modules/financial-entities/helpers/admin-businesses.helper.ts

@@ -1,33 +0,0 @@
-import { z } from 'zod';
-
-const yearlyIdSchema = z
-  .object({
-    year: z.number().min(2000).max(2100),
-    id: z.string().min(1, { message: 'ID is required' }),
-  })
-  .strict();
-
-const taxAdvanceRateSchema = z
-  .object({
-    date: z.iso.date(),
-    rate: z.number().min(0).max(1),
-  })
-  .strict();
-
-export const adminBusinessUpdateSchema = z
-  .object({
-    id: z.uuid(),
-    businessRegistrationStartDate: z.iso.date().optional(),
-    companyTaxId: z.string().optional(),
-    advanceTaxRates: z.array(taxAdvanceRateSchema).optional(),
-    taxAdvancesIds: z.array(yearlyIdSchema).optional(),
-    socialSecurityEmployerIds: z.array(yearlyIdSchema).optional(),
-    withholdingTaxAnnualIds: z.array(yearlyIdSchema).optional(),
-  })
-  .strict();
-
-export type AdminBusinessUpdateSchema = z.infer<typeof adminBusinessUpdateSchema>;
-
-export const yearlyIdsSchema = z.array(yearlyIdSchema);
-
-export const taxAdvancesRatesSchema = z.array(taxAdvanceRateSchema);