gemcap-be-common 1.5.121 → 1.5.124

package/db/groups.d.ts

@@ -1,4 +1,4 @@
-export declare const getAPCustomerGroups: (borrowerId: any) => Promise<any[]>;
+export declare const getAPCustomerGroups: (borrowerId: string) => Promise<any[]>;
 export declare const getMappedGroups: ({ group1, group2 }: {
     group1?: string;
     group2?: string;

package/db/groups.db.d.ts

@@ -1,46 +1,12 @@
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/models" />
-/// <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" />
-/// <reference types="mongoose/types/inferschematype" />
 export declare const groupsMap: {
     customers: {
-        Model: import("mongoose").Model<import("../models/CustomerGroup.model").ICustomerGroupDocument, {}, {}, {}, import("mongoose").Document<unknown, {}, import("../models/CustomerGroup.model").ICustomerGroupDocument> & import("../models/CustomerGroup.model").ICustomerGroupDocument & {
-            _id: import("mongoose").Types.ObjectId;
-        }, any>;
+        Model: import("../models/CustomerGroup.model").TCustomerGroupModel;
     };
     categories: {
-        Model: import("mongoose").Model<import("../models/CustomerGroup.model").ICustomerGroupDocument, {}, {}, {}, import("mongoose").Document<unknown, {}, import("../models/CustomerGroup.model").ICustomerGroupDocument> & import("../models/CustomerGroup.model").ICustomerGroupDocument & {
-            _id: import("mongoose").Types.ObjectId;
-        }, any>;
+        Model: import("../models/CategoryGroup.model").TCategoryGroupModel;
     };
     vendors: {
-        Model: import("mongoose").Model<import("../models/CustomerGroup.model").ICustomerGroupDocument, {}, {}, {}, import("mongoose").Document<unknown, {}, import("../models/CustomerGroup.model").ICustomerGroupDocument> & import("../models/CustomerGroup.model").ICustomerGroupDocument & {
-            _id: import("mongoose").Types.ObjectId;
-        }, any>;
+        Model: import("../models/CustomerAPGroup.model").TICustomerAPGroupModel;
     };
 };
 export declare const getBorrowerGroups: (borrowerId: string, relationshipGroups: string | string[]) => Promise<{

package/db/groups.db.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBorrowerGroups = exports.groupsMap = void 0;
 const CustomerGroup_model_1 = require("../models/CustomerGroup.model");
+const CustomerAPGroup_model_1 = require("../models/CustomerAPGroup.model");
+const CategoryGroup_model_1 = require("../models/CategoryGroup.model");
 exports.groupsMap = {
-    customers: { Model: CustomerGroup_model_1.CustomerGroupModel },
-    categories: { Model: CustomerGroup_model_1.CustomerGroupModel },
-    vendors: { Model: CustomerGroup_model_1.CustomerGroupModel },
+    customers: { Model: CustomerGroup_model_1.CustomerGroup },
+    categories: { Model: CategoryGroup_model_1.CategoryGroup },
+    vendors: { Model: CustomerAPGroup_model_1.CustomerAPGroup },
 };
 const getBorrowerGroups = async (borrowerId, relationshipGroups) => {
     if (typeof relationshipGroups == 'string') {

package/db/groups.db.ts

@@ -1,9 +1,11 @@
-import { CustomerGroupModel } from '../models/CustomerGroup.model';
+import { CustomerGroup } from '../models/CustomerGroup.model';
+import { CustomerAPGroup } from '../models/CustomerAPGroup.model';
+import { CategoryGroup } from '../models/CategoryGroup.model';
 
 export const groupsMap = {
-  customers: { Model: CustomerGroupModel },
-  categories: { Model: CustomerGroupModel },
-  vendors: { Model: CustomerGroupModel },
+  customers: { Model: CustomerGroup },
+  categories: { Model: CategoryGroup },
+  vendors: { Model: CustomerAPGroup },
 }
 
 export const getBorrowerGroups = async (borrowerId: string, relationshipGroups: string | string[]) => {

package/db/groups.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMappedGroups = exports.getAPCustomerGroups = void 0;
-const CustomerAPGroup_model_1 = __importDefault(require("../models/CustomerAPGroup.model"));
 const MappedGroup_model_1 = __importDefault(require("../models/MappedGroup.model"));
+const CustomerAPGroup_model_1 = require("../models/CustomerAPGroup.model");
 const getAPCustomerGroups = async (borrowerId) => {
-    return CustomerAPGroup_model_1.default.aggregate([
+    return CustomerAPGroup_model_1.CustomerAPGroup.aggregate([
         {
             $match: {
                 'borrowerId': borrowerId

package/db/groups.ts

@@ -1,7 +1,7 @@
-import CustomerAPGroup from '../models/CustomerAPGroup.model';
 import MappedGroup from '../models/MappedGroup.model';
+import { CustomerAPGroup } from '../models/CustomerAPGroup.model';
 
-export const getAPCustomerGroups = async (borrowerId) => {
+export const getAPCustomerGroups = async (borrowerId: string) => {
   return CustomerAPGroup.aggregate([
     {
       $match: {

package/microservice/events.constants.d.ts

@@ -11,6 +11,7 @@ export declare const EVENT_KEYS: {
         readonly MEMO_FILES_PREPARED: "ai.memo.files.prepared";
         readonly MEMO_ANALYSIS_COMPLETED: "ai.memo.generation.completed";
         readonly MEMO_ANALYSIS_FAILED: "ai.memo.generation.failed";
+        readonly JOB_CANCEL_REQUESTED: "ai.job.cancel.requested";
     };
     /**
      * ========= AUTH DOMAIN EVENTS =========

package/microservice/events.constants.js

@@ -14,6 +14,7 @@ exports.EVENT_KEYS = {
         MEMO_FILES_PREPARED: 'ai.memo.files.prepared',
         MEMO_ANALYSIS_COMPLETED: 'ai.memo.generation.completed',
         MEMO_ANALYSIS_FAILED: 'ai.memo.generation.failed',
+        JOB_CANCEL_REQUESTED: 'ai.job.cancel.requested',
     },
     /**
      * ========= AUTH DOMAIN EVENTS =========

package/microservice/events.constants.ts

@@ -11,6 +11,7 @@ export const EVENT_KEYS = {
     MEMO_FILES_PREPARED: 'ai.memo.files.prepared',
     MEMO_ANALYSIS_COMPLETED: 'ai.memo.generation.completed',
     MEMO_ANALYSIS_FAILED: 'ai.memo.generation.failed',
+    JOB_CANCEL_REQUESTED: 'ai.job.cancel.requested',
   },
 
   /**

package/microservice/queues.constants.d.ts

@@ -15,6 +15,9 @@ export declare const QUEUES: {
         readonly memo: {
             readonly generation: "ai.memo.generation";
         };
+        readonly job: {
+            readonly cancel: "ai.job.cancel.requested";
+        };
     };
     readonly auth: {
         readonly password: {

package/microservice/queues.constants.js

@@ -18,6 +18,9 @@ exports.QUEUES = {
         memo: {
             generation: 'ai.memo.generation',
         },
+        job: {
+            cancel: 'ai.job.cancel.requested',
+        }
     },
     auth: {
         password: {

package/microservice/queues.constants.ts

@@ -15,6 +15,9 @@ export const QUEUES = {
     memo: {
       generation: 'ai.memo.generation',
     },
+    job: {
+      cancel: 'ai.job.cancel.requested',
+    }
   },
   auth: {
     password: {

package/models/CategoryGroup.model.d.ts

@@ -0,0 +1,75 @@
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/models" />
+/// <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 { IBorrowerGroup } from '../interfaces/group.interface';
+export interface ICategoryGroup extends IBorrowerGroup {
+}
+export interface ICategoryGroupLean extends ICategoryGroup {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface ICategoryGroupPlain extends Omit<ICategoryGroup, 'borrowerId'> {
+    _id: string;
+    borrowerId: string;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export type TCategoryGroupDoc = mongoose.HydratedDocument<ICategoryGroup>;
+export type TCategoryGroupModel = mongoose.Model<ICategoryGroup>;
+export declare const CategoryGroupSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
+    timestamps: true;
+}, {
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    borrowerId: mongoose.Types.ObjectId;
+    groupName: string;
+    items: string[];
+    __v?: number;
+}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    borrowerId: mongoose.Types.ObjectId;
+    groupName: string;
+    items: string[];
+    __v?: number;
+}>> & mongoose.FlatRecord<{
+    createdAt: NativeDate;
+    updatedAt: NativeDate;
+} & {
+    borrowerId: mongoose.Types.ObjectId;
+    groupName: string;
+    items: string[];
+    __v?: number;
+}> & {
+    _id: mongoose.Types.ObjectId;
+}>;
+export declare const CategoryGroup: TCategoryGroupModel;

package/models/CategoryGroup.model.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CategoryGroup = exports.CategoryGroupSchema = void 0;
+const mongoose_1 = __importDefault(require("mongoose"));
+const _models_1 = require("./_models");
+exports.CategoryGroupSchema = new mongoose_1.default.Schema({
+    groupName: {
+        type: String,
+        trim: true,
+        required: true,
+    },
+    borrowerId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: _models_1.MODEL_NAMES.borrowers,
+        required: true,
+    },
+    items: [String],
+    __v: { type: Number, select: false },
+}, { timestamps: true });
+exports.CategoryGroup = mongoose_1.default.model(_models_1.MODEL_NAMES.categoryGroups, exports.CategoryGroupSchema);

package/models/CategoryGroup.model.ts

@@ -0,0 +1,44 @@
+import mongoose from 'mongoose';
+
+import { MODEL_NAMES } from './_models';
+import { IBorrowerGroup } from '../interfaces/group.interface';
+
+export interface ICategoryGroup extends IBorrowerGroup {
+}
+
+export interface ICategoryGroupLean extends ICategoryGroup {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface ICategoryGroupPlain extends Omit<ICategoryGroup, 'borrowerId'> {
+  _id: string;
+  borrowerId: string;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export type TCategoryGroupDoc = mongoose.HydratedDocument<ICategoryGroup>;
+
+export type TCategoryGroupModel = mongoose.Model<ICategoryGroup>;
+
+export const CategoryGroupSchema = new mongoose.Schema(
+  {
+    groupName: {
+      type: String,
+      trim: true,
+      required: true,
+    },
+    borrowerId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: MODEL_NAMES.borrowers,
+      required: true,
+    },
+    items: [String],
+    __v: { type: Number, select: false },
+  },
+  { timestamps: true }
+);
+
+export const CategoryGroup = mongoose.model<ICategoryGroup, TCategoryGroupModel>(MODEL_NAMES.categoryGroups, CategoryGroupSchema);

package/models/CustomerAPGroup.model.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/models" />
 /// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/models" />
 /// <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" />
@@ -26,40 +26,50 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Document } from 'mongoose';
+import mongoose from 'mongoose';
 import { IBorrowerGroup } from '../interfaces/group.interface';
-interface ICustomerAPGroupDocument extends IBorrowerGroup, Document {
+export interface ICustomerAPGroup extends IBorrowerGroup {
+}
+export interface ICustomerAPGroupLean extends ICustomerAPGroup {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface ICustomerAPGroupPlain extends Omit<ICustomerAPGroup, 'borrowerId'> {
+    _id: string;
+    borrowerId: string;
+    createdAt: Date;
+    updatedAt: Date;
 }
+export type TCustomerAPGroupDoc = mongoose.HydratedDocument<ICustomerAPGroup>;
+export type TICustomerAPGroupModel = mongoose.Model<ICustomerAPGroup>;
 export declare const CustomerAPGroupSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
 }, {
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    groupName: string;
     borrowerId: mongoose.Types.ObjectId;
+    groupName: string;
     items: string[];
     __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    groupName: string;
     borrowerId: mongoose.Types.ObjectId;
+    groupName: string;
     items: string[];
     __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    groupName: string;
     borrowerId: mongoose.Types.ObjectId;
+    groupName: string;
     items: string[];
     __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;
-declare const _default: mongoose.Model<ICustomerAPGroupDocument, {}, {}, {}, mongoose.Document<unknown, {}, ICustomerAPGroupDocument> & ICustomerAPGroupDocument & {
-    _id: mongoose.Types.ObjectId;
-}, any>;
-export default _default;
+export declare const CustomerAPGroup: TICustomerAPGroupModel;

package/models/CustomerAPGroup.model.js

@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomerAPGroupSchema = void 0;
+exports.CustomerAPGroup = exports.CustomerAPGroupSchema = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
-const mongooseLeanId = require('../plugins/id.plugin');
 exports.CustomerAPGroupSchema = new mongoose_1.default.Schema({
     groupName: {
         type: String,
@@ -21,5 +20,4 @@ exports.CustomerAPGroupSchema = new mongoose_1.default.Schema({
     items: [String],
     __v: { type: Number, select: false },
 }, { timestamps: true });
-exports.CustomerAPGroupSchema.plugin(mongooseLeanId);
-exports.default = mongoose_1.default.model(_models_1.MODEL_NAMES.customerAPGroups, exports.CustomerAPGroupSchema);
+exports.CustomerAPGroup = mongoose_1.default.model(_models_1.MODEL_NAMES.customerAPGroups, exports.CustomerAPGroupSchema);

package/models/CustomerAPGroup.model.ts

@@ -1,13 +1,28 @@
-import mongoose, { Document } from 'mongoose';
+import mongoose from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 import { IBorrowerGroup } from '../interfaces/group.interface';
 
-const mongooseLeanId = require('../plugins/id.plugin');
+export interface ICustomerAPGroup extends IBorrowerGroup {
+}
+
+export interface ICustomerAPGroupLean extends ICustomerAPGroup {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
 
-interface ICustomerAPGroupDocument extends IBorrowerGroup, Document {
+export interface ICustomerAPGroupPlain extends Omit<ICustomerAPGroup, 'borrowerId'> {
+  _id: string;
+  borrowerId: string;
+  createdAt: Date;
+  updatedAt: Date;
 }
 
+export type TCustomerAPGroupDoc = mongoose.HydratedDocument<ICustomerAPGroup>;
+
+export type TICustomerAPGroupModel = mongoose.Model<ICustomerAPGroup>;
+
 export const CustomerAPGroupSchema = new mongoose.Schema(
   {
     groupName: {
@@ -23,9 +38,7 @@ export const CustomerAPGroupSchema = new mongoose.Schema(
     items: [String],
     __v: { type: Number, select: false },
   },
-  { timestamps: true }
+  { timestamps: true },
 );
 
-CustomerAPGroupSchema.plugin(mongooseLeanId);
-
-export default mongoose.model<ICustomerAPGroupDocument>(MODEL_NAMES.customerAPGroups, CustomerAPGroupSchema);
+export const CustomerAPGroup = mongoose.model<ICustomerAPGroup, TICustomerAPGroupModel>(MODEL_NAMES.customerAPGroups, CustomerAPGroupSchema);

package/models/CustomerGroup.model.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/models" />
 /// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/models" />
 /// <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" />
@@ -26,37 +26,50 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Document } from 'mongoose';
+import mongoose from 'mongoose';
 import { IBorrowerGroup } from '../interfaces/group.interface';
-export interface ICustomerGroupDocument extends IBorrowerGroup, Document {
+export interface ICustomerGroup extends IBorrowerGroup {
+}
+export interface ICustomerGroupLean extends ICustomerGroup {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface ICustomerGroupPlain extends Omit<ICustomerGroup, 'borrowerId'> {
+    _id: string;
+    borrowerId: string;
+    createdAt: Date;
+    updatedAt: Date;
 }
+export type TCustomerGroupDoc = mongoose.HydratedDocument<ICustomerGroup>;
+export type TCustomerGroupModel = mongoose.Model<ICustomerGroup>;
 export declare const CustomerGroupSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
 }, {
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    groupName: string;
     borrowerId: mongoose.Types.ObjectId;
+    groupName: string;
     items: string[];
     __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    groupName: string;
     borrowerId: mongoose.Types.ObjectId;
+    groupName: string;
     items: string[];
     __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    groupName: string;
     borrowerId: mongoose.Types.ObjectId;
+    groupName: string;
     items: string[];
     __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;
-export declare const CustomerGroupModel: mongoose.Model<ICustomerGroupDocument>;
+export declare const CustomerGroup: TCustomerGroupModel;

package/models/CustomerGroup.model.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomerGroupModel = exports.CustomerGroupSchema = void 0;
+exports.CustomerGroup = exports.CustomerGroupSchema = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
 exports.CustomerGroupSchema = new mongoose_1.default.Schema({
@@ -20,4 +20,4 @@ exports.CustomerGroupSchema = new mongoose_1.default.Schema({
     items: [String],
     __v: { type: Number, select: false },
 }, { timestamps: true });
-exports.CustomerGroupModel = mongoose_1.default.model(_models_1.MODEL_NAMES.customerGroups, exports.CustomerGroupSchema);
+exports.CustomerGroup = mongoose_1.default.model(_models_1.MODEL_NAMES.customerGroups, exports.CustomerGroupSchema);

package/models/CustomerGroup.model.ts

@@ -1,11 +1,29 @@
-import mongoose, { Document } from 'mongoose';
+import mongoose from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 import { IBorrowerGroup } from '../interfaces/group.interface';
+import { ICategoryGroup } from './CategoryGroup.model';
 
-export interface ICustomerGroupDocument extends IBorrowerGroup, Document {
+export interface ICustomerGroup extends IBorrowerGroup {
 }
 
+export interface ICustomerGroupLean extends ICustomerGroup {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface ICustomerGroupPlain extends Omit<ICustomerGroup, 'borrowerId'> {
+  _id: string;
+  borrowerId: string;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export type TCustomerGroupDoc = mongoose.HydratedDocument<ICustomerGroup>;
+
+export type TCustomerGroupModel = mongoose.Model<ICustomerGroup>;
+
 export const CustomerGroupSchema = new mongoose.Schema(
   {
     groupName: {
@@ -24,4 +42,4 @@ export const CustomerGroupSchema = new mongoose.Schema(
   { timestamps: true }
 );
 
-export const CustomerGroupModel: mongoose.Model<ICustomerGroupDocument> = mongoose.model<ICustomerGroupDocument>(MODEL_NAMES.customerGroups, CustomerGroupSchema);
+export const CustomerGroup = mongoose.model<ICustomerGroup, TCustomerGroupModel>(MODEL_NAMES.customerGroups, CustomerGroupSchema);

package/models/QueryResult.model.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="mongoose/types/types" />
 /// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/models" />
 /// <reference types="mongoose/types/schemaoptions" />
 /// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/models" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />

package/models/_index.d.ts

@@ -35,8 +35,8 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        order: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
+        order: number;
         apDate: Date;
         amount: number;
         __v?: number;
@@ -49,8 +49,8 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        order: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
+        order: number;
         apDate: Date;
         amount: number;
         __v?: number;
@@ -63,8 +63,8 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        order: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
+        order: number;
         apDate: Date;
         amount: number;
         __v?: number;

package/package.json

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