@tomei/rental 0.17.4-dev.10 → 0.17.4-dev.12

package/package.json

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

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

@@ -236,8 +236,8 @@ export class JointHirer extends ObjectBase {
         'RentalId is empty.',
       );
     }
-    console.log('JointHirer getRental', this.RentalId);
-    this._Rental = await Rental.init(this.RentalId, dbTransaction);
+
+    this._Rental = await Rental.init(dbTransaction, this.RentalId);
 
     if (!this._Rental) {
       throw new ClassError(

package/src/components/rental/rental.ts

@@ -128,7 +128,6 @@ export class Rental extends ObjectBase {
       }
       return new Rental();
     } catch (error) {
-      console.error('Error initializing Rental:', error);
       throw new ClassError(
         'Rental',
         'RentalErrMsg00',
@@ -749,6 +748,7 @@ export class Rental extends ObjectBase {
       const jointHirers = await Rental._JointHirerRepo.findAll({
         where: {
           RentalId: this.RentalId,
+          Status: 'Active',
         },
         transaction: dbTransaction,
       });

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

@@ -808,12 +808,6 @@ export class RentalHirerChangeRequest
       jointHirer.CustomerId = customerId;
       jointHirer.CustomerType = customerType;
       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,
-      // });
     } else if (this.Type === HirerChangeRequestTypeEnum.REMOVE) {
       // a. Get joint hirer from remove hirer request
       const removeHirer = await this.getRemoveHirer(dbTransaction);
@@ -824,23 +818,6 @@ 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,
-      //   });
-      // }
     }
 
     // 3. Call _Repo update method