gemcap-be-common 1.4.3 → 1.4.5

package/db/availability.db.d.ts

@@ -1,6 +1,33 @@
-import { IAvailabilitySignDoc, IAvailabilitySignItem, IAvailabilitySignView } from '../models/AvailabilitySigns.model';
+/// <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 { IAvailabilitySignDoc, IAvailabilitySignItem } from '../models/AvailabilitySigns.model';
 import { IResult } from '../interfaces/result.interface';
 export declare const findAvailabilitySignsByBBCDateId: (bbcDateId: string) => Promise<IAvailabilitySignDoc>;
-export declare const getAvailabilitySigns: (bbcDateIds: string[]) => Promise<IAvailabilitySignView[]>;
+export declare const getAvailabilitySigns: (bbcDateIds: string[]) => Promise<(mongoose.FlattenMaps<IAvailabilitySignDoc> & {
+    _id: mongoose.Types.ObjectId;
+})[]>;
 export declare const addAvailabilitySign: (bbcDateId: string, sign: IAvailabilitySignItem) => Promise<IResult>;
 export declare const updateAvailabilitySigns: (bbcDateId: string, signs: IAvailabilitySignItem[]) => Promise<void>;

package/db/availability.db.js

@@ -6,83 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAvailabilitySigns = exports.addAvailabilitySign = exports.getAvailabilitySigns = exports.findAvailabilitySignsByBBCDateId = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const AvailabilitySigns_model_1 = require("../models/AvailabilitySigns.model");
-const _models_1 = require("../models/_models");
 const findAvailabilitySignsByBBCDateId = async (bbcDateId) => {
     return AvailabilitySigns_model_1.AvailabilitySignsModel.findOne({ bbcDateId: new mongoose_1.default.Types.ObjectId(bbcDateId) }).lean();
 };
 exports.findAvailabilitySignsByBBCDateId = findAvailabilitySignsByBBCDateId;
 const getAvailabilitySigns = async (bbcDateIds) => {
-    return AvailabilitySigns_model_1.AvailabilitySignsModel.aggregate([
-        {
-            $match: {
-                'bbcDateId': { $in: bbcDateIds.map((bbcDateId) => new mongoose_1.default.Types.ObjectId(bbcDateId)) },
-            },
-        }, {
-            $unwind: {
-                path: '$signs',
-                preserveNullAndEmptyArrays: true,
-            },
-        }, {
-            $lookup: {
-                from: _models_1.MODEL_NAMES.users,
-                localField: 'signs.userSignedId',
-                foreignField: '_id',
-                as: 'signs.userSigned',
-            },
-        }, {
-            $lookup: {
-                from: _models_1.MODEL_NAMES.users,
-                localField: 'signs.userRevokedId',
-                foreignField: '_id',
-                as: 'signs.userRevoked',
-            },
-        }, {
-            $unwind: {
-                path: '$signs.userSigned',
-                preserveNullAndEmptyArrays: true,
-            },
-        }, {
-            $unwind: {
-                path: '$signs.userRevoked',
-                preserveNullAndEmptyArrays: true,
-            },
-        }, {
-            $addFields: {
-                'signs.userSigned': {
-                    $ifNull: ['$signs.userSigned', { _id: '$signs.userSignedId' }],
-                },
-            },
-        }, {
-            $addFields: {
-                'signs.userRevoked': {
-                    $ifNull: ['$signs.userRevoked', { _id: '$signs.userRevokedId' }],
-                },
-            },
-        }, {
-            $unset: [
-                'signs.userSignedId',
-                'signs.userRevokedId',
-            ],
-        },
-        {
-            $sort: {
-                'signs.signedAt': 1,
-            },
-        }, {
-            $group: {
-                '_id': '$_id',
-                'bbcDateId': {
-                    $first: '$bbcDateId',
-                },
-                'requiredSigns': {
-                    $first: '$requiredSigns',
-                },
-                'signs': {
-                    $push: '$signs',
-                },
-            },
-        },
-    ]);
+    return AvailabilitySigns_model_1.AvailabilitySignsModel.find({ bbcDateId: { $in: bbcDateIds } }).lean();
 };
 exports.getAvailabilitySigns = getAvailabilitySigns;
 const addAvailabilitySign = async (bbcDateId, sign) => {

package/db/availability.db.ts

@@ -4,89 +4,15 @@ import {
   AvailabilitySignsModel,
   IAvailabilitySignDoc,
   IAvailabilitySignItem,
-  IAvailabilitySignView,
 } from '../models/AvailabilitySigns.model';
 import { IResult } from '../interfaces/result.interface';
-import { MODEL_NAMES } from '../models/_models';
 
 export const findAvailabilitySignsByBBCDateId = async (bbcDateId: string): Promise<IAvailabilitySignDoc> => {
   return AvailabilitySignsModel.findOne({ bbcDateId: new mongoose.Types.ObjectId(bbcDateId) }).lean();
 };
 
 export const getAvailabilitySigns = async (bbcDateIds: string[]) => {
-  return AvailabilitySignsModel.aggregate<IAvailabilitySignView>([
-    {
-      $match: {
-        'bbcDateId': { $in: bbcDateIds.map((bbcDateId) => new mongoose.Types.ObjectId(bbcDateId)) },
-      },
-    }, {
-      $unwind: {
-        path: '$signs',
-        preserveNullAndEmptyArrays: true,
-      },
-    }, {
-      $lookup: {
-        from: MODEL_NAMES.users,
-        localField: 'signs.userSignedId',
-        foreignField: '_id',
-        as: 'signs.userSigned',
-      },
-    }, {
-      $lookup:
-        {
-          from: MODEL_NAMES.users,
-          localField: 'signs.userRevokedId',
-          foreignField: '_id',
-          as: 'signs.userRevoked',
-        },
-    }, {
-      $unwind: {
-        path: '$signs.userSigned',
-        preserveNullAndEmptyArrays: true,
-      },
-    }, {
-      $unwind: {
-        path: '$signs.userRevoked',
-        preserveNullAndEmptyArrays: true,
-      },
-    }, {
-      $addFields: {
-        'signs.userSigned': {
-          $ifNull: ['$signs.userSigned', { _id: '$signs.userSignedId' }],
-        },
-      },
-    }, {
-      $addFields: {
-        'signs.userRevoked': {
-          $ifNull: ['$signs.userRevoked', { _id: '$signs.userRevokedId' }],
-        },
-      },
-    }, {
-      $unset: [
-        'signs.userSignedId',
-        'signs.userRevokedId',
-      ],
-    },
-    {
-      $sort:
-        {
-          'signs.signedAt': 1,
-        },
-    }, {
-      $group: {
-        '_id': '$_id',
-        'bbcDateId': {
-          $first: '$bbcDateId',
-        },
-        'requiredSigns': {
-          $first: '$requiredSigns',
-        },
-        'signs': {
-          $push: '$signs',
-        },
-      },
-    },
-  ]);
+  return AvailabilitySignsModel.find({ bbcDateId: { $in: bbcDateIds } }).lean();
 };
 
 export const addAvailabilitySign = async (bbcDateId: string, sign: IAvailabilitySignItem): Promise<IResult> => {

package/models/AccountPayableItem.model.d.ts

@@ -43,10 +43,10 @@ export declare const AccountPayableItemSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    amount: number;
     order: number;
     bbcSheetId: mongoose.Types.ObjectId;
     apDate: Date;
-    amount: number;
     __v?: number;
     poNumber?: string;
     customerName?: string;
@@ -57,10 +57,10 @@ export declare const AccountPayableItemSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    amount: number;
     order: number;
     bbcSheetId: mongoose.Types.ObjectId;
     apDate: Date;
-    amount: number;
     __v?: number;
     poNumber?: string;
     customerName?: string;
@@ -71,10 +71,10 @@ export declare const AccountPayableItemSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    amount: number;
     order: number;
     bbcSheetId: mongoose.Types.ObjectId;
     apDate: Date;
-    amount: number;
     __v?: number;
     poNumber?: string;
     customerName?: string;

package/models/AvailabilitySigns.model.d.ts

@@ -31,6 +31,13 @@ export interface IAvailabilitySignItem {
     userRevokedId?: string;
     revokedAt?: Date;
 }
+export interface IAvailabilitySignItemPreView {
+    _id: mongoose.Types.ObjectId;
+    userSignedId: string;
+    signedAt: Date;
+    userRevokedId?: string;
+    revokedAt?: Date;
+}
 export interface IAvailabilitySignItemView {
     _id: mongoose.Types.ObjectId;
     userSigned: IUser;
@@ -43,6 +50,12 @@ export interface IAvailabilitySign {
     requiredSigns: number;
     signs: IAvailabilitySignItem[];
 }
+export interface IAvailabilitySignPreView {
+    _id: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
+    requiredSigns: number;
+    signs: IAvailabilitySignItemPreView[];
+}
 export interface IAvailabilitySignView {
     _id: mongoose.Types.ObjectId;
     bbcDateId: mongoose.Types.ObjectId;

package/models/AvailabilitySigns.model.ts

@@ -14,6 +14,14 @@ export interface IAvailabilitySignItem {
   revokedAt?: Date;
 }
 
+export interface IAvailabilitySignItemPreView {
+  _id: mongoose.Types.ObjectId;
+  userSignedId: string;
+  signedAt: Date;
+  userRevokedId?: string;
+  revokedAt?: Date;
+}
+
 export interface IAvailabilitySignItemView {
   _id: mongoose.Types.ObjectId;
   userSigned: IUser;
@@ -28,6 +36,13 @@ export interface IAvailabilitySign {
   signs: IAvailabilitySignItem[];
 }
 
+export interface IAvailabilitySignPreView {
+  _id: mongoose.Types.ObjectId;
+  bbcDateId: mongoose.Types.ObjectId;
+  requiredSigns: number;
+  signs: IAvailabilitySignItemPreView[];
+}
+
 export interface IAvailabilitySignView {
   _id: mongoose.Types.ObjectId;
   bbcDateId: mongoose.Types.ObjectId;

package/models/BBCSheet.model.d.ts

@@ -27,7 +27,7 @@ import { IBBCDate } from './BBCDate.model';
 export interface IBBCSheet {
     bbcDateId: mongoose.Types.ObjectId;
     dataType: string;
-    uploadUser: mongoose.Types.ObjectId;
+    uploadUser: string;
     fileHash: string;
     fileName: string;
     sheetName: string;
@@ -48,7 +48,7 @@ export declare const BBCSheetSchema: mongoose.Schema<any, mongoose.Model<any, an
     dataType: string;
     __v?: number;
     comment?: string;
-    uploadUser?: mongoose.Types.ObjectId;
+    uploadUser?: string;
     fileHash?: string;
     fileName?: string;
     sheetName?: string;
@@ -60,7 +60,7 @@ export declare const BBCSheetSchema: mongoose.Schema<any, mongoose.Model<any, an
     dataType: string;
     __v?: number;
     comment?: string;
-    uploadUser?: mongoose.Types.ObjectId;
+    uploadUser?: string;
     fileHash?: string;
     fileName?: string;
     sheetName?: string;
@@ -72,7 +72,7 @@ export declare const BBCSheetSchema: mongoose.Schema<any, mongoose.Model<any, an
     dataType: string;
     __v?: number;
     comment?: string;
-    uploadUser?: mongoose.Types.ObjectId;
+    uploadUser?: string;
     fileHash?: string;
     fileName?: string;
     sheetName?: string;

package/models/BBCSheet.model.js

@@ -22,8 +22,7 @@ exports.BBCSheetSchema = new mongoose_1.default.Schema({
         trim: true,
     },
     uploadUser: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
     },
     fileHash: {
         type: String,

package/models/BBCSheet.model.ts

@@ -11,7 +11,7 @@ const mongooseLeanId = require('../plugins/id.plugin');
 export interface IBBCSheet {
   bbcDateId: mongoose.Types.ObjectId;
   dataType: string;
-  uploadUser: mongoose.Types.ObjectId;
+  uploadUser: string;
   fileHash: string;
   fileName: string;
   sheetName: string;
@@ -38,8 +38,7 @@ export const BBCSheetSchema = new mongoose.Schema(
       trim: true,
     },
     uploadUser: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
     },
     fileHash: {
       type: String,

package/models/BorrowerCompliance.model.d.ts

@@ -92,7 +92,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
                 fileId: string;
                 isFileNew?: boolean;
                 uploadedAt?: Date;
-                uploadedBy?: mongoose.Types.ObjectId;
+                uploadedBy?: string;
             }>;
             nextDate?: Date;
             submittedDate?: Date;
@@ -153,7 +153,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
                 fileId: string;
                 isFileNew?: boolean;
                 uploadedAt?: Date;
-                uploadedBy?: mongoose.Types.ObjectId;
+                uploadedBy?: string;
             }>;
             nextDate?: Date;
             submittedDate?: Date;
@@ -214,7 +214,7 @@ export declare const BorrowerComplianceSchema: mongoose.Schema<any, mongoose.Mod
                 fileId: string;
                 isFileNew?: boolean;
                 uploadedAt?: Date;
-                uploadedBy?: mongoose.Types.ObjectId;
+                uploadedBy?: string;
             }>;
             nextDate?: Date;
             submittedDate?: Date;

package/models/BorrowerCompliance.model.js

@@ -42,8 +42,7 @@ const BorrowerComplianceInstanceSchema = new mongoose_1.default.Schema({
                 required: false,
             },
             uploadedBy: {
-                type: mongoose_1.default.Schema.Types.ObjectId,
-                ref: _models_1.MODEL_NAMES.users,
+                type: String,
                 required: false,
             },
         }]

package/models/BorrowerCompliance.model.ts

@@ -69,8 +69,7 @@ const BorrowerComplianceInstanceSchema = new mongoose.Schema({
       required: false,
     },
     uploadedBy: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
       required: false,
     },
   }]

package/models/Globals.model.d.ts

@@ -26,7 +26,7 @@ import mongoose, { Document } from 'mongoose';
 export interface IGlobals {
     setting: string;
     value: any;
-    userID: mongoose.Types.ObjectId;
+    userID: string;
 }
 export interface IGlobalsDoc extends IGlobals, Document {
 }
@@ -39,7 +39,7 @@ export declare const GlobalsSchema: mongoose.Schema<any, mongoose.Model<any, any
     value: any;
     setting: string;
     __v?: number;
-    userID?: mongoose.Types.ObjectId;
+    userID?: string;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
@@ -47,7 +47,7 @@ export declare const GlobalsSchema: mongoose.Schema<any, mongoose.Model<any, any
     value: any;
     setting: string;
     __v?: number;
-    userID?: mongoose.Types.ObjectId;
+    userID?: string;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
@@ -55,7 +55,7 @@ export declare const GlobalsSchema: mongoose.Schema<any, mongoose.Model<any, any
     value: any;
     setting: string;
     __v?: number;
-    userID?: mongoose.Types.ObjectId;
+    userID?: string;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/Globals.model.js

@@ -16,8 +16,7 @@ exports.GlobalsSchema = new mongoose_1.default.Schema({
         required: true,
     },
     userID: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
     },
     __v: { type: Number, select: false },
 }, { timestamps: true });

package/models/Globals.model.ts

@@ -5,7 +5,7 @@ import { MODEL_NAMES } from './_models';
 export interface IGlobals {
   setting: string;
   value: any;
-  userID: mongoose.Types.ObjectId;
+  userID: string;
 }
 
 export interface IGlobalsDoc extends IGlobals, Document {
@@ -22,8 +22,7 @@ export const GlobalsSchema = new mongoose.Schema(
       required: true,
     },
     userID: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
     },
     __v: { type: Number, select: false },
   },

package/models/InventoryItem.model.d.ts

@@ -72,8 +72,8 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     updatedAt: NativeDate;
 } & {
     order: number;
-    bbcSheetId: mongoose.Types.ObjectId;
     value: number;
+    bbcSheetId: mongoose.Types.ObjectId;
     skuDate: Date;
     category: string;
     sku: string;
@@ -94,8 +94,8 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     updatedAt: NativeDate;
 } & {
     order: number;
-    bbcSheetId: mongoose.Types.ObjectId;
     value: number;
+    bbcSheetId: mongoose.Types.ObjectId;
     skuDate: Date;
     category: string;
     sku: string;
@@ -116,8 +116,8 @@ export declare const InventoryItemSchema: mongoose.Schema<any, mongoose.Model<an
     updatedAt: NativeDate;
 } & {
     order: number;
-    bbcSheetId: mongoose.Types.ObjectId;
     value: number;
+    bbcSheetId: mongoose.Types.ObjectId;
     skuDate: Date;
     category: string;
     sku: string;

package/models/LoanStatementTransaction.model.d.ts

@@ -40,7 +40,7 @@ export interface ILoanStatementTransaction {
     isSystem: boolean;
     memo: string;
     settlementCode?: string;
-    userId?: mongoose.Types.ObjectId;
+    userId?: string;
     isEditable?: boolean;
 }
 export interface ILoanStatementTransactionWithId extends ILoanStatementTransaction {
@@ -59,46 +59,46 @@ export declare const LoanStatementSchema: mongoose.Schema<any, mongoose.Model<an
     updatedAt: NativeDate;
 } & {
     date: Date;
-    order: number;
     amount: number;
+    order: number;
     chargeId: mongoose.Types.ObjectId;
     isSystem: boolean;
+    balance?: number;
+    userId?: string;
     __v?: number;
     memo?: string;
     settlementCode?: string;
     amountPaid?: number;
-    balance?: number;
-    userId?: mongoose.Types.ObjectId;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
     date: Date;
-    order: number;
     amount: number;
+    order: number;
     chargeId: mongoose.Types.ObjectId;
     isSystem: boolean;
+    balance?: number;
+    userId?: string;
     __v?: number;
     memo?: string;
     settlementCode?: string;
     amountPaid?: number;
-    balance?: number;
-    userId?: mongoose.Types.ObjectId;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
     date: Date;
-    order: number;
     amount: number;
+    order: number;
     chargeId: mongoose.Types.ObjectId;
     isSystem: boolean;
+    balance?: number;
+    userId?: string;
     __v?: number;
     memo?: string;
     settlementCode?: string;
     amountPaid?: number;
-    balance?: number;
-    userId?: mongoose.Types.ObjectId;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/LoanStatementTransaction.model.js

@@ -55,8 +55,7 @@ exports.LoanStatementSchema = new mongoose_1.default.Schema({
         type: String,
     },
     userId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
         required: false,
     },
     __v: { type: Number, select: false },

package/models/LoanStatementTransaction.model.ts

@@ -31,7 +31,7 @@ export interface ILoanStatementTransaction {
   isSystem: boolean;
   memo: string;
   settlementCode?: string;
-  userId?: mongoose.Types.ObjectId;
+  userId?: string;
   isEditable?: boolean;
 }
 
@@ -87,8 +87,7 @@ export const LoanStatementSchema = new mongoose.Schema(
       type: String,
     },
     userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
       required: false,
     },
     __v: { type: Number, select: false },

package/models/LoanTransaction.model.d.ts

@@ -56,7 +56,7 @@ export interface ILoanTransaction {
     balance: number;
     floatedBalance: number;
     loanPaymentId?: mongoose.Types.ObjectId;
-    userId?: mongoose.Types.ObjectId;
+    userId?: string;
     isSent?: boolean;
 }
 export interface ILoanTransactionDocWithProduct extends ILoanTransactionDoc {

package/models/LoanTransaction.model.js

@@ -41,8 +41,7 @@ exports.LOAN_TRANSACTION_FIELDS = [
 ];
 exports.LoanTransactionSchema = new mongoose_1.default.Schema({
     userId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: _models_1.MODEL_NAMES.users,
+        type: String,
         required: false,
     },
     order: {

package/models/LoanTransaction.model.ts

@@ -64,7 +64,7 @@ export interface ILoanTransaction {
   balance: number;
   floatedBalance: number;
   loanPaymentId?: mongoose.Types.ObjectId;
-  userId?: mongoose.Types.ObjectId;
+  userId?: string;
   isSent?: boolean;
 }
 
@@ -99,8 +99,7 @@ export interface ITransactionsFilter {
 export const LoanTransactionSchema = new mongoose.Schema<ILoanTransactionDoc, ILoanTransactionModel>(
   {
     userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: MODEL_NAMES.users,
+      type: String,
       required: false,
     },
     order: {