@tomei/rental 0.17.3-dev.6 → 0.17.3-dev.8

package/migrations/agreement-signature-table-migration.js

@@ -39,6 +39,18 @@ module.exports = {
         type: Sequelize.DATE,
         allowNull: true,
       },
+      VerificationMethod: {
+        type: Sequelize.STRING(30),
+        allowNull: false,
+      },
+      VerificationJustification: {
+        type: Sequelize.STRING(3000),
+        allowNull: true,
+      },
+      VerifiedById: {
+        type: Sequelize.STRING(30),
+        allowNull: true,
+      },
       CreatedById: {
         type: Sequelize.STRING(30),
         allowNull: false,

package/package.json

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

package/src/components/agreement-signature/agreement-signature.ts

@@ -5,6 +5,7 @@ import { ApplicationConfig } from '@tomei/config';
 import { LoginUser } from '@tomei/sso';
 import { ActionEnum, Activity } from '@tomei/activity-history';
 import { AgreementSignatureStatusEnum } from '../../enum/agreement-signature-status.enum';
+import { AgreementSignatureVerificationMethodEnum } from '../../enum/agreement-signature-verification-method.enum';
 
 export class AgreementSignature
   extends ObjectBase
@@ -20,6 +21,9 @@ export class AgreementSignature
   PartyType: string;
   SignatureStatus: AgreementSignatureStatusEnum;
   SignedAt: Date;
+  VerificationMethod: AgreementSignatureVerificationMethodEnum;
+  VerificationJustification: string;
+  VerifiedById: string;
   CreatedById: string;
   CreatedAt: Date;
   UpdatedById: string;
@@ -45,6 +49,10 @@ export class AgreementSignature
       this.PartyType = AgreementSignatureAttr.PartyType;
       this.SignatureStatus = AgreementSignatureAttr.SignatureStatus;
       this.SignedAt = AgreementSignatureAttr.SignedAt;
+      this.VerificationMethod = AgreementSignatureAttr.VerificationMethod;
+      this.VerificationJustification =
+        AgreementSignatureAttr.VerificationJustification;
+      this.VerifiedById = AgreementSignatureAttr.VerifiedById;
       this.CreatedById = AgreementSignatureAttr.CreatedById;
       this.CreatedAt = AgreementSignatureAttr.CreatedAt;
       this.UpdatedById = AgreementSignatureAttr.UpdatedById;
@@ -101,6 +109,7 @@ export class AgreementSignature
       }
 
       this.ObjectId = this.createId();
+      this.VerifiedById = loginUser.ObjectId;
       this.CreatedById = loginUser.ObjectId;
       this.CreatedAt = new Date();
       this.UpdatedById = loginUser.ObjectId;
@@ -114,6 +123,9 @@ export class AgreementSignature
         PartyType: this.PartyType,
         SignatureStatus: this.SignatureStatus,
         SignedAt: this.SignedAt,
+        VerificationMethod: this.VerificationMethod,
+        VerificationJustification: this.VerificationJustification,
+        VerifiedById: this.VerifiedById,
         CreatedById: this.CreatedById,
         CreatedAt: this.CreatedAt,
         UpdatedById: this.UpdatedById,

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 { AuthContext, LoginUser, System } 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';
@@ -24,6 +24,7 @@ import { HirerTypeEnum } from '../../enum/hirer-type.enum';
 import { AgreementHistoryRepository } from '../agreement-history/agreement-history.repository';
 import { DocType, Document, IAccountSystem } from '@tomei/finance';
 import { ItemClassMap } from '../../ClassMappings/ItemClassMap';
+import { AgreementSignatureVerificationMethodEnum } from '../../enum/agreement-signature-verification-method.enum';
 
 export class Rental extends ObjectBase {
   ObjectId: string;
@@ -826,6 +827,8 @@ export class Rental extends ObjectBase {
     PartyType: string,
     dbTransaction: any,
     statusAfterSign?: RentalStatusEnum | string,
+    method?: AgreementSignatureVerificationMethodEnum,
+    justification?: string,
   ) {
     try {
       // Part 1: Privilege Checking
@@ -886,6 +889,9 @@ export class Rental extends ObjectBase {
         SignedAt: new Date(),
         UpdatedById: loginUser.ObjectId,
         UpdatedAt: new Date(),
+        VerificationMethod: method,
+        VerificationJustification: justification,
+        VerifiedById: loginUser.ObjectId,
       };
 
       await Rental._AgreementSignatureRepo.update(signaturePayload, {

package/src/enum/agreement-signature-verification-method.enum.ts

@@ -0,0 +1,4 @@
+export enum AgreementSignatureVerificationMethodEnum {
+  FINGERPRINT = 'Fingerprint',
+  PHYSICAL_ID = 'Physical ID',
+}

package/src/enum/index.ts

@@ -7,6 +7,7 @@ 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';
+import { AgreementSignatureVerificationMethodEnum } from './agreement-signature-verification-method.enum';
 
 export {
   RentalStatusEnum,
@@ -18,4 +19,5 @@ export {
   HirerChangeRequestTypeEnum,
   HirerChangeRequestStatusEnum,
   HirerChangeRequestHirerRoleEnum,
+  AgreementSignatureVerificationMethodEnum,
 };

package/src/interfaces/agreemeent-signature-attr.interface.ts

@@ -1,3 +1,4 @@
+import { AgreementSignatureVerificationMethodEnum } from '../enum/agreement-signature-verification-method.enum';
 import { AgreementSignatureStatusEnum } from '../enum/agreement-signature-status.enum';
 
 export interface IAgreementSignatureAttr {
@@ -8,6 +9,9 @@ export interface IAgreementSignatureAttr {
   PartyType: string;
   SignatureStatus: AgreementSignatureStatusEnum;
   SignedAt: Date;
+  VerificationMethod: AgreementSignatureVerificationMethodEnum;
+  VerificationJustification?: string;
+  VerifiedById?: string;
   CreatedById: string;
   CreatedAt: Date;
   UpdatedById: string;

package/src/models/agreement-signature.entity.ts

@@ -11,6 +11,7 @@ import {
 import { AgreementModel } from './agreement.entity';
 import { IAgreementSignatureAttr } from '../interfaces/agreemeent-signature-attr.interface';
 import { AgreementSignatureStatusEnum } from '../enum/agreement-signature-status.enum';
+import { AgreementSignatureVerificationMethodEnum } from '../enum/agreement-signature-verification-method.enum';
 
 @Table({
   tableName: 'rental_AgreementSignature',
@@ -63,6 +64,24 @@ export class AgreementSignatureModel
   })
   SignedAt: Date;
 
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  VerificationMethod: AgreementSignatureVerificationMethodEnum;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(3000),
+  })
+  VerificationJustification: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  VerifiedById: string;
+
   @Column({
     allowNull: false,
     type: DataType.STRING(30),