gemcap-be-common 1.4.24 → 1.4.26

package/db/microservice-tasks.db.d.ts

@@ -1,31 +1,6 @@
-/// <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 { EMicroserviceTask } from '../enums/microservice-task.enum';
 import { IMicroserviceTaskDoc } from '../models/MicroserviceTask.model';
-export declare const createMicroserviceTasks: (cmd: EMicroserviceTask, params: any, executeAt?: Date, userId?: mongoose.Types.ObjectId) => Promise<void>;
+export declare const createMicroserviceTasks: (cmd: EMicroserviceTask, params: any, executeAt?: Date, userId?: string) => Promise<void>;
 export declare const findFirstTask: () => Promise<IMicroserviceTaskDoc>;
 export declare const getAllTasks: () => Promise<IMicroserviceTaskDoc[]>;
 export declare const deleteTask: (taskId: string) => Promise<void>;

package/db/microservice-tasks.db.ts

@@ -1,10 +1,8 @@
-import mongoose from 'mongoose';
-
 import { EMicroserviceTask } from '../enums/microservice-task.enum';
 import { IMicroserviceTaskDoc, MicroserviceTaskModel } from '../models/MicroserviceTask.model';
 import { EMicroserviceTaskStatuses } from '../enums/microservice-task-statuses.enum';
 
-export const createMicroserviceTasks = async (cmd: EMicroserviceTask, params: any, executeAt: Date = new Date(), userId?: mongoose.Types.ObjectId): Promise<void> => {
+export const createMicroserviceTasks = async (cmd: EMicroserviceTask, params: any, executeAt: Date = new Date(), userId?: string): Promise<void> => {
   const tasks = await MicroserviceTaskModel.find({ cmd, params, status: EMicroserviceTaskStatuses.SCHEDULED });
   if (!tasks.length) {
     const newTask = await MicroserviceTaskModel.create({

package/db/user-logs.db.js

@@ -24,7 +24,13 @@ const createLog = async (params) => {
         recordId: params.recordId,
         recordCollection: params.recordCollection,
     });
-    await newUserLog.save();
+    try {
+        await newUserLog.save();
+    }
+    catch (e) {
+        console.error(`incorrect log`, newUserLog, e);
+        throw e;
+    }
 };
 exports.createLog = createLog;
 const getLogChanges = (obj1, obj2) => {

package/db/user-logs.db.ts

@@ -33,7 +33,12 @@ export const createLog = async (params: ICreateLogParams) => {
     recordId: params.recordId,
     recordCollection: params.recordCollection,
   });
-  await newUserLog.save();
+  try {
+    await newUserLog.save();
+  } catch (e) {
+    console.error(`incorrect log`, newUserLog, e );
+    throw e;
+  }
 }
 
 export const getLogChanges = (obj1: Object, obj2: Object) => {

package/models/_index.d.ts

@@ -31,10 +31,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
+        amount: number;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -45,10 +45,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
+        amount: number;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -59,10 +59,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
+        amount: number;
         order: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
-        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;

package/package.json

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

package/services/uploads.service.js

@@ -408,7 +408,7 @@ class UploadsService {
                         const params = {
                             borrowerId: new mongoose_1.default.Types.ObjectId(borrowerId),
                             bbcDateId,
-                            userId: new mongoose_1.default.Types.ObjectId(userId),
+                            userId,
                         };
                         await (0, microservice_tasks_db_1.createMicroserviceTasks)(microservice_task_enum_1.EMicroserviceTask.POST_UPLOAD, params);
                     }
@@ -426,6 +426,7 @@ class UploadsService {
         }
         catch (e) {
             console.error({ e });
+            return { success: false, message: 'Error while uploading', data: null };
         }
     }
     async prepareData(mapData) {

package/services/uploads.service.ts

@@ -460,7 +460,7 @@ export class UploadsService {
             const params = {
               borrowerId: new mongoose.Types.ObjectId(borrowerId),
               bbcDateId,
-              userId: new mongoose.Types.ObjectId(userId),
+              userId,
             };
             await createMicroserviceTasks(EMicroserviceTask.POST_UPLOAD, params);
           }
@@ -477,6 +477,7 @@ export class UploadsService {
       return { success: true, message: 'Successfully uploaded', data: { taskId } };
     } catch (e) {
       console.error({ e });
+      return { success: false, message: 'Error while uploading', data: null };
     }
   }