@tomei/rental 0.17.1 → 0.17.3-dev.2

package/src/database.ts

@@ -6,6 +6,10 @@ import { JointHirerModel } from './models/joint-hirer.entity';
 import { AgreementModel } from './models/agreement.entity';
 import { AgreementSignatureModel } from './models/agreement-signature.entity';
 import { AgreementHistoryModel } from './models/agreement-history.entity';
+import { RentalHirerChangeRequestModel } from './models/rental-hirer-change-request.entity';
+import { HirerChangeRequestNewHirerModel } from './models/hirer-change-request-new-hirer.entity';
+import { HirerChangeRequestRemoveHirerModel } from './models/hirer-change-request-remove-hirer.entity';
+import { HirerChangeRequestSignatureModel } from './models/hirer-change-request-signature.entity';
 
 let sequelize: Sequelize;
 
@@ -21,6 +25,10 @@ function init(sequelizeOptions: SequelizeOptions) {
     AgreementModel,
     AgreementSignatureModel,
     AgreementHistoryModel,
+    RentalHirerChangeRequestModel,
+    HirerChangeRequestNewHirerModel,
+    HirerChangeRequestRemoveHirerModel,
+    HirerChangeRequestSignatureModel,
   ]);
 }
 

package/src/enum/index.ts

@@ -4,6 +4,9 @@ import { RentalAccountTypeEnum } from './account-type.enum';
 import { AggrementStatusEnum } from './aggrement-status.enum';
 import { AgreementSignatureStatusEnum } from './agreement-signature-status.enum';
 import { HirerTypeEnum } from './hirer-type.enum';
+import { HirerChangeRequestTypeEnum } from './rental-hirer-change-request-type';
+import { HirerChangeRequestStatusEnum } from './rental-hirer-change-request-status';
+import { HirerChangeRequestHirerRoleEnum } from './rental-hirer-change-request-hirer-role';
 
 export {
   RentalStatusEnum,
@@ -12,4 +15,7 @@ export {
   AggrementStatusEnum,
   AgreementSignatureStatusEnum,
   HirerTypeEnum,
+  HirerChangeRequestTypeEnum,
+  HirerChangeRequestStatusEnum,
+  HirerChangeRequestHirerRoleEnum,
 };

package/src/enum/rental-hirer-change-request-hirer-role.ts

@@ -0,0 +1,4 @@
+export enum HirerChangeRequestHirerRoleEnum {
+  MAIN = 'Main',
+  JOINT = 'Joint',
+}

package/src/enum/rental-hirer-change-request-status.ts

@@ -0,0 +1,7 @@
+export enum HirerChangeRequestStatusEnum {
+  DRAFT = 'Draft',
+  PENDINGSIGNATURES = 'PendingSignatures',
+  AWAITINGNEWHIRER = 'AwaitingNewHirer',
+  COMPLETED = 'Completed',
+  CANCELLED = 'Cancelled',
+}

package/src/enum/rental-hirer-change-request-type.ts

@@ -0,0 +1,4 @@
+export enum HirerChangeRequestTypeEnum {
+  ADD = 'Add',
+  REMOVE = 'Remove',
+}

package/src/index.ts

@@ -12,6 +12,14 @@ 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 { 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';
+import { HirerChangeRequestSignatureRepository } from './components/hirer-change-request-signature/hirer-change-request-signature.repository';
+import { HirerChangeRequestNewHirer } from './components/hirer-change-request-new-hirer/hirer-change-request-new-hirer';
+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 * as rentalDb from './database';
 export * from './interfaces';
 export * from './models';
@@ -33,4 +41,12 @@ export {
   AgreementSignatureRepository,
   AgreementHistory,
   AgreementHistoryRepository,
+  RentalHirerChangeRequest,
+  RentalHirerChangeRequestRepository,
+  HirerChangeRequestSignature,
+  HirerChangeRequestSignatureRepository,
+  HirerChangeRequestNewHirer,
+  HirerChangeRequestNewHirerRepository,
+  HirerChangeRequestRemoveHirer,
+  HirerChangeRequestRemoveHirerRepository,
 };

package/src/interfaces/hirer-change-request-new-hirer-attr.interface.ts

@@ -0,0 +1,15 @@
+export interface IHirerChangeRequestNewHirerAttr {
+  NewHirerId: string;
+  RequestId: string;
+  FullName: string;
+  Email: string;
+  IdType: string;
+  IdNo: string;
+  ContactNo: string;
+  Relationship: string;
+  Address: string;
+  City: string;
+  State: string;
+  Postcode: string;
+  Country: string;
+}

package/src/interfaces/hirer-change-request-remove-hirer-attr.interface.ts

@@ -0,0 +1,5 @@
+export interface IHirerChangeRequestRemoveHirerAttr {
+  RemoveHirerId: string;
+  RequestId: string;
+  TargetHirerId: string;
+}

package/src/interfaces/hirer-change-request-signature-attr.interface.ts

@@ -0,0 +1,15 @@
+import { HirerChangeRequestHirerRoleEnum } from '../enum';
+
+export interface IHirerChangeRequestSignatureAttr {
+  SignatureId: string;
+  RequestId: string;
+  CustomerId: string;
+  JointHirerId: string;
+  HirerType: HirerChangeRequestHirerRoleEnum;
+  SignedAt: Date;
+  Method: string;
+  Remarks: string;
+  CreatedAt: Date;
+  UpdatedAt: Date;
+  UpdatedById: string;
+}

package/src/interfaces/index.ts

@@ -6,6 +6,11 @@ import { IAgreementAttr } from './agreement-attr.interface';
 import { IBookingFindAllSearchAttr } from './booking-find-all-search-attr.interface';
 import { IAgreementSignatureAttr } from './agreemeent-signature-attr.interface';
 import { IResponseAgreementSignature } from './response-hirer-signature-attr.interface';
+import { IRentalHirerChangeRequestAttr } from './rental-hirer-change-request.attr.interface';
+import { IRentalHirerChangeRequestUpdate } from './rental-hirer-change-request.update.interface';
+import { IHirerChangeRequestSignatureAttr } from './hirer-change-request-signature-attr.interface';
+import { IHirerChangeRequestRemoveHirerAttr } from './hirer-change-request-remove-hirer-attr.interface';
+import { IHirerChangeRequestNewHirerAttr } from './hirer-change-request-new-hirer-attr.interface';
 
 export {
   IRentalAttr,
@@ -16,4 +21,9 @@ export {
   IBookingFindAllSearchAttr,
   IAgreementSignatureAttr,
   IResponseAgreementSignature,
+  IRentalHirerChangeRequestAttr,
+  IRentalHirerChangeRequestUpdate,
+  IHirerChangeRequestSignatureAttr,
+  IHirerChangeRequestRemoveHirerAttr,
+  IHirerChangeRequestNewHirerAttr,
 };

package/src/interfaces/joint-hirer-attr.interface.ts

@@ -3,6 +3,7 @@ export interface IJointHirerAttr {
   RentalId: string;
   CustomerId: string;
   CustomerType: string;
+  Status: string;
   CreatedById: string;
   CreatedAt: Date;
   UpdatedById: string;

package/src/interfaces/rental-hirer-change-request.attr.interface.ts

@@ -0,0 +1,17 @@
+import { HirerChangeRequestTypeEnum } from '../enum/rental-hirer-change-request-type';
+import { HirerChangeRequestStatusEnum } from '../enum/rental-hirer-change-request-status';
+import { HirerChangeRequestHirerRoleEnum } from '../enum/rental-hirer-change-request-hirer-role';
+
+export interface IRentalHirerChangeRequestAttr {
+  RequestId: string;
+  RentalId: string;
+  Type: HirerChangeRequestTypeEnum;
+  Status: HirerChangeRequestStatusEnum;
+  RequestedAt: Date;
+  RequestedById: string;
+  RequestingHirerId: string;
+  RequestingHirerType: HirerChangeRequestHirerRoleEnum;
+  CancelRemarks: string;
+  UpdatedAt: Date;
+  UpdatedById: string;
+}

package/src/interfaces/rental-hirer-change-request.update.interface.ts

@@ -0,0 +1,4 @@
+export interface IRentalHirerChangeRequestUpdate {
+  customerId?: string;
+  jointHirerId?: string;
+}

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

@@ -0,0 +1,102 @@
+import {
+  Table,
+  Model,
+  Column,
+  DataType,
+  ForeignKey,
+  BelongsTo,
+} from 'sequelize-typescript';
+import { RentalHirerChangeRequestModel } from './rental-hirer-change-request.entity';
+import { IHirerChangeRequestNewHirerAttr } from 'interfaces/hirer-change-request-new-hirer-attr.interface';
+
+@Table({
+  tableName: 'hirerChangeRequest_NewHirer',
+  timestamps: false,
+})
+export class HirerChangeRequestNewHirerModel
+  extends Model
+  implements IHirerChangeRequestNewHirerAttr
+{
+  @Column({
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  NewHirerId: string;
+
+  @ForeignKey(() => RentalHirerChangeRequestModel)
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  RequestId: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(200),
+  })
+  FullName: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(100),
+  })
+  Email: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(20),
+  })
+  IdType: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(50),
+  })
+  IdNo: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(20),
+  })
+  ContactNo: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(20),
+  })
+  Relationship: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(1000),
+  })
+  Address: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(100),
+  })
+  City: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(100),
+  })
+  State: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(20),
+  })
+  Postcode: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(100),
+  })
+  Country: string;
+
+  @BelongsTo(() => RentalHirerChangeRequestModel)
+  HirerChangeRequest: RentalHirerChangeRequestModel;
+}

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

@@ -0,0 +1,47 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  Model,
+  Table,
+} 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';
+
+@Table({
+  tableName: 'hirerChangeRequest_RemoveHirer',
+  timestamps: false,
+})
+export class HirerChangeRequestRemoveHirerModel
+  extends Model
+  implements IHirerChangeRequestRemoveHirerAttr
+{
+  @Column({
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  RemoveHirerId: string;
+
+  @ForeignKey(() => RentalHirerChangeRequestModel)
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  RequestId: string;
+
+  @ForeignKey(() => JointHirerModel)
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  TargetHirerId: string;
+
+  @BelongsTo(() => RentalHirerChangeRequestModel)
+  RentalHirerChangeRequest: RentalHirerChangeRequestModel;
+
+  @BelongsTo(() => JointHirerModel, { foreignKey: 'TargetHirerId' })
+  TargetHirer: JointHirerModel;
+}

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

@@ -0,0 +1,86 @@
+import {
+  Table,
+  Model,
+  Column,
+  DataType,
+  ForeignKey,
+  BelongsTo,
+  CreatedAt,
+  UpdatedAt,
+} 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';
+
+@Table({
+  tableName: 'hirerChangeRequest_Signature',
+})
+export class HirerChangeRequestSignatureModel
+  extends Model
+  implements IHirerChangeRequestSignatureAttr
+{
+  @Column({
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  SignatureId: string;
+
+  @ForeignKey(() => RentalHirerChangeRequestModel)
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  RequestId: string;
+
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(30),
+  })
+  CustomerId: string;
+
+  @Column({
+    type: DataType.STRING(30),
+    allowNull: true,
+  })
+  JointHirerId: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  HirerType: HirerChangeRequestHirerRoleEnum;
+
+  @Column({
+    type: DataType.DATE,
+    allowNull: true,
+  })
+  SignedAt: Date;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(20),
+  })
+  Method: string;
+
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(300),
+  })
+  Remarks: string;
+
+  @CreatedAt
+  CreatedAt: Date;
+
+  @UpdatedAt
+  UpdatedAt: Date;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  UpdatedById: string;
+
+  @BelongsTo(() => RentalHirerChangeRequestModel)
+  HirerChangeRequest: RentalHirerChangeRequestModel;
+}

package/src/models/index.ts

@@ -5,6 +5,10 @@ import { JointHirerModel } from './joint-hirer.entity';
 import { AgreementModel } from './agreement.entity';
 import { AgreementSignatureModel } from './agreement-signature.entity';
 import { AgreementHistoryModel } from './agreement-history.entity';
+import { RentalHirerChangeRequestModel } from './rental-hirer-change-request.entity';
+import { HirerChangeRequestSignatureModel } from './hirer-change-request-signature.entity';
+import { HirerChangeRequestRemoveHirerModel } from './hirer-change-request-remove-hirer.entity';
+import { HirerChangeRequestNewHirerModel } from './hirer-change-request-new-hirer.entity';
 
 export {
   RentalModel,
@@ -14,4 +18,8 @@ export {
   AgreementModel,
   AgreementSignatureModel,
   AgreementHistoryModel,
+  RentalHirerChangeRequestModel,
+  HirerChangeRequestSignatureModel,
+  HirerChangeRequestRemoveHirerModel,
+  HirerChangeRequestNewHirerModel,
 };

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

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

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

@@ -0,0 +1,93 @@
+import {
+  Table,
+  Model,
+  Column,
+  DataType,
+  ForeignKey,
+  CreatedAt,
+  UpdatedAt,
+  HasMany,
+  BelongsTo,
+} from 'sequelize-typescript';
+import { RentalModel } from './rental.entity';
+import { HirerChangeRequestTypeEnum } from '../enum/rental-hirer-change-request-type';
+import { HirerChangeRequestStatusEnum } from '../enum/rental-hirer-change-request-status';
+import { HirerChangeRequestSignatureModel } from './hirer-change-request-signature.entity';
+import { IRentalHirerChangeRequestAttr } from '../interfaces/rental-hirer-change-request.attr.interface';
+import { HirerChangeRequestHirerRoleEnum } from '../enum/rental-hirer-change-request-hirer-role';
+
+@Table({
+  tableName: 'rental_HirerChangeRequest',
+})
+export class RentalHirerChangeRequestModel
+  extends Model
+  implements IRentalHirerChangeRequestAttr
+{
+  @Column({
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  RequestId: string;
+
+  @ForeignKey(() => RentalModel)
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  RentalId: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  Type: HirerChangeRequestTypeEnum;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  Status: HirerChangeRequestStatusEnum;
+
+  @CreatedAt
+  RequestedAt: Date;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  RequestedById: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  RequestingHirerId: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  RequestingHirerType: HirerChangeRequestHirerRoleEnum; // Assuming this is the correct type, adjust if necessary
+
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(300),
+  })
+  CancelRemarks: string;
+
+  @UpdatedAt
+  UpdatedAt: Date;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  UpdatedById: string;
+
+  @BelongsTo(() => RentalModel)
+  Rental: RentalModel;
+
+  @HasMany(() => HirerChangeRequestSignatureModel)
+  HirerList: HirerChangeRequestSignatureModel[];
+}