@tomei/rental 0.17.7 → 0.17.9-dev.1

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@tomei/rental",
-  "version": "0.17.7",
+  "version": "0.17.9-dev.1",
   "description": "Tomei Rental Package",
   "main": "dist/index.js",
   "scripts": {
     "start:dev": "tsc -w",
-    "build": "tsc",
+    "build": "tsc -p tsconfig.build.json",
     "prepare": "husky install",
     "format": "prettier --write \"src/**/*.ts\"",
     "lint": "npx eslint . --fix",
@@ -59,13 +59,13 @@
   "peerDependencies": {
     "@tomei/activity-history": "^0.4.1",
     "@tomei/config": "^0.3.21",
-    "@tomei/finance": "^0.11.7-staging.12",
-    "@tomei/general": "^0.21.7",
-    "@tomei/sso": "^0.60.4",
-    "@tomei/stock": "^0.18.1",
-    "luxon": "^3.6.1",
+    "@tomei/finance": "^0.11.7-staging.4",
+    "@tomei/general": "^0.21.3",
+    "@tomei/sso": "^0.64.0-dev.2",
+    "@tomei/stock": "^0.18.0",
+    "luxon": "^3.5.0",
     "reflect-metadata": "^0.2.2",
-    "sequelize": "^6.37.7",
+    "sequelize": "^6.37.5",
     "sequelize-typescript": "^2.1.6"
   },
   "lint-staged": {
@@ -73,8 +73,5 @@
       "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
       "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
     ]
-  },
-  "overrides": {
-    "glob": "^9.0.0"
   }
 }

package/src/components/agreement/agreement.ts

@@ -101,8 +101,6 @@ export class Agreement extends ObjectBase {
                 rental_AgreementSignature hs          
             WHERE 
                 hs.AgreementNo = '${agreementNo}'
-            ORDER BY
-                hs.CreatedAt ASC
       `;
 
       const db = rentalDb.getConnection();

package/src/components/hirer-change-request-remove-hirer/hirer-change-request-remove-hirer.ts

@@ -3,7 +3,7 @@ import { LoginUser } from '@tomei/sso';
 import { ActionEnum, Activity } from '@tomei/activity-history';
 import { IHirerChangeRequestRemoveHirerAttr } from '../../interfaces/hirer-change-request-remove-hirer-attr.interface';
 import { HirerChangeRequestRemoveHirerRepository } from './hirer-change-request-remove-hirer.repository';
-import { JointHirer } from 'components/joint-hirer/joint-hirer';
+import { JointHirer } from '../../components/joint-hirer/joint-hirer';
 
 export class HirerChangeRequestRemoveHirer
   extends ObjectBase

package/src/components/joint-hirer/joint-hirer.ts

@@ -4,8 +4,6 @@ import { IJointHirerAttr } from '../../interfaces/joint-hirer-attr.interface';
 import { ApplicationConfig } from '@tomei/config';
 import { LoginUser } from '@tomei/sso';
 import { ActionEnum, Activity } from '@tomei/activity-history';
-import { Rental } from '../rental/rental';
-import { RentalAccountTypeEnum } from '../../enum/account-type.enum';
 
 export class JointHirer extends ObjectBase {
   ObjectId: string;
@@ -20,7 +18,6 @@ export class JointHirer extends ObjectBase {
   CreatedAt: Date;
   UpdatedById: string;
   UpdatedAt: Date;
-  private _Rental: Rental;
 
   get HirerId(): string {
     return this.ObjectId;
@@ -149,16 +146,6 @@ export class JointHirer extends ObjectBase {
 
       await activity.create(loginUser.ObjectId, dbTransaction);
 
-      //update the AccountType
-      const rental = await this.getRental(dbTransaction);
-      const totalIds = await rental.getCustomerIds(loginUser, dbTransaction);
-
-      if (totalIds.length > 1 && rental.AccountType === 'Single') {
-        await rental.update(loginUser, dbTransaction, {
-          AccountType: RentalAccountTypeEnum.JOINT,
-        });
-      }
-
       return this;
     } catch (error) {
       throw error;
@@ -167,20 +154,6 @@ export class JointHirer extends ObjectBase {
 
   public async remove(loginUser: LoginUser, dbTransaction?: any) {
     try {
-      //Make sure this.HirerId exists
-      if (!this.HirerId) {
-        throw new ClassError(
-          'JointHirer',
-          'JointHirerErrMsg02',
-          'HirerId is required to remove Joint Hirer.',
-        );
-      }
-
-      //Make sure this.Status is not "Inactive"
-      if (this.Status === 'Inactive') {
-        return this;
-      }
-
       //Mark Joint Hirer as Inactive
       const entityValueBefore: IJointHirerAttr = this.toJSON();
       this.Status = 'Inactive'; // Set status to 'Inactive' instead of deleting the record
@@ -208,45 +181,9 @@ export class JointHirer extends ObjectBase {
 
       await activity.create(loginUser.ObjectId, dbTransaction);
 
-      //update the AccountType
-      const rental = await this.getRental(dbTransaction);
-      const totalIds = await rental.getCustomerIds(loginUser, dbTransaction);
-
-      if (totalIds.length === 1 && rental.AccountType === 'Joint') {
-        await rental.update(loginUser, dbTransaction, {
-          AccountType: RentalAccountTypeEnum.SINGLE,
-        });
-      }
-
       return this;
     } catch (error) {
       throw error;
     }
   }
-
-  private async getRental(dbTransaction?: any) {
-    if (this._Rental) {
-      return this._Rental;
-    }
-
-    if (!this.RentalId) {
-      throw new ClassError(
-        'JointHirer',
-        'JointHirerErrMsg04',
-        'RentalId is empty.',
-      );
-    }
-
-    this._Rental = await Rental.init(dbTransaction, this.RentalId);
-
-    if (!this._Rental) {
-      throw new ClassError(
-        'JointHirer',
-        'JointHirerErrMsg05',
-        'Rental not found.',
-      );
-    }
-
-    return this._Rental;
-  }
 }

package/src/components/rental/rental.ts

@@ -3,7 +3,7 @@ import { RentalStatusEnum } from '../../enum/rental-status.enum';
 import { RentalRepository } from './rental.repository';
 import { ClassError, ObjectBase } from '@tomei/general';
 import { ApplicationConfig } from '@tomei/config';
-import { LoginUser } from '@tomei/sso';
+import { AuthContext, LoginUser } from '@tomei/sso';
 import { RentalPrice } from '../rental-price/rental-price';
 import { Op, QueryTypes } from 'sequelize';
 import { ActionEnum, Activity } from '@tomei/activity-history';
@@ -132,7 +132,7 @@ export class Rental extends ObjectBase {
       throw new ClassError(
         'Rental',
         'RentalErrMsg00',
-        'Failed To Initialize Rental',
+        'Failed To Initialize Price',
       );
     }
   }
@@ -212,7 +212,7 @@ export class Rental extends ObjectBase {
           PartyId: this.CustomerId,
           PartyType: 'Customer',
           SignatureStatus: AgreementSignatureStatusEnum.PENDING,
-          SignedAt: null,
+          SignedAt: new Date(),
           VerificationMethod:
             AgreementSignatureVerificationMethodEnum.FINGERPRINT,
           VerificationJustification: '',
@@ -236,7 +236,7 @@ export class Rental extends ObjectBase {
               PartyId: jointHirer.CustomerId,
               PartyType: 'Customer',
               SignatureStatus: AgreementSignatureStatusEnum.PENDING,
-              SignedAt: null,
+              SignedAt: new Date(),
               VerificationMethod:
                 AgreementSignatureVerificationMethodEnum.FINGERPRINT,
               VerificationJustification: '',
@@ -365,7 +365,7 @@ export class Rental extends ObjectBase {
   }
 
   public static async findAll(
-    loginUser: LoginUser,
+    authContext: AuthContext,
     dbTransaction: any,
     page?: number,
     row?: number,
@@ -375,17 +375,19 @@ export class Rental extends ObjectBase {
       const systemCode =
         await ApplicationConfig.getComponentConfigValue('system-code');
 
-      const isPrivileged = await loginUser.checkPrivileges(
-        systemCode,
-        'Rental - View',
-      );
-
-      if (!isPrivileged) {
-        throw new ClassError(
-          'Rental',
-          'RentalErrMsg01',
-          "You do not have 'Rental - View' privilege.",
+      if ('loginUser' in authContext) {
+        const isPrivileged = await authContext.loginUser.checkPrivileges(
+          systemCode,
+          'Rental - View',
         );
+
+        if (!isPrivileged) {
+          throw new ClassError(
+            'Rental',
+            'RentalErrMsg01',
+            "You do not have 'Rental - View' privilege.",
+          );
+        }
       }
 
       const queryObj: any = {};
@@ -805,7 +807,6 @@ export class Rental extends ObjectBase {
       const options: any = {
         where: {
           RentalId: this.RentalId,
-          Status: 'Active',
         },
         transaction: dbTransaction,
       };
@@ -1339,17 +1340,6 @@ export class Rental extends ObjectBase {
         );
       }
 
-      if (
-        this.Status === RentalStatusEnum.ACTIVE ||
-        this.Status === RentalStatusEnum.SUSPENDED
-      ) {
-        throw new ClassError(
-          'Rental',
-          'RentalErrMsg01',
-          `Rental already ${this.Status}, please do termination process.`,
-        );
-      }
-
       if (!remarks) {
         throw new ClassError(
           'Rental',
@@ -1405,70 +1395,4 @@ export class Rental extends ObjectBase {
       throw error;
     }
   }
-
-  public async update(
-    loginUser: LoginUser,
-    dbTransaction: any,
-    updates: Partial<IRentalAttr>,
-  ): Promise<Rental> {
-    try {
-      // Part 1: Privilege Checking
-      const systemCode =
-        ApplicationConfig.getComponentConfigValue('system-code');
-      const isPrivileged = await loginUser.checkPrivileges(
-        systemCode,
-        'RENTAL_UPDATE',
-      );
-
-      if (!isPrivileged) {
-        throw new ClassError(
-          'Rental',
-          'RentalErrMsg01',
-          "You do not have 'RENTAL_UPDATE' privilege.",
-        );
-      }
-
-      // Part 2: Validation
-      if (!this.ObjectId) {
-        throw new ClassError(
-          'Rental',
-          'RentalErrMsg01',
-          'Rental not found. Rental Id is empty.',
-        );
-      }
-
-      // Part 3: Capture Record Info Before Changes
-      const entityValueBefore = this.toJSON();
-
-      // Part 4: Update Rental Record
-      await Rental._Repo.update(updates, {
-        where: {
-          RentalId: this.RentalId,
-        },
-        transaction: dbTransaction,
-      });
-
-      // Part 5: Update object instance properties and capture after changes
-      Object.assign(this, updates);
-      this._UpdatedById = loginUser.ObjectId;
-      this._UpdatedAt = new Date();
-
-      const entityValueAfter = this.toJSON();
-
-      // Part 6: Record Activity
-      const activity = new Activity();
-      activity.ActivityId = activity.createId();
-      activity.Action = ActionEnum.UPDATE;
-      activity.Description = 'Update Rental';
-      activity.EntityType = this.ObjectType;
-      activity.EntityId = this.ObjectId;
-      activity.EntityValueBefore = JSON.stringify(entityValueBefore);
-      activity.EntityValueAfter = JSON.stringify(entityValueAfter);
-      await activity.create(loginUser.ObjectId, dbTransaction);
-
-      return this;
-    } catch (error) {
-      throw error;
-    }
-  }
 }

package/src/components/rental-hirer-change-request/rental-hirer-change-request.ts

@@ -227,8 +227,16 @@ export class RentalHirerChangeRequest
       }
       const rental = await Rental.init(dbTransaction, this.RentalId);
 
+      // 2.2 Only allow for joint account
+      if (rental.AccountType !== RentalAccountTypeEnum.JOINT) {
+        throw new ClassError(
+          'HirerChangeRequest',
+          'HirerChangeRequestErrMsg03',
+          'Only Rental with Joint Account Type Allowed.',
+        );
+      }
+
       // 2.3 only allow for rental account where its joint hirer not maximum yet (at this step you've retrieve the number of joint hirer)
-      rental.AccountType = RentalAccountTypeEnum.JOINT;
       const jointHirers = await rental.getJointHirers(dbTransaction);
 
       if (this.Type === HirerChangeRequestTypeEnum.ADD) {
@@ -245,6 +253,18 @@ export class RentalHirerChangeRequest
           );
         }
       }
+      // For Remove type, we don't need to check the max joint hirer length
+      // but we need to ensure that there is at least one joint hirer left after removal
+      if (
+        this.Type == HirerChangeRequestTypeEnum.REMOVE &&
+        jointHirers?.length <= 1
+      ) {
+        throw new ClassError(
+          'HirerChangeRequest',
+          'HirerChangeRequestErrMsg05',
+          'Cannot remove the last joint hirer.',
+        );
+      }
 
       // 2.4 avoid duplicate request, call this.checkForDuplicate() private method, this method will ensure no record with same RentalId and same Type and Status is not "Completed" or "Cancelled"
       await this.checkForDuplicate(dbTransaction);
@@ -445,7 +465,6 @@ export class RentalHirerChangeRequest
       }
 
       // 2. Prepare all signature data (main + joint) in one go
-      this.Rental.AccountType = RentalAccountTypeEnum.JOINT;
       const jointHirers = await this.Rental.getJointHirers(dbTransaction);
 
       // Main hirer signature
@@ -455,32 +474,23 @@ export class RentalHirerChangeRequest
       mainSignature.HirerType = HirerChangeRequestHirerRoleEnum.MAIN;
       mainSignature.Method = 'Upload';
 
-      // Joint hirer signatures - only if there are joint hirers
-      let jointSignatures = [];
-      if (jointHirers.length > 0) {
-        const jointSignaturePromises = jointHirers.map(async (jointHirer) => {
-          const signature = await HirerChangeRequestSignature.init();
-          signature.RequestId = this.RequestId;
-          signature.JointHirerId = jointHirer.HirerId;
-          signature.HirerType = HirerChangeRequestHirerRoleEnum.JOINT;
-          signature.Method = 'Upload';
-          return signature;
-        });
+      // Joint hirer signatures
+      const jointSignaturePromises = jointHirers.map(async (jointHirer) => {
+        const signature = await HirerChangeRequestSignature.init();
+        signature.RequestId = this.RequestId;
+        signature.JointHirerId = jointHirer.HirerId;
+        signature.HirerType = HirerChangeRequestHirerRoleEnum.JOINT;
+        signature.Method = 'Upload';
+        return signature;
+      });
 
-        jointSignatures = await Promise.all(jointSignaturePromises);
-      }
+      const jointSignatures = await Promise.all(jointSignaturePromises);
 
       // 3. Create all signatures in parallel
-      const signaturesToCreate = [
+      await Promise.all([
         mainSignature.create(loginUser, dbTransaction),
-      ];
-      if (jointSignatures.length > 0) {
-        signaturesToCreate.push(
-          ...jointSignatures.map((sig) => sig.create(loginUser, dbTransaction)),
-        );
-      }
-
-      await Promise.all(signaturesToCreate);
+        ...jointSignatures.map((sig) => sig.create(loginUser, dbTransaction)),
+      ]);
 
       this.Signatures = [mainSignature, ...jointSignatures];
     } catch (error) {

package/src/index.ts

@@ -12,7 +12,6 @@ import { AgreementSignature } from './components/agreement-signature/agreement-s
 import { AgreementSignatureRepository } from './components/agreement-signature/agreement-signature.repository';
 import { AgreementHistory } from './components/agreement-history/agreement-history';
 import { AgreementHistoryRepository } from './components/agreement-history/agreement-history.repository';
-import { ItemClassMap } from './ClassMappings/ItemClassMap';
 import { RentalHirerChangeRequest } from './components/rental-hirer-change-request/rental-hirer-change-request';
 import { RentalHirerChangeRequestRepository } from './components/rental-hirer-change-request/rental-hirer-change-request.repository';
 import { HirerChangeRequestSignature } from './components/hirer-change-request-signature/hirer-change-request-signature';
@@ -21,6 +20,7 @@ import { HirerChangeRequestNewHirer } from './components/hirer-change-request-ne
 import { HirerChangeRequestNewHirerRepository } from './components/hirer-change-request-new-hirer/hirer-change-request-new-hirer.repository';
 import { HirerChangeRequestRemoveHirer } from './components/hirer-change-request-remove-hirer/hirer-change-request-remove-hirer';
 import { HirerChangeRequestRemoveHirerRepository } from './components/hirer-change-request-remove-hirer/hirer-change-request-remove-hirer.repository';
+import { ItemClassMap } from './ClassMappings/ItemClassMap';
 import * as rentalDb from './database';
 export * from './interfaces';
 export * from './models';
@@ -42,7 +42,6 @@ export {
   AgreementSignatureRepository,
   AgreementHistory,
   AgreementHistoryRepository,
-  ItemClassMap,
   RentalHirerChangeRequest,
   RentalHirerChangeRequestRepository,
   HirerChangeRequestSignature,
@@ -51,4 +50,5 @@ export {
   HirerChangeRequestNewHirerRepository,
   HirerChangeRequestRemoveHirer,
   HirerChangeRequestRemoveHirerRepository,
+  ItemClassMap,
 };

package/src/models/hirer-change-request-new-hirer.entity.ts

@@ -7,7 +7,7 @@ import {
   BelongsTo,
 } from 'sequelize-typescript';
 import { RentalHirerChangeRequestModel } from './rental-hirer-change-request.entity';
-import { IHirerChangeRequestNewHirerAttr } from 'interfaces/hirer-change-request-new-hirer-attr.interface';
+import { IHirerChangeRequestNewHirerAttr } from '../interfaces/hirer-change-request-new-hirer-attr.interface';
 
 @Table({
   tableName: 'hirerChangeRequest_NewHirer',

package/src/models/hirer-change-request-remove-hirer.entity.ts

@@ -8,7 +8,7 @@ import {
 } from 'sequelize-typescript';
 import { RentalHirerChangeRequestModel } from './rental-hirer-change-request.entity';
 import { JointHirerModel } from './joint-hirer.entity';
-import { IHirerChangeRequestRemoveHirerAttr } from 'interfaces/hirer-change-request-remove-hirer-attr.interface';
+import { IHirerChangeRequestRemoveHirerAttr } from '../interfaces/hirer-change-request-remove-hirer-attr.interface';
 
 @Table({
   tableName: 'hirerChangeRequest_RemoveHirer',

package/src/models/hirer-change-request-signature.entity.ts

@@ -10,7 +10,7 @@ import {
 } from 'sequelize-typescript';
 import { RentalHirerChangeRequestModel } from './rental-hirer-change-request.entity';
 import { HirerChangeRequestHirerRoleEnum } from '../enum/rental-hirer-change-request-hirer-role';
-import { IHirerChangeRequestSignatureAttr } from 'interfaces/hirer-change-request-signature-attr.interface';
+import { IHirerChangeRequestSignatureAttr } from '../interfaces/hirer-change-request-signature-attr.interface';
 
 @Table({
   tableName: 'hirerChangeRequest_Signature',

package/src/models/joint-hirer.entity.ts

@@ -45,7 +45,7 @@ export class JointHirerModel extends Model {
     type: DataType.STRING(20),
     defaultValue: 'Active',
   })
-  Status: string; // Default status
+  Status: string = 'Active'; // Default status
 
   @Column({
     allowNull: false,

package/tsconfig.build.json

@@ -1,6 +1,11 @@
 {
   "extends": "./tsconfig.json",
-  "include": ["**/*.ts"],
-  "exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
+  "include": ["src/**/*"],
+  "exclude": [
+    "node_modules",
+    "__tests__",
+    "./dist",
+    "**/*spec.ts",
+    "./dist/**/*"
+  ]
 }
-  

package/tsconfig.json

@@ -7,18 +7,16 @@
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "moduleResolution": "node",
-    "target": "es6",
+    "target": "es2017",
     "sourceMap": true,
-    "outDir": "dist",
-    "baseUrl": "./src",
-    "rootDir": "./",
+    "outDir": "./dist",
+    "baseUrl": "./",
     "incremental": true,
     "skipLibCheck": true,
+    "strictNullChecks": false,
     "noImplicitAny": false,
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false,
-    "strictNullChecks": false,
-  },
-  "exclude": ["node_modules", "dist"]
+    "noFallthroughCasesInSwitch": false
+  }
 }