@tomei/rental 0.12.4 → 0.13.0

package/src/interfaces/index.ts

@@ -1,15 +1,19 @@
-import { IRentalAttr } from './rental-attr.interface';
-import { IRentalPriceAttr } from './rental-price-attr.interface';
-import { IRentalFindAllSearchAttr } from './rental-find-all-search-attr.interface';
-import { IBookingAttr } from './booking-attr.interface';
-import { IAgreementAttr } from './agreement-attr.interface';
-import { IBookingFindAllSearchAttr } from './booking-find-all-search-attr.interface';
-
-export {
-  IRentalAttr,
-  IRentalPriceAttr,
-  IRentalFindAllSearchAttr,
-  IBookingAttr,
-  IAgreementAttr,
-  IBookingFindAllSearchAttr,
-};
+import { IRentalAttr } from './rental-attr.interface';
+import { IRentalPriceAttr } from './rental-price-attr.interface';
+import { IRentalFindAllSearchAttr } from './rental-find-all-search-attr.interface';
+import { IBookingAttr } from './booking-attr.interface';
+import { IAgreementAttr } from './agreement-attr.interface';
+import { IBookingFindAllSearchAttr } from './booking-find-all-search-attr.interface';
+import { IHirerSignatureAttr } from './hirer-signature-attr.interface';
+import { IResponseHirerSignature } from './response-hirer-signature-attr.interface';
+
+export {
+  IRentalAttr,
+  IRentalPriceAttr,
+  IRentalFindAllSearchAttr,
+  IBookingAttr,
+  IAgreementAttr,
+  IBookingFindAllSearchAttr,
+  IHirerSignatureAttr,
+  IResponseHirerSignature,
+};

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

@@ -1,10 +1,10 @@
-export interface IJointHirerAttr {
-  HirerId: string;
-  RentalId: string;
-  CustomerId: string;
-  CustomerType: string;
-  CreatedById: string;
-  CreatedAt: Date;
-  UpdatedById: string;
-  UpdatedAt: Date;
-}
+export interface IJointHirerAttr {
+  HirerId: string;
+  RentalId: string;
+  CustomerId: string;
+  CustomerType: string;
+  CreatedById: string;
+  CreatedAt: Date;
+  UpdatedById: string;
+  UpdatedAt: Date;
+}

package/src/interfaces/rental-attr.interface.ts

@@ -1,25 +1,25 @@
-import { RentalStatusEnum } from '../enum/rental-status.enum';
-import { RentalAccountTypeEnum } from '../enum/account-type.enum';
-import { IJointHirerAttr } from './joint-hirer-attr.interface';
-
-export interface IRentalAttr {
-  RentalId: string;
-  CustomerId: string;
-  CustomerType: string;
-  ItemId: string;
-  ItemType: string;
-  PriceId: string;
-  StartDateTime: Date;
-  EndDateTime: Date;
-  CancelRemarks: string;
-  TerminateRemarks: string;
-  AgreementNo: string;
-  AccountType: RentalAccountTypeEnum;
-  Status: RentalStatusEnum;
-  EscheatmentYN: string;
-  CreatedById: string;
-  CreatedAt: Date;
-  UpdatedById: string;
-  UpdatedAt: Date;
-  JointHirers?: IJointHirerAttr[];
-}
+import { RentalStatusEnum } from '../enum/rental-status.enum';
+import { RentalAccountTypeEnum } from '../enum/account-type.enum';
+import { IJointHirerAttr } from './joint-hirer-attr.interface';
+
+export interface IRentalAttr {
+  RentalId: string;
+  CustomerId: string;
+  CustomerType: string;
+  ItemId: string;
+  ItemType: string;
+  PriceId: string;
+  StartDateTime: Date;
+  EndDateTime: Date;
+  CancelRemarks: string;
+  TerminateRemarks: string;
+  AgreementNo: string;
+  AccountType: RentalAccountTypeEnum;
+  Status: RentalStatusEnum;
+  EscheatmentYN: string;
+  CreatedById: string;
+  CreatedAt: Date;
+  UpdatedById: string;
+  UpdatedAt: Date;
+  JointHirers?: IJointHirerAttr[];
+}

package/src/interfaces/rental-find-all-search-attr.interface.ts

@@ -1,11 +1,11 @@
-import { RentalStatusEnum } from '../enum/rental-status.enum';
-
-export interface IRentalFindAllSearchAttr {
-  Status?: RentalStatusEnum;
-  StartDateTime?: Date;
-  EndDateTime?: Date;
-  ItemId?: string;
-  ItemType?: string;
-  CustomerId?: string;
-  CustomerType?: string;
-}
+import { RentalStatusEnum } from '../enum/rental-status.enum';
+
+export interface IRentalFindAllSearchAttr {
+  Status?: RentalStatusEnum;
+  StartDateTime?: Date;
+  EndDateTime?: Date;
+  ItemId?: string;
+  ItemType?: string;
+  CustomerId?: string;
+  CustomerType?: string;
+}

package/src/interfaces/rental-price-attr.interface.ts

@@ -1,7 +1,7 @@
-export interface IRentalPriceAttr {
-  PriceId: string;
-  RetailPrice: number;
-  Currency: string;
-  PromoCode: string;
-  Remarks: string;
-}
+export interface IRentalPriceAttr {
+  PriceId: string;
+  RetailPrice: number;
+  Currency: string;
+  PromoCode: string;
+  Remarks: string;
+}

package/src/interfaces/response-hirer-signature-attr.interface.ts

@@ -0,0 +1,16 @@
+import { HirerSignatureStatusEnum } from '../enum/hirer-signature-status.enum';
+
+export interface IResponseHirerSignature {
+  HirerSignatureId: string;
+  AgreementNo: string;
+  HirerType: string;
+  CustomerId: string;
+  CustomerName: string;
+  CustomerType: string;
+  SignatureStatus: HirerSignatureStatusEnum;
+  SignedAt: Date;
+  CreatedById: string;
+  CreatedAt: Date;
+  UpdatedById: string;
+  UpdatedAt: Date;
+}

package/src/models/agreement.entity.ts

@@ -1,39 +1,43 @@
-import { Column, DataType, Table, Model, HasMany } from 'sequelize-typescript';
-import { RentalModel } from './rental.entity';
-import { AggrementStatusEnum } from '../enum/aggrement-status.enum';
-
-@Table({
-  tableName: 'rental_Agreement',
-  createdAt: false,
-  updatedAt: false,
-  timestamps: false,
-})
-export class AgreementModel extends Model {
-  @Column({
-    primaryKey: true,
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  AgreementNo: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(20),
-  })
-  Status: AggrementStatusEnum;
-
-  @Column({
-    allowNull: true,
-    type: DataType.DATE,
-  })
-  DateSigned: Date;
-
-  @Column({
-    allowNull: true,
-    type: DataType.STRING(30),
-  })
-  MediaId: string;
-
-  @HasMany(() => RentalModel)
-  Rentals: RentalModel[];
-}
+import { Column, DataType, Table, Model, HasMany } from 'sequelize-typescript';
+import { RentalModel } from './rental.entity';
+import { AggrementStatusEnum } from '../enum/aggrement-status.enum';
+import { HirerSignatureModel } from './hirer-signature.entity';
+
+@Table({
+  tableName: 'rental_Agreement',
+  createdAt: false,
+  updatedAt: false,
+  timestamps: false,
+})
+export class AgreementModel extends Model {
+  @Column({
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  AgreementNo: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(20),
+  })
+  Status: AggrementStatusEnum;
+
+  @Column({
+    allowNull: true,
+    type: DataType.DATE,
+  })
+  DateSigned: Date;
+
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(30),
+  })
+  MediaId: string;
+
+  @HasMany(() => RentalModel)
+  Rentals: RentalModel[];
+
+  @HasMany(() => HirerSignatureModel)
+  HirerSignatures: HirerSignatureModel[];
+}

package/src/models/booking.entity.ts

@@ -1,105 +1,105 @@
-import {
-  Column,
-  DataType,
-  Table,
-  Model,
-  ForeignKey,
-  BelongsTo,
-  CreatedAt,
-  UpdatedAt,
-} from 'sequelize-typescript';
-import { RentalPriceModel } from './rental-price.entity';
-import { BookingStatusEnum } from '../enum/booking.enum';
-
-@Table({
-  tableName: 'booking_Booking',
-})
-export class BookingModel extends Model {
-  @Column({
-    primaryKey: true,
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  BookingNo: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  CustomerId: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  CustomerType: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  ItemId: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  ItemType: string;
-
-  @ForeignKey(() => RentalPriceModel)
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  PriceId: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.DATE,
-  })
-  ScheduledStartDateTime: Date;
-
-  @Column({
-    allowNull: false,
-    type: DataType.DATE,
-  })
-  ScheduledEndDateTime: Date;
-
-  @Column({
-    allowNull: true,
-    type: DataType.DECIMAL(10, 2),
-  })
-  BookingFee: number;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(20),
-  })
-  Status: BookingStatusEnum;
-
-  @Column({
-    type: DataType.STRING(3000),
-  })
-  CancelRemarks: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  CreatedById: string;
-
-  @CreatedAt
-  CreatedAt: Date;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(30),
-  })
-  UpdatedById: string;
-
-  @UpdatedAt
-  UpdatedAt: Date;
-
-  @BelongsTo(() => RentalPriceModel)
-  RentalPrice: RentalPriceModel;
-}
+import {
+  Column,
+  DataType,
+  Table,
+  Model,
+  ForeignKey,
+  BelongsTo,
+  CreatedAt,
+  UpdatedAt,
+} from 'sequelize-typescript';
+import { RentalPriceModel } from './rental-price.entity';
+import { BookingStatusEnum } from '../enum/booking.enum';
+
+@Table({
+  tableName: 'booking_Booking',
+})
+export class BookingModel extends Model {
+  @Column({
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  BookingNo: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  CustomerId: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  CustomerType: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  ItemId: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  ItemType: string;
+
+  @ForeignKey(() => RentalPriceModel)
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  PriceId: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.DATE,
+  })
+  ScheduledStartDateTime: Date;
+
+  @Column({
+    allowNull: false,
+    type: DataType.DATE,
+  })
+  ScheduledEndDateTime: Date;
+
+  @Column({
+    allowNull: true,
+    type: DataType.DECIMAL(10, 2),
+  })
+  BookingFee: number;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(20),
+  })
+  Status: BookingStatusEnum;
+
+  @Column({
+    type: DataType.STRING(3000),
+  })
+  CancelRemarks: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  CreatedById: string;
+
+  @CreatedAt
+  CreatedAt: Date;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  UpdatedById: string;
+
+  @UpdatedAt
+  UpdatedAt: Date;
+
+  @BelongsTo(() => RentalPriceModel)
+  RentalPrice: RentalPriceModel;
+}

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

@@ -0,0 +1,81 @@
+import {
+  Column,
+  DataType,
+  Table,
+  Model,
+  ForeignKey,
+  BelongsTo,
+  CreatedAt,
+  UpdatedAt,
+} from 'sequelize-typescript';
+import { AgreementModel } from './agreement.entity';
+
+@Table({
+  tableName: 'rental_HirerSignature',
+})
+export class HirerSignatureModel extends Model {
+  @Column({
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  HirerSignatureId: string;
+
+  @ForeignKey(() => AgreementModel)
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  AgreementNo: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(10),
+  })
+  HirerType: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  CustomerId: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  CustomerType: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(10),
+  })
+  SignatureStatus: string;
+
+  @Column({
+    allowNull: false,
+    type: DataType.DATE,
+  })
+  SignedAt: Date;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  CreatedById: string;
+
+  @CreatedAt
+  CreatedAt: Date;
+
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  UpdatedById: string;
+
+  @UpdatedAt
+  UpdatedAt: Date;
+
+  @BelongsTo(() => AgreementModel)
+  Agreement: AgreementModel;
+}

package/src/models/index.ts

@@ -1,13 +1,15 @@
-import { RentalModel } from './rental.entity';
-import { RentalPriceModel } from './rental-price.entity';
-import { BookingModel } from './booking.entity';
-import { JointHirerModel } from './joint-hirer.entity';
-import { AgreementModel } from './agreement.entity';
-
-export {
-  RentalModel,
-  RentalPriceModel,
-  BookingModel,
-  JointHirerModel,
-  AgreementModel,
-};
+import { RentalModel } from './rental.entity';
+import { RentalPriceModel } from './rental-price.entity';
+import { BookingModel } from './booking.entity';
+import { JointHirerModel } from './joint-hirer.entity';
+import { AgreementModel } from './agreement.entity';
+import { HirerSignatureModel } from './hirer-signature.entity';
+
+export {
+  RentalModel,
+  RentalPriceModel,
+  BookingModel,
+  JointHirerModel,
+  AgreementModel,
+  HirerSignatureModel,
+};