gemcap-be-common 1.4.1 → 1.4.3

package/db/collaterals.db.d.ts

@@ -75,7 +75,7 @@ export declare const createQuery: (groupFields: {
         };
     };
     itemQueries: any;
-    enumKey: "INVENTORY" | "OTHER" | "RECEIVABLE" | "ACCOUNT_PAYABLE" | "CASH" | "LOAN_TRANSACTIONS" | "QUICKBOOKS" | "UPLOADED_BANK_TRANSACTIONS";
+    enumKey: "INVENTORY" | "RECEIVABLE" | "ACCOUNT_PAYABLE" | "OTHER" | "CASH" | "LOAN_TRANSACTIONS" | "QUICKBOOKS" | "UPLOADED_BANK_TRANSACTIONS";
 };
 export declare const ITEMS_PAGINATION: (paginatorOptions: IPaginatorOptions) => ({
     $skip: number;

package/interfaces/auth-user.interface.d.ts

@@ -19,3 +19,10 @@ export interface IUser extends IUserBasic {
     borrowersAccess?: string[];
     lastLogin?: Date | null;
 }
+export interface IRole {
+    id: string;
+    name: string;
+    representation: string;
+    createdAt?: Date;
+    updatedAt?: Date;
+}

package/interfaces/auth-user.interface.ts

@@ -20,3 +20,11 @@ export interface IUser extends IUserBasic {
   borrowersAccess?: string[];
   lastLogin?: Date | null;
 }
+
+export interface IRole {
+  id: string;
+  name: string;
+  representation: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+}

package/models/AvailabilitySigns.model.d.ts

@@ -23,19 +23,19 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose from 'mongoose';
-import { IUserLegacyDoc } from './User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 export declare const REQUIRED_SIGNS = 2;
 export interface IAvailabilitySignItem {
-    userSignedId: mongoose.Types.ObjectId;
+    userSignedId: string;
     signedAt: Date;
-    userRevokedId?: mongoose.Types.ObjectId;
+    userRevokedId?: string;
     revokedAt?: Date;
 }
 export interface IAvailabilitySignItemView {
     _id: mongoose.Types.ObjectId;
-    userSigned: IUserLegacyDoc;
+    userSigned: IUser;
     signedAt: Date;
-    userRevoked?: IUserLegacyDoc;
+    userRevoked?: IUser;
     revokedAt?: Date;
 }
 export interface IAvailabilitySign {
@@ -60,9 +60,9 @@ export declare const IAvailabilitySignSchema: mongoose.Schema<any, mongoose.Mode
     bbcDateId: mongoose.Types.ObjectId;
     requiredSigns: number;
     signs: mongoose.Types.DocumentArray<{
-        userSignedId: mongoose.Types.ObjectId;
+        userSignedId: string;
         signedAt: Date;
-        userRevokedId?: mongoose.Types.ObjectId;
+        userRevokedId?: string;
         revokedAt?: Date;
     }>;
     __v?: number;
@@ -73,9 +73,9 @@ export declare const IAvailabilitySignSchema: mongoose.Schema<any, mongoose.Mode
     bbcDateId: mongoose.Types.ObjectId;
     requiredSigns: number;
     signs: mongoose.Types.DocumentArray<{
-        userSignedId: mongoose.Types.ObjectId;
+        userSignedId: string;
         signedAt: Date;
-        userRevokedId?: mongoose.Types.ObjectId;
+        userRevokedId?: string;
         revokedAt?: Date;
     }>;
     __v?: number;
@@ -86,9 +86,9 @@ export declare const IAvailabilitySignSchema: mongoose.Schema<any, mongoose.Mode
     bbcDateId: mongoose.Types.ObjectId;
     requiredSigns: number;
     signs: mongoose.Types.DocumentArray<{
-        userSignedId: mongoose.Types.ObjectId;
+        userSignedId: string;
         signedAt: Date;
-        userRevokedId?: mongoose.Types.ObjectId;
+        userRevokedId?: string;
         revokedAt?: Date;
     }>;
     __v?: number;

package/models/AvailabilitySigns.model.js

@@ -22,8 +22,7 @@ exports.IAvailabilitySignSchema = new mongoose_1.default.Schema({
     signs: [
         {
             userSignedId: {
-                type: mongoose_1.default.Schema.Types.ObjectId,
-                ref: _models_1.MODEL_NAMES.users,
+                type: String,
                 required: true,
             },
             signedAt: {
@@ -31,8 +30,7 @@ exports.IAvailabilitySignSchema = new mongoose_1.default.Schema({
                 required: true,
             },
             userRevokedId: {
-                type: mongoose_1.default.Schema.Types.ObjectId,
-                ref: _models_1.MODEL_NAMES.users,
+                type: String,
                 required: false,
             },
             revokedAt: {

package/models/AvailabilitySigns.model.ts

@@ -1,6 +1,6 @@
 import mongoose from 'mongoose';
 
-import { IUserLegacyDoc } from './User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { MODEL_NAMES } from './_models';
 
 const mongooseLeanId = require('../plugins/id.plugin');
@@ -8,17 +8,17 @@ const mongooseLeanId = require('../plugins/id.plugin');
 export const REQUIRED_SIGNS = 2;
 
 export interface IAvailabilitySignItem {
-  userSignedId: mongoose.Types.ObjectId;
+  userSignedId: string;
   signedAt: Date;
-  userRevokedId?: mongoose.Types.ObjectId;
+  userRevokedId?: string;
   revokedAt?: Date;
 }
 
 export interface IAvailabilitySignItemView {
   _id: mongoose.Types.ObjectId;
-  userSigned: IUserLegacyDoc;
+  userSigned: IUser;
   signedAt: Date;
-  userRevoked?: IUserLegacyDoc;
+  userRevoked?: IUser;
   revokedAt?: Date;
 }
 
@@ -53,8 +53,7 @@ export const IAvailabilitySignSchema = new mongoose.Schema(
     signs: [
       {
         userSignedId: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: MODEL_NAMES.users,
+          type: String,
           required: true,
         },
         signedAt: {
@@ -62,8 +61,7 @@ export const IAvailabilitySignSchema = new mongoose.Schema(
           required: true,
         },
         userRevokedId: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: MODEL_NAMES.users,
+          type: String,
           required: false,
         },
         revokedAt: {

package/models/ReceivableAvailability.model.d.ts

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from 'mongoose';
 import { IReceivableAvailabilityItem, IReceivableAvailabilityItemView } from './ReceivableAvailabilityItem.model';
-import { IUserLegacyDoc } from './User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { SummaryMultipliers } from './ReceivableAvailabilityManualSummary.model';
 export declare enum ELimitSettings {
     EXCLUDED_CUSTOMERS = "excludedCustomers",
@@ -94,7 +94,7 @@ export interface IReceivableAvailabilityView extends IReceivableAvailabilityDoc
     items: IReceivableAvailabilityItemView[];
     uniqueCustomers: string[];
     totalItems: number;
-    userCalculated?: IUserLegacyDoc;
+    userCalculated?: IUser;
 }
 export declare const summarySchemeDesc: {
     invoiceAmount: {
@@ -184,13 +184,12 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        ARReserves: number;
         grossAR: number;
         balanceAfterCrossAge: number;
         permittedOver: number;
@@ -208,6 +207,7 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         insuredAvailability: number;
         uninsuredAvailability: number;
         creditNotesNegative: number;
+        ARReserves: number;
         ARAvailability: number;
     };
     userCalculatedId?: mongoose.Types.ObjectId;
@@ -244,13 +244,12 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        ARReserves: number;
         grossAR: number;
         balanceAfterCrossAge: number;
         permittedOver: number;
@@ -268,6 +267,7 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         insuredAvailability: number;
         uninsuredAvailability: number;
         creditNotesNegative: number;
+        ARReserves: number;
         ARAvailability: number;
     };
     userCalculatedId?: mongoose.Types.ObjectId;
@@ -304,13 +304,12 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcDateId: mongoose.Types.ObjectId;
     borrowerId: mongoose.Types.ObjectId;
+    bbcDateId: mongoose.Types.ObjectId;
     useManualInputs: boolean;
     __v?: number;
     summary?: {
         invoiceAmount: number;
-        ARReserves: number;
         grossAR: number;
         balanceAfterCrossAge: number;
         permittedOver: number;
@@ -328,6 +327,7 @@ export declare const AvailabilitySchema: mongoose.Schema<any, mongoose.Model<any
         insuredAvailability: number;
         uninsuredAvailability: number;
         creditNotesNegative: number;
+        ARReserves: number;
         ARAvailability: number;
     };
     userCalculatedId?: mongoose.Types.ObjectId;

package/models/ReceivableAvailability.model.ts

@@ -1,7 +1,7 @@
 import mongoose, { Document } from 'mongoose';
 
 import { IReceivableAvailabilityItem, IReceivableAvailabilityItemView } from './ReceivableAvailabilityItem.model';
-import { IUserLegacyDoc } from './User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { MODEL_NAMES } from './_models';
 import { SummaryMultipliers } from './ReceivableAvailabilityManualSummary.model';
 
@@ -83,7 +83,7 @@ export interface IReceivableAvailabilityView extends IReceivableAvailabilityDoc
   items: IReceivableAvailabilityItemView[];
   uniqueCustomers: string[];
   totalItems: number;
-  userCalculated?: IUserLegacyDoc;
+  userCalculated?: IUser;
 }
 
 export const summarySchemeDesc = {

package/models/_index.d.ts

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

package/package.json

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

package/services/availability.service.d.ts

@@ -1,5 +1,5 @@
 import { ELimitSettings, IReceivableAvailability, IAvailabilityLimits, IAvailabilitySettings, IAvailabilitySummary, IReceivableAvailabilityView } from '../models/ReceivableAvailability.model';
-import { IUserLegacyDoc } from '../models/User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { IReceivableAvailabilityItemView } from '../models/ReceivableAvailabilityItem.model';
 import { IPaginatorOptions } from '../interfaces/collaterals.interface';
 import { IInventoryAvailabilitySummary, InventoryAvailabilityPaginators } from '../models/InventoryAvailability.model';
@@ -49,14 +49,14 @@ export declare class AvailabilityService {
     private readonly signsService;
     constructor(collateralAdjustmentsService: CollateralAdjustmentsService, collateralsService: CollateralsService, equipmentService: EquipmentService, inventoryAvailabilityService: InventoryAvailabilityService, loanStatementService: LoanStatementService, loanTransactionsService: LoanTransactionsService, manualEntryService: ManualEntryService, reserveService: ReserveService, signsService: SignsService);
     recombineGroups(calculationsSettings: IAvailabilitySettings): Promise<IMappedSettings>;
-    calculateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserLegacyDoc): Promise<IReceivableAvailabilityView>;
-    getAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserLegacyDoc): Promise<IReceivableAvailabilityView>;
+    calculateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser): Promise<IReceivableAvailabilityView>;
+    getAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser): Promise<IReceivableAvailabilityView>;
     getAvailabilityItemsWithFilter(bbcDateId: string, itemsFilter: string): Promise<{
         itemsFilter: any;
         invoiceItems: any[];
         customerItems: any[];
     }>;
-    foundOrCreateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserLegacyDoc): Promise<IReceivableAvailabilityView>;
+    foundOrCreateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser): Promise<IReceivableAvailabilityView>;
     findCalculatedAvailability(bbcDateId: string): Promise<IReceivableAvailabilityView>;
     saveCalculatedAvailabilitySettings(bbcDateId: string, settings: IAvailabilitySettings): Promise<void>;
     saveLimitSettings(bbcDateId: string, limitSettings: {
@@ -70,7 +70,7 @@ export declare class AvailabilityService {
     getUniqueCustomers(availabilityId: string): Promise<{
         customerTitle: string;
     }[]>;
-    getAllSummaries(bbcDateId: string, user: IUserLegacyDoc): Promise<IAvailabilityFullSummary>;
+    getAllSummaries(bbcDateId: string, user: IUser): Promise<IAvailabilityFullSummary>;
     isBBCEditable(bbcDateId: string): Promise<boolean>;
     toggleManualReceivableAvailability(bbcDateId: string, useManualInputs: boolean): Promise<void>;
 }

package/services/availability.service.js

@@ -91,7 +91,7 @@ class AvailabilityService {
         const calculation = {
             borrowerId: null,
             bbcDateId: new mongoose_1.default.Types.ObjectId(bbcDateId),
-            userCalculatedId: user?._id ? new mongoose_1.default.Types.ObjectId(String(user._id)) : null,
+            userCalculatedId: user?.id ? new mongoose_1.default.Types.ObjectId(String(user.id)) : null,
             calculatedAt: new Date(),
             actual: true,
             settings: calculationsSettings,

package/services/availability.service.ts

@@ -14,7 +14,7 @@ import {
   IAvailabilitySummary,
   IReceivableAvailabilityView,
 } from '../models/ReceivableAvailability.model';
-import { IUserLegacyDoc } from '../models/User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { roundToXDigits } from '../helpers/numbers.helper';
 import { AccountPayableItemModel } from '../models/AccountPayableItem.model';
 import { ECollaterals } from '../enums/collaterals.enum';
@@ -34,7 +34,6 @@ import { IInventoryAvailabilitySummary, InventoryAvailabilityPaginators } from '
 import { getBBCSheetsByType } from '../db/bbcSheets.db';
 import { CustomerGroupModel } from '../models/CustomerGroup.model';
 import { getPartialPaid } from '../queries/receivable/partially-paid-restated';
-
 import MappedGroup from '../models/MappedGroup.model';
 import CustomerAPGroup from '../models/CustomerAPGroup.model';
 import { getReserveDocs } from '../db/reserve.db';
@@ -151,7 +150,7 @@ export class AvailabilityService {
     return groupedSettings;
   }
 
-  async calculateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserLegacyDoc): Promise<IReceivableAvailabilityView> {
+  async calculateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser): Promise<IReceivableAvailabilityView> {
 
     const calculationsSettings = await this.getCalculationSettings(bbcDateId);
 
@@ -161,7 +160,7 @@ export class AvailabilityService {
     const calculation: IReceivableAvailability = {
       borrowerId: null,
       bbcDateId: new mongoose.Types.ObjectId(bbcDateId),
-      userCalculatedId: user?._id ? new mongoose.Types.ObjectId(String(user._id)) : null,
+      userCalculatedId: user?.id ? new mongoose.Types.ObjectId(String(user.id)) : null,
       calculatedAt: new Date(),
       actual: true,
       settings: calculationsSettings,
@@ -560,7 +559,7 @@ export class AvailabilityService {
     return await this.getAvailability(bbcDateId, paginatorOptions, user);
   }
 
-  async getAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserLegacyDoc) {
+  async getAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser) {
     return await this.foundOrCreateAvailability(bbcDateId, paginatorOptions, user);
   }
 
@@ -655,7 +654,7 @@ export class AvailabilityService {
     return { itemsFilter: filterField, invoiceItems, customerItems: customerItemsWithTotal };
   }
 
-  async foundOrCreateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUserLegacyDoc) {
+  async foundOrCreateAvailability(bbcDateId: string, paginatorOptions: IPaginatorOptions, user: IUser) {
     const foundAvailability = await this.findCalculatedAvailability(bbcDateId);
     if (foundAvailability) {
       foundAvailability.items = await this.getAvailabilityItems(foundAvailability._id.toString(), paginatorOptions);
@@ -989,7 +988,7 @@ export class AvailabilityService {
     ]);
   }
 
-  async getAllSummaries(bbcDateId: string, user: IUserLegacyDoc): Promise<IAvailabilityFullSummary> {
+  async getAllSummaries(bbcDateId: string, user: IUser): Promise<IAvailabilityFullSummary> {
     const equipment = await this.equipmentService.getEquipmentForBBC(bbcDateId);
     const reserve = await this.reserveService.getReserve(bbcDateId);
     const loanBalances = await this.loanTransactionsService.getLoanBalanceForBBCDateId(bbcDateId);

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

@@ -26,7 +26,7 @@ import mongoose from 'mongoose';
 import { IEmailRecipient } from '../models/ComplianceItem.model';
 import { IGroupedEmailsUpdate } from '../interfaces/email-addresses.interface';
 import { IComplianceBorrowerDocument, IComplianceBorrowerDocumentFull } from '../models/BorrowerCompliance.model';
-import { IUserLegacy } from '../models/User.model';
+import { IUser } from '../interfaces/auth-user.interface';
 import { FileManagerService } from './file-manager.service';
 import { UploadsService } from './uploads.service';
 export declare class ComplianceBorrowersService {
@@ -45,7 +45,7 @@ export declare class ComplianceBorrowersService {
         };
     };
     getFullComplianceBorrowerById(complianceBorrowerId: any): Promise<any>;
-    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "items" | "fundingStatus"> | {
+    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "items" | "borrower" | "fundingStatus"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;
@@ -148,5 +148,5 @@ export declare class ComplianceBorrowersService {
     toggleComplianceBorrowerVisibility(borrowerId: string, isVisible: boolean): Promise<void>;
     createComplianceBorrower(borrowerId: string, isVisible?: boolean): Promise<void>;
     removeIncorrectBorrowers(): Promise<void>;
-    getBorrowerListReport(user: IUserLegacy): Promise<any>;
+    getBorrowerListReport(user: IUser): Promise<any>;
 }

package/services/compliance-borrowers.service.js

@@ -536,7 +536,7 @@ class ComplianceBorrowersService {
     async getBorrowerListReport(user) {
         const userFilter = user.allBorrowers
             ? { isVisible: true }
-            : { 'borrower': { $in: user.borrowersAccess.map((b) => b.borrower) }, isVisible: true };
+            : { 'borrower': { $in: user.borrowersAccess }, isVisible: true };
         const borrowers = await BorrowerCompliance_model_1.BorrowerCompliance
             .find(userFilter)
             .populate('borrower')

package/services/compliance-borrowers.service.ts

@@ -11,8 +11,7 @@ import {
   IComplianceBorrowerDocumentFull,
 } from '../models/BorrowerCompliance.model';
 import { BorrowerModel } from '../models/Borrower.model';
-import { IUserLegacy } from '../models/User.model';
-
+import { IUser } from '../interfaces/auth-user.interface';
 import FinancialComplianceBorrower from '../models/FinancialComplianceBorrower.model';
 import { FileManagerService } from './file-manager.service';
 import { UploadsService } from './uploads.service';
@@ -580,10 +579,10 @@ export class ComplianceBorrowersService {
     }
   }
 
-  async getBorrowerListReport(user: IUserLegacy) {
+  async getBorrowerListReport(user: IUser) {
     const userFilter = user.allBorrowers
       ? { isVisible: true }
-      : { 'borrower': { $in: user.borrowersAccess.map((b) => b.borrower) }, isVisible: true };
+      : { 'borrower': { $in: user.borrowersAccess }, isVisible: true };
     const borrowers = await BorrowerCompliance
       .find(userFilter)
       .populate('borrower')

package/services/signs.service.d.ts

@@ -24,7 +24,6 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from 'mongoose';
 import { IResult } from '../interfaces/result.interface';
-import { IUserLegacyDoc } from '../models/User.model';
 import { IAvailabilitySignView } from '../models/AvailabilitySigns.model';
 import { IBBCDateDoc } from '../models/BBCDate.model';
 import { IBorrowerDocument } from '../models/Borrower.model';
@@ -49,12 +48,12 @@ export declare class SignsService {
     private readonly loanStatementService;
     private readonly usersService;
     constructor(lockService: LockService, loanTransactionsService: LoanTransactionsService, loanStatementService: LoanStatementService, usersService: UsersService);
-    keyCloakUsers: IUser[];
+    users: IUser[];
     fulfillUserList(): Promise<void>;
     clearUserList(): void;
     getAvailabilitySigns(bbcDateId: string): Promise<IAvailabilitySignView>;
     revokeAvailability(bbcDateId: string, userId: string, userIdRevoked: string): Promise<void>;
-    signAvailability(bbcDateId: string, user: IUserLegacyDoc): Promise<IResult>;
+    signAvailability(bbcDateId: string, user: IUser): Promise<IResult>;
     isBBCLocked(bbcDateId: string): Promise<boolean>;
     getLatestSignedBBCDate(borrowerId: string, date?: Date): Promise<IBBCDateDoc>;
     getSavedData(bbcDateId: string): Promise<any>;

package/services/signs.service.js

@@ -32,12 +32,12 @@ class SignsService {
         this.loanStatementService = loanStatementService;
         this.usersService = usersService;
     }
-    keyCloakUsers = null;
+    users = null;
     async fulfillUserList() {
-        this.keyCloakUsers = await this.usersService.getUserList();
+        this.users = await this.usersService.getUserList();
     }
     clearUserList() {
-        this.keyCloakUsers = null;
+        this.users = null;
     }
     async getAvailabilitySigns(bbcDateId) {
         const availabilitiesSigns = await (0, availability_db_1.getAvailabilitySigns)([bbcDateId]);
@@ -50,7 +50,7 @@ class SignsService {
             };
         }
         const availabilitySigns = availabilitiesSigns[0];
-        let keyCloakUsers = this.keyCloakUsers;
+        let keyCloakUsers = this.users;
         if (!keyCloakUsers) {
             keyCloakUsers = await this.usersService.getUserList();
         }
@@ -58,14 +58,14 @@ class SignsService {
             if (!userSign.userSigned) {
                 return acc;
             }
-            const foundUserSigned = keyCloakUsers.find((user) => user.id === userSign.userSigned.keycloakUserId);
+            const foundUserSigned = keyCloakUsers.find((user) => user.id === userSign.userSigned.id);
             if (foundUserSigned) {
                 userSign.userSigned.firstName = foundUserSigned.firstName;
                 userSign.userSigned.lastName = foundUserSigned.lastName;
             }
             userSign.userSigned = (lodash_1.default.pick(userSign.userSigned, ['_id', 'firstName', 'lastName']));
             if (userSign.userRevoked) {
-                const foundUserRevoked = keyCloakUsers.find((user) => user.id === userSign.userRevoked.keycloakUserId);
+                const foundUserRevoked = keyCloakUsers.find((user) => user.id === userSign.userRevoked.id);
                 if (foundUserRevoked) {
                     userSign.userRevoked.firstName = foundUserRevoked.firstName;
                     userSign.userRevoked.lastName = foundUserRevoked.lastName;
@@ -80,16 +80,15 @@ class SignsService {
         const availability = await (0, availability_db_1.findAvailabilitySignsByBBCDateId)(bbcDateId);
         const updatedSigns = availability.signs.map((sign) => {
             if (sign.userSignedId.toString() === userId && !sign.revokedAt) {
-                sign.userRevokedId = new mongoose_1.default.Types.ObjectId(userIdRevoked);
+                sign.userRevokedId = userIdRevoked;
                 sign.revokedAt = new Date();
-                sign.userRevokedId = new mongoose_1.default.Types.ObjectId(userIdRevoked);
             }
             return sign;
         });
         await (0, availability_db_1.updateAvailabilitySigns)(bbcDateId, updatedSigns);
     }
     async signAvailability(bbcDateId, user) {
-        const newSign = { userSignedId: user._id, signedAt: new Date() };
+        const newSign = { userSignedId: user.id, signedAt: new Date() };
         return await (0, availability_db_1.addAvailabilitySign)(bbcDateId, newSign);
     }
     async isBBCLocked(bbcDateId) {

package/services/signs.service.ts

@@ -8,7 +8,6 @@ import {
   getAvailabilitySigns,
   updateAvailabilitySigns,
 } from '../db/availability.db';
-import { IUserLegacyDoc } from '../models/User.model';
 import {
   AvailabilitySignsModel,
   IAvailabilitySignItem,
@@ -51,14 +50,14 @@ export class SignsService {
   ) {
   }
 
-  keyCloakUsers: IUser[] = null;
+  users: IUser[] = null;
 
   async fulfillUserList() {
-    this.keyCloakUsers = await this.usersService.getUserList();
+    this.users = await this.usersService.getUserList();
   }
 
   clearUserList() {
-    this.keyCloakUsers = null;
+    this.users = null;
   }
 
   async getAvailabilitySigns(bbcDateId: string): Promise<IAvailabilitySignView> {
@@ -72,7 +71,7 @@ export class SignsService {
       };
     }
     const availabilitySigns = availabilitiesSigns[0];
-    let keyCloakUsers = this.keyCloakUsers;
+    let keyCloakUsers = this.users;
     if (!keyCloakUsers) {
       keyCloakUsers = await this.usersService.getUserList();
     }
@@ -80,19 +79,19 @@ export class SignsService {
       if (!userSign.userSigned) {
         return acc;
       }
-      const foundUserSigned = keyCloakUsers.find((user) => user.id === userSign.userSigned.keycloakUserId);
+      const foundUserSigned = keyCloakUsers.find((user) => user.id === userSign.userSigned.id);
       if (foundUserSigned) {
         userSign.userSigned.firstName = foundUserSigned.firstName;
         userSign.userSigned.lastName = foundUserSigned.lastName;
       }
-      userSign.userSigned = (_.pick(userSign.userSigned, ['_id', 'firstName', 'lastName'])) as IUserLegacyDoc;
+      userSign.userSigned = (_.pick(userSign.userSigned, ['_id', 'firstName', 'lastName'])) as IUser;
       if (userSign.userRevoked) {
-        const foundUserRevoked = keyCloakUsers.find((user) => user.id === userSign.userRevoked.keycloakUserId);
+        const foundUserRevoked = keyCloakUsers.find((user) => user.id === userSign.userRevoked.id);
         if (foundUserRevoked) {
           userSign.userRevoked.firstName = foundUserRevoked.firstName;
           userSign.userRevoked.lastName = foundUserRevoked.lastName;
         }
-        userSign.userRevoked = (_.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName'])) as IUserLegacyDoc;
+        userSign.userRevoked = (_.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName'])) as IUser;
       }
       return [...acc, _.pick(userSign, ['userSigned', 'signedAt', 'userRevoked', 'revokedAt'])];
     }, []);
@@ -103,17 +102,16 @@ export class SignsService {
     const availability = await findAvailabilitySignsByBBCDateId(bbcDateId);
     const updatedSigns = availability.signs.map((sign) => {
       if (sign.userSignedId.toString() === userId && !sign.revokedAt) {
-        sign.userRevokedId = new mongoose.Types.ObjectId(userIdRevoked);
+        sign.userRevokedId = userIdRevoked;
         sign.revokedAt = new Date();
-        sign.userRevokedId = new mongoose.Types.ObjectId(userIdRevoked);
       }
       return sign;
     });
     await updateAvailabilitySigns(bbcDateId, updatedSigns);
   }
 
-  async signAvailability(bbcDateId: string, user: IUserLegacyDoc): Promise<IResult> {
-    const newSign = <IAvailabilitySignItem>{ userSignedId: user._id, signedAt: new Date() };
+  async signAvailability(bbcDateId: string, user: IUser): Promise<IResult> {
+    const newSign = <IAvailabilitySignItem>{ userSignedId: user.id, signedAt: new Date() };
     return await addAvailabilitySign(bbcDateId, newSign);
   }