gemcap-be-common 1.4.66 → 1.4.67

package/helpers/main.helper.d.ts

@@ -26,7 +26,6 @@ import mongoose from 'mongoose';
 import Joi from 'joi';
 export type TDictionary = Record<string, string | object>;
 export declare const fieldsToUnset: string[];
-export declare function removeFields<T extends object>(document: T, fieldsToUnset: string[]): T;
-export declare function removeFields<T extends mongoose.Document>(document: T, fieldsToUnset: string[]): T;
+export declare const removeFields: <T>(document: mongoose.Document, fieldsToUnset: string[]) => T;
 export declare const replaceErrors: (error: Joi.ValidationError, dictionary: TDictionary) => string;
 export declare const getUUID: () => string;

package/helpers/main.helper.js

@@ -32,13 +32,14 @@ const deepCloneAndConvertMaps = (obj) => {
     }
     return obj;
 };
-function removeFields(document, fieldsToUnset) {
-    const plainObject = typeof document.toObject === 'function'
-        ? document.toObject()
-        : deepCloneAndConvertMaps(document);
-    fieldsToUnset.forEach((field) => delete plainObject[field]);
-    return deepCloneAndConvertMaps(plainObject);
-}
+const removeFields = (document, fieldsToUnset) => {
+    return document.toObject({
+        transform: (_doc, ret) => {
+            fieldsToUnset.forEach((field) => delete ret[field]);
+            return deepCloneAndConvertMaps(ret);
+        },
+    });
+};
 exports.removeFields = removeFields;
 const replaceErrors = (error, dictionary) => {
     const getValue = (d, keys) => {

package/helpers/main.helper.ts

@@ -32,18 +32,14 @@ const deepCloneAndConvertMaps = <T>(obj: T): T => {
   return obj;
 };
 
-export function removeFields<T extends object>(document: T, fieldsToUnset: string[]): T;
-export function removeFields<T extends mongoose.Document>(document: T, fieldsToUnset: string[]): T;
-export function removeFields<T>(document: any, fieldsToUnset: string[]): T {
-  const plainObject =
-    typeof document.toObject === 'function'
-      ? document.toObject()
-      : deepCloneAndConvertMaps(document);
-
-  fieldsToUnset.forEach((field) => delete plainObject[field]);
-
-  return deepCloneAndConvertMaps(plainObject) as T;
-}
+export const removeFields = <T>(document: mongoose.Document, fieldsToUnset: string[]): T => {
+  return document.toObject({
+    transform: (_doc, ret) => {
+      fieldsToUnset.forEach((field) => delete ret[field]);
+      return deepCloneAndConvertMaps(ret) as Omit<T, keyof T>;
+    },
+  });
+};
 
 export const replaceErrors = (error: Joi.ValidationError, dictionary: TDictionary) => {
   const getValue = (d: TDictionary, keys: string[]): string => {

package/models/Company.model.d.ts

@@ -25,6 +25,7 @@
 import mongoose, { Model } from 'mongoose';
 export interface ICompany {
     name: string;
+    order: number;
     isDeleted?: boolean;
 }
 export interface ICompanyDoc extends ICompany, Document {

package/models/Company.model.js

@@ -12,6 +12,10 @@ exports.CompanySchema = new mongoose_1.default.Schema({
         required: true,
         trim: true,
     },
+    order: {
+        type: Number,
+        required: true,
+    },
     isDeleted: {
         type: Boolean,
     },

package/models/Company.model.ts

@@ -4,6 +4,7 @@ import { MODEL_NAMES } from './_models';
 
 export interface ICompany {
   name: string;
+  order: number;
   isDeleted?: boolean;
 }
 
@@ -34,6 +35,10 @@ export const CompanySchema = new mongoose.Schema<ICompany, CompanyModel>(
       required: true,
       trim: true,
     },
+    order: {
+      type: Number,
+      required: true,
+    },
     isDeleted: {
       type: Boolean,
     },

package/package.json

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

package/services/companies.service.js

@@ -2,15 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompaniesService = void 0;
 const Company_model_1 = require("../models/Company.model");
-const main_helper_1 = require("../helpers/main.helper");
 class CompaniesService {
     async getCompanies() {
-        const companies = await Company_model_1.Company
+        return Company_model_1.Company
             .find({ isDeleted: { $ne: true } })
-            .sort({ name: 1 })
+            .sort({ order: 1, name: 1 })
             .lean()
             .exec();
-        return companies.map((i) => (0, main_helper_1.removeFields)(i, main_helper_1.fieldsToUnset));
     }
 }
 exports.CompaniesService = CompaniesService;

package/services/companies.service.ts

@@ -3,11 +3,10 @@ import { fieldsToUnset, removeFields } from '../helpers/main.helper';
 
 export class CompaniesService {
   async getCompanies() {
-    const companies = await Company
+    return Company
       .find({ isDeleted: { $ne: true } })
-      .sort({ name: 1 })
+      .sort({ order: 1, name: 1 })
       .lean<ICompanyLean[]>()
       .exec();
-    return companies.map((i) => removeFields(i, fieldsToUnset));
   }
 }