@tomei/rental 0.17.4-dev.11 → 0.17.4-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/rental",
-  "version": "0.17.4-dev.11",
+  "version": "0.17.4-dev.2",
   "description": "Tomei Rental Package",
   "main": "dist/index.js",
   "scripts": {

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

@@ -131,7 +131,7 @@ export class Rental extends ObjectBase {
       throw new ClassError(
         'Rental',
         'RentalErrMsg00',
-        'Failed To Initialize Rental',
+        'Failed To Initialize Price',
       );
     }
   }
@@ -796,7 +796,6 @@ export class Rental extends ObjectBase {
       const options: any = {
         where: {
           RentalId: this.RentalId,
-          Status: 'Active',
         },
         transaction: dbTransaction,
       };

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

@@ -445,7 +445,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 +454,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) {
@@ -810,10 +800,10 @@ export class RentalHirerChangeRequest
       await jointHirer.create(loginUser, dbTransaction);
 
       //d. Set the AccountType to "Joint" for the rental
-      // const rental = await Rental.init(dbTransaction, this.RentalId);
-      // await rental.update(loginUser, dbTransaction, {
-      //   AccountType: RentalAccountTypeEnum.JOINT,
-      // });
+      const rental = await Rental.init(dbTransaction, this.RentalId);
+      await rental.update(loginUser, dbTransaction, {
+        AccountType: RentalAccountTypeEnum.JOINT,
+      });
     } else if (this.Type === HirerChangeRequestTypeEnum.REMOVE) {
       // a. Get joint hirer from remove hirer request
       const removeHirer = await this.getRemoveHirer(dbTransaction);
@@ -825,22 +815,15 @@ export class RentalHirerChangeRequest
       //Call jointHirer.remove() method by passing loginUser and dbTransaction
       await jointHirer.remove(loginUser, dbTransaction);
 
-      // //find the number of joint hirers after removal
-      // const rental = await Rental.init(dbTransaction, this.RentalId);
-      // rental.AccountType = RentalAccountTypeEnum.JOINT;
-      // const jointHirers = await rental.getJointHirers(dbTransaction);
-
-      // //filter out the active joint hirers
-      // const activeJointHirers = jointHirers.filter(
-      //   (hirer) => hirer.Status === 'Active',
-      // );
-
-      // //if jointHirers is empty, set rental.AccountType to "Single"
-      // if (activeJointHirers.length === 0) {
-      //   await rental.update(loginUser, dbTransaction, {
-      //     AccountType: RentalAccountTypeEnum.SINGLE,
-      //   });
-      // }
+      //find the number of joint hirers after removal
+      const rental = await Rental.init(dbTransaction, this.RentalId);
+      const jointHirers = await rental.getJointHirers(dbTransaction);
+      //if jointHirers is empty, set rental.AccountType to "Single"
+      if (jointHirers.length === 0) {
+        await rental.update(loginUser, dbTransaction, {
+          AccountType: RentalAccountTypeEnum.SINGLE,
+        });
+      }
     }
 
     // 3. Call _Repo update method