gemcap-be-common 1.5.83 → 1.5.85

package/models/HistoricalLoanCharge.model.d.ts

@@ -0,0 +1,61 @@
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import mongoose from 'mongoose';
+import Joi from 'joi';
+export interface IHistoricalLoanCharge {
+    loanProductId: mongoose.Types.ObjectId;
+    date: Date;
+    paymentDate: Date;
+    source: string;
+    chargeId: mongoose.Types.ObjectId;
+    chargeName: string;
+    amount: number;
+    amountPaid: number;
+}
+export type THistoricalLoanChargeDoc = mongoose.HydratedDocument<IHistoricalLoanCharge>;
+export interface IHistoricalLoanChargeLean extends IHistoricalLoanCharge {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IHistoricalLoanChargePlain extends Omit<IHistoricalLoanCharge, 'loanProductId' | 'chargeId'> {
+    _id: string;
+    loanProductId: string;
+    chargeId: string;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export declare const HistoricalLoanChargeCreateValidationSchema: Joi.ObjectSchema<any>;
+export declare const HistoricalLoanChargeUpdateValidationSchema: Joi.ObjectSchema<any>;
+export type THistoricalLoanChargeModel = mongoose.Model<IHistoricalLoanCharge>;
+export declare const HistoricalLoanChargeSchema: mongoose.Schema<IHistoricalLoanCharge, THistoricalLoanChargeModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, IHistoricalLoanCharge, mongoose.Document<unknown, {}, mongoose.FlatRecord<IHistoricalLoanCharge>> & mongoose.FlatRecord<IHistoricalLoanCharge> & {
+    _id: mongoose.Types.ObjectId;
+}>;
+export declare const HistoricalLoanCharge: THistoricalLoanChargeModel;

package/models/HistoricalLoanCharge.model.js

@@ -0,0 +1,71 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HistoricalLoanCharge = exports.HistoricalLoanChargeSchema = exports.HistoricalLoanChargeUpdateValidationSchema = exports.HistoricalLoanChargeCreateValidationSchema = void 0;
+const mongoose_1 = __importDefault(require("mongoose"));
+const joi_1 = __importDefault(require("joi"));
+const _models_1 = require("./_models");
+exports.HistoricalLoanChargeCreateValidationSchema = joi_1.default.object({
+    loanProductId: joi_1.default.string().required(),
+    date: joi_1.default.date().required(),
+    paymentDate: joi_1.default.date().required(),
+    chargeId: joi_1.default.string().required(),
+    source: joi_1.default.string().required(),
+    chargeName: joi_1.default.string().required(),
+    amount: joi_1.default.number().required(),
+    amountPaid: joi_1.default.number().required(),
+});
+exports.HistoricalLoanChargeUpdateValidationSchema = joi_1.default.object({
+    _id: joi_1.default.string().required(),
+    loanProductId: joi_1.default.string(),
+    date: joi_1.default.date(),
+    paymentDate: joi_1.default.date(),
+    chargeId: joi_1.default.string(),
+    source: joi_1.default.string(),
+    chargeName: joi_1.default.string(),
+    amount: joi_1.default.number(),
+    amountPaid: joi_1.default.number(),
+});
+exports.HistoricalLoanChargeSchema = new mongoose_1.default.Schema({
+    loanProductId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: _models_1.MODEL_NAMES.loanProducts,
+        required: true,
+    },
+    date: {
+        type: Date,
+        required: true,
+    },
+    paymentDate: {
+        type: Date,
+        required: true,
+    },
+    source: {
+        type: String,
+        required: true,
+    },
+    chargeId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: _models_1.MODEL_NAMES.loanCharges,
+        required: true,
+    },
+    chargeName: {
+        type: String,
+        required: true,
+    },
+    amount: {
+        type: Number,
+        required: true,
+    },
+    amountPaid: {
+        type: Number,
+        required: true,
+    },
+}, {
+    timestamps: { createdAt: true, updatedAt: true },
+    versionKey: false,
+});
+exports.HistoricalLoanChargeSchema.index({ loanProductId: 1, chargeId: 1, date: 1 }, { unique: true });
+exports.HistoricalLoanCharge = mongoose_1.default.model(_models_1.MODEL_NAMES.historicalLoanCharges, exports.HistoricalLoanChargeSchema);

package/models/HistoricalLoanCharge.model.ts

@@ -0,0 +1,106 @@
+import mongoose from 'mongoose';
+import Joi from 'joi';
+
+import { MODEL_NAMES } from './_models';
+
+export interface IHistoricalLoanCharge {
+  loanProductId: mongoose.Types.ObjectId;
+  date: Date;
+  paymentDate: Date;
+  source: string;
+  chargeId: mongoose.Types.ObjectId;
+  chargeName: string;
+  amount: number;
+  amountPaid: number;
+}
+
+export type THistoricalLoanChargeDoc = mongoose.HydratedDocument<IHistoricalLoanCharge>;
+
+export interface IHistoricalLoanChargeLean extends IHistoricalLoanCharge {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IHistoricalLoanChargePlain extends Omit<IHistoricalLoanCharge, 'loanProductId' | 'chargeId'> {
+  _id: string;
+  loanProductId: string;
+  chargeId: string;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export const HistoricalLoanChargeCreateValidationSchema = Joi.object({
+  loanProductId: Joi.string().required(),
+  date: Joi.date().required(),
+  paymentDate: Joi.date().required(),
+  chargeId: Joi.string().required(),
+  source: Joi.string().required(),
+  chargeName: Joi.string().required(),
+  amount: Joi.number().required(),
+  amountPaid: Joi.number().required(),
+});
+
+export const HistoricalLoanChargeUpdateValidationSchema = Joi.object({
+  _id: Joi.string().required(),
+  loanProductId: Joi.string(),
+  date: Joi.date(),
+  paymentDate: Joi.date(),
+  chargeId: Joi.string(),
+  source: Joi.string(),
+  chargeName: Joi.string(),
+  amount: Joi.number(),
+  amountPaid: Joi.number(),
+});
+
+export type THistoricalLoanChargeModel = mongoose.Model<IHistoricalLoanCharge>;
+
+export const HistoricalLoanChargeSchema = new mongoose.Schema<IHistoricalLoanCharge, THistoricalLoanChargeModel>(
+  {
+    loanProductId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: MODEL_NAMES.loanProducts,
+      required: true,
+    },
+    date: {
+      type: Date,
+      required: true,
+    },
+    paymentDate: {
+      type: Date,
+      required: true,
+    },
+    source: {
+      type: String,
+      required: true,
+    },
+    chargeId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: MODEL_NAMES.loanCharges,
+      required: true,
+    },
+    chargeName: {
+      type: String,
+      required: true,
+    },
+    amount: {
+      type: Number,
+      required: true,
+    },
+    amountPaid: {
+      type: Number,
+      required: true,
+    },
+  },
+  {
+    timestamps: { createdAt: true, updatedAt: true },
+    versionKey: false,
+  },
+);
+
+HistoricalLoanChargeSchema.index(
+  { loanProductId: 1, chargeId: 1, date: 1 },
+  { unique: true },
+);
+
+export const HistoricalLoanCharge = mongoose.model<IHistoricalLoanCharge, THistoricalLoanChargeModel>(MODEL_NAMES.historicalLoanCharges, HistoricalLoanChargeSchema);

package/models/_models.d.ts

@@ -77,6 +77,7 @@ export declare const MODEL_NAMES: {
     financialSpreadingSheets: string;
     globals: string;
     loanSnapshots: string;
+    historicalLoanCharges: string;
     insuranceReportSettings: string;
     inventories: string;
     inventoryAvailability: string;

package/models/_models.js

@@ -79,7 +79,8 @@ exports.MODEL_NAMES = {
     financialSpreadingExclusion: 'financial_spreading_exclusions',
     financialSpreadingSheets: 'financial_spreading_sheets',
     globals: 'globals',
-    loanSnapshots: 'Loan_snapshots',
+    loanSnapshots: 'loan_snapshots',
+    historicalLoanCharges: 'historical_loan_charges',
     insuranceReportSettings: 'insurance_report_settings',
     inventories: 'inventories',
     inventoryAvailability: 'inventoryAvailabilities',

package/models/_models.ts

@@ -76,7 +76,8 @@ export const MODEL_NAMES = {
   financialSpreadingExclusion: 'financial_spreading_exclusions',
   financialSpreadingSheets: 'financial_spreading_sheets',
   globals: 'globals',
-  loanSnapshots: 'Loan_snapshots',
+  loanSnapshots: 'loan_snapshots',
+  historicalLoanCharges: 'historical_loan_charges',
   insuranceReportSettings: 'insurance_report_settings',
   inventories: 'inventories',
   inventoryAvailability: 'inventoryAvailabilities',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.5.83",
+  "version": "1.5.85",
   "description": "",
   "main": "index.js",
   "scripts": {

package/services/compliance-borrowers.service.d.ts

@@ -60,7 +60,7 @@ export declare class ComplianceBorrowersService {
     isComplianceBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean;
     calculateInstanceStatuses(instance: IBorrowerItemInstance, item: IBorrowerItemLean): IInstanceStatus;
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<IComplianceBorrowerDocumentFullWithStatuses>;
-    getAllBorrowersShortened(userAccess: IUserAccess): Promise<Pick<IComplianceBorrowerWithBorrower, "items" | "borrower" | "fundingStatus">[]>;
+    getAllBorrowersShortened(userAccess: IUserAccess): Promise<Pick<IComplianceBorrowerWithBorrower, "borrower" | "fundingStatus" | "items">[]>;
     generateInstances(complianceBorrowerId: any): Promise<IComplianceBorrowerDocumentFullWithStatuses>;
     calculateAndUpdateFundingStatus(complianceBorrowerId: string): Promise<void>;
     calculateFundingStatus(complianceBorrower: IComplianceBorrowerDocumentFull): string;

package/services/loan-transactions.service.d.ts

@@ -60,6 +60,13 @@ export interface ITransactionsFilter {
     amount?: number;
     reference?: string;
 }
+export interface ITransactionsMultiProductsFilter {
+    periodStart: Date;
+    periodEnd: Date;
+    productIds: string[];
+    amount?: number;
+    reference?: string;
+}
 export declare class LoanTransactionsService {
     private readonly attachedFilesService;
     private readonly banksService;
@@ -80,7 +87,9 @@ export declare class LoanTransactionsService {
     getTransactionsById(transactionId: string): Promise<mongoose.FlattenMaps<ILoanTransaction> & {
         _id: mongoose.Types.ObjectId;
     }>;
+    private getLoanTransactionsInternal;
     getLoanTransactions<T extends boolean>(transactionsFilter: ITransactionsFilter, paginatorOptions: IPaginatorOptions, withBanks: T, isReverse?: boolean, isMinified?: boolean): Promise<(T extends true ? ILoanTransactionViewWithBank : ILoanTransactionView)[]>;
+    getLoanTransactionsForProducts<T extends boolean>(transactionsFilter: ITransactionsMultiProductsFilter, paginatorOptions: IPaginatorOptions, withBanks: T, isReverse?: boolean, isMinified?: boolean): Promise<(T extends true ? ILoanTransactionViewWithBank : ILoanTransactionView)[]>;
     getLoanTransactionsForFilter(periodStart: Date, periodEnd: Date, productId: string): Promise<ILoanTransactionView[]>;
     getLoanTransactionsForProduct(productId: string): Promise<ILoanTransactionView[]>;
     getLoanTransactionFiles(): Promise<{

package/services/loan-transactions.service.js

@@ -61,62 +61,82 @@ class LoanTransactionsService {
     async getTransactionsById(transactionId) {
         return LoanTransaction_model_1.LoanTransaction.findById(transactionId).lean();
     }
-    async getLoanTransactions(transactionsFilter, paginatorOptions, withBanks, isReverse = false, isMinified = false) {
-        const borrowerProducts = await this.loanChargesService.getLoanProducts(transactionsFilter.borrowerId);
-        const productIds = borrowerProducts
-            .filter((product) => transactionsFilter.productId ? product._id.toString() === transactionsFilter.productId : true)
-            .map((product) => product._id);
+    async getLoanTransactionsInternal(productIds, transactionsFilter, paginatorOptions, withBanks, isReverse = false, isMinified = false) {
         const optionalFilters = [];
         if (transactionsFilter.amount) {
-            optionalFilters.push({ 'amount': transactionsFilter.amount });
+            optionalFilters.push({ amount: transactionsFilter.amount });
         }
         if (transactionsFilter.reference) {
-            optionalFilters.push({ 'reference': { $regex: transactionsFilter.reference, $options: 'i' } });
-        }
-        const bankLookup = !withBanks
-            ? []
-            : [
-                {
-                    $lookup: {
-                        from: 'banks',
-                        localField: 'bankId',
-                        foreignField: '_id',
-                        as: 'bank',
-                    },
-                }, {
-                    $unwind: {
-                        path: '$bank',
-                        preserveNullAndEmptyArrays: true,
-                    },
+            optionalFilters.push({
+                reference: {
+                    $regex: transactionsFilter.reference,
+                    $options: 'i',
                 },
-            ];
-        const projectedFields = isMinified
-            ? [{ $project: { _id: 1, date: 1, amount: 1, reference: 1, balance: 1, transactionType: 1 } }]
-            : [];
-        return LoanTransaction_model_1.LoanTransaction.aggregate([
+            });
+        }
+        const pipeline = [
             {
                 $match: {
-                    $and: [
-                        { 'date': { $gte: transactionsFilter.periodStart } },
-                        { 'date': { $lte: transactionsFilter.periodEnd } },
-                        { 'productId': { $in: productIds } },
-                        ...optionalFilters,
-                    ],
+                    date: {
+                        $gte: transactionsFilter.periodStart,
+                        $lte: transactionsFilter.periodEnd,
+                    },
+                    productId: { $in: productIds },
+                    ...Object.assign({}, ...optionalFilters),
                 },
-            }, {
+            },
+            {
                 $sort: {
-                    'date': isReverse ? -1 : 1,
-                    'order': isReverse ? -1 : 1,
-                    'createdAt': isReverse ? -1 : 1,
+                    date: isReverse ? -1 : 1,
+                    order: isReverse ? -1 : 1,
+                    createdAt: isReverse ? -1 : 1,
                 },
             },
             ...(0, collaterals_db_1.ITEMS_PAGINATION)(paginatorOptions),
-            ...bankLookup,
-            {
-                $unset: loan_products_db_1.fieldsToUnset,
-            },
-            ...projectedFields,
-        ]);
+        ];
+        if (withBanks) {
+            pipeline.push({
+                $lookup: {
+                    from: 'banks',
+                    localField: 'bankId',
+                    foreignField: '_id',
+                    as: 'bank',
+                },
+            }, {
+                $unwind: {
+                    path: '$bank',
+                    preserveNullAndEmptyArrays: true,
+                },
+            });
+        }
+        pipeline.push({
+            $unset: loan_products_db_1.fieldsToUnset,
+        });
+        if (isMinified) {
+            pipeline.push({
+                $project: {
+                    _id: 1,
+                    date: 1,
+                    amount: 1,
+                    reference: 1,
+                    balance: 1,
+                    transactionType: 1,
+                },
+            });
+        }
+        return LoanTransaction_model_1.LoanTransaction.aggregate(pipeline);
+    }
+    async getLoanTransactions(transactionsFilter, paginatorOptions, withBanks, isReverse = false, isMinified = false) {
+        const borrowerProducts = await this.loanChargesService.getLoanProducts(transactionsFilter.borrowerId);
+        const productIds = borrowerProducts
+            .filter((product) => transactionsFilter.productId
+            ? product._id.toString() === transactionsFilter.productId
+            : true)
+            .map((product) => product._id);
+        return this.getLoanTransactionsInternal(productIds, transactionsFilter, paginatorOptions, withBanks, isReverse, isMinified);
+    }
+    async getLoanTransactionsForProducts(transactionsFilter, paginatorOptions, withBanks, isReverse = false, isMinified = false) {
+        return this.getLoanTransactionsInternal(transactionsFilter.productIds.map((id) => new mongoose_1.default.Types.ObjectId(id)), transactionsFilter, paginatorOptions, withBanks, isReverse, isMinified);
     }
     async getLoanTransactionsForFilter(periodStart, periodEnd, productId) {
         return LoanTransaction_model_1.LoanTransaction.aggregate([

package/services/loan-transactions.service.ts

@@ -68,6 +68,14 @@ export interface ITransactionsFilter {
   reference?: string;
 }
 
+export interface ITransactionsMultiProductsFilter {
+  periodStart: Date;
+  periodEnd: Date;
+  productIds: string[];
+  amount?: number;
+  reference?: string;
+}
+
 export class LoanTransactionsService {
 
   private readonly config: ILoanTransactionsServiceConfig;
@@ -96,22 +104,57 @@ export class LoanTransactionsService {
     return LoanTransaction.findById(transactionId).lean();
   }
 
-  async getLoanTransactions<T extends boolean>(transactionsFilter: ITransactionsFilter, paginatorOptions: IPaginatorOptions, withBanks: T, isReverse = false, isMinified = false) {
-    const borrowerProducts = await this.loanChargesService.getLoanProducts(transactionsFilter.borrowerId);
-    const productIds = borrowerProducts
-      .filter((product) => transactionsFilter.productId ? product._id.toString() === transactionsFilter.productId : true)
-      .map((product) => product._id);
-
+  private async getLoanTransactionsInternal<T extends boolean>(
+    productIds: mongoose.Types.ObjectId[],
+    transactionsFilter: {
+      periodStart: Date;
+      periodEnd: Date;
+      amount?: number;
+      reference?: string;
+    },
+    paginatorOptions: IPaginatorOptions,
+    withBanks: T,
+    isReverse = false,
+    isMinified = false,
+  ) {
     const optionalFilters = [];
+
     if (transactionsFilter.amount) {
-      optionalFilters.push({ 'amount': transactionsFilter.amount });
+      optionalFilters.push({ amount: transactionsFilter.amount });
     }
+
     if (transactionsFilter.reference) {
-      optionalFilters.push({ 'reference': { $regex: transactionsFilter.reference, $options: 'i' } });
+      optionalFilters.push({
+        reference: {
+          $regex: transactionsFilter.reference,
+          $options: 'i',
+        },
+      });
     }
-    const bankLookup = !withBanks
-      ? []
-      : [
+
+    const pipeline: mongoose.PipelineStage[] = [
+      {
+        $match: {
+          date: {
+            $gte: transactionsFilter.periodStart,
+            $lte: transactionsFilter.periodEnd,
+          },
+          productId: { $in: productIds },
+          ...Object.assign({}, ...optionalFilters),
+        },
+      },
+      {
+        $sort: {
+          date: isReverse ? -1 : 1,
+          order: isReverse ? -1 : 1,
+          createdAt: isReverse ? -1 : 1,
+        },
+      },
+      ...ITEMS_PAGINATION(paginatorOptions),
+    ];
+
+    if (withBanks) {
+      pipeline.push(
         {
           $lookup: {
             from: 'banks',
@@ -119,42 +162,86 @@ export class LoanTransactionsService {
             foreignField: '_id',
             as: 'bank',
           },
-        }, {
+        },
+        {
           $unwind: {
             path: '$bank',
             preserveNullAndEmptyArrays: true,
           },
         },
-      ];
-
-    const projectedFields = isMinified
-      ? [{ $project: { _id: 1, date: 1, amount: 1, reference: 1, balance: 1, transactionType: 1 } }]
-      : [];
+      );
+    }
 
-    return LoanTransaction.aggregate<T extends true ? ILoanTransactionViewWithBank : ILoanTransactionView>([
-      {
-        $match: {
-          $and: [
-            { 'date': { $gte: transactionsFilter.periodStart } },
-            { 'date': { $lte: transactionsFilter.periodEnd } },
-            { 'productId': { $in: productIds } },
-            ...optionalFilters,
-          ],
-        },
-      }, {
-        $sort: {
-          'date': isReverse ? -1 : 1,
-          'order': isReverse ? -1 : 1,
-          'createdAt': isReverse ? -1 : 1,
-        },
-      },
-      ...ITEMS_PAGINATION(paginatorOptions),
-      ...bankLookup,
+    pipeline.push(
       {
         $unset: fieldsToUnset,
       },
-      ...projectedFields,
-    ]);
+    );
+
+    if (isMinified) {
+      pipeline.push({
+        $project: {
+          _id: 1,
+          date: 1,
+          amount: 1,
+          reference: 1,
+          balance: 1,
+          transactionType: 1,
+        },
+      });
+    }
+
+    return LoanTransaction.aggregate<
+      T extends true ? ILoanTransactionViewWithBank : ILoanTransactionView
+    >(pipeline);
+  }
+
+  async getLoanTransactions<T extends boolean>(
+    transactionsFilter: ITransactionsFilter,
+    paginatorOptions: IPaginatorOptions,
+    withBanks: T,
+    isReverse = false,
+    isMinified = false,
+  ) {
+    const borrowerProducts = await this.loanChargesService.getLoanProducts(
+      transactionsFilter.borrowerId,
+    );
+
+    const productIds = borrowerProducts
+      .filter((product) =>
+        transactionsFilter.productId
+          ? product._id.toString() === transactionsFilter.productId
+          : true,
+      )
+      .map((product) => product._id);
+
+    return this.getLoanTransactionsInternal(
+      productIds,
+      transactionsFilter,
+      paginatorOptions,
+      withBanks,
+      isReverse,
+      isMinified,
+    );
+  }
+
+  async getLoanTransactionsForProducts<T extends boolean>(
+    transactionsFilter: ITransactionsMultiProductsFilter,
+    paginatorOptions: IPaginatorOptions,
+    withBanks: T,
+    isReverse = false,
+    isMinified = false,
+  ) {
+    return this.getLoanTransactionsInternal(
+      transactionsFilter.productIds.map(
+        (id) => new mongoose.Types.ObjectId(id),
+      ),
+      transactionsFilter,
+      paginatorOptions,
+      withBanks,
+      isReverse,
+      isMinified,
+    );
   }
 
   async getLoanTransactionsForFilter(periodStart: Date, periodEnd: Date, productId: string) {

package/services/quickbooks.service.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="mongoose/types/document" />
 /// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/document" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />

package/services/yield.service.d.ts

@@ -31,7 +31,7 @@ export declare class YieldService {
     getCalculatedYieldTotals(productId: string, selectedMonth: ISelectedMonth): Promise<(mongoose.FlattenMaps<import("../models/Yield.model").IYieldData> & {
         _id: mongoose.Types.ObjectId;
     })[]>;
-    getCalculatedYieldTotalsForPeriod(productId: string, periodStart: ISelectedMonth, periodEnd: ISelectedMonth): Promise<(mongoose.FlattenMaps<import("../models/Yield.model").IYieldData> & {
+    getCalculatedYieldTotalsForPeriod(productIds: string[], periodStart: ISelectedMonth, periodEnd: ISelectedMonth): Promise<(mongoose.FlattenMaps<import("../models/Yield.model").IYieldData> & {
         _id: mongoose.Types.ObjectId;
     })[]>;
     getYieldData(params: IYieldParams): Promise<{

package/services/yield.service.js

@@ -33,9 +33,9 @@ class YieldService {
             month: selectedMonth.month,
         }).lean();
     }
-    async getCalculatedYieldTotalsForPeriod(productId, periodStart, periodEnd) {
+    async getCalculatedYieldTotalsForPeriod(productIds, periodStart, periodEnd) {
         return Yield_model_1.YieldData.find({
-            productId: new mongoose_1.default.Types.ObjectId(productId),
+            productId: productIds.map((productId) => new mongoose_1.default.Types.ObjectId(productId)),
             $or: [
                 {
                     year: periodStart.year,