diff --git a/src/entity/remit_config_allocation.ts b/src/entity/remit_config_allocations.ts similarity index 100% rename from src/entity/remit_config_allocation.ts rename to src/entity/remit_config_allocations.ts diff --git a/src/entity/remit_config_transaction.ts b/src/entity/remit_config_transactions.ts similarity index 100% rename from src/entity/remit_config_transaction.ts rename to src/entity/remit_config_transactions.ts diff --git a/src/entity/remit_partner_allocations.ts b/src/entity/remit_partner_allocations.ts new file mode 100644 index 0000000..aec974d --- /dev/null +++ b/src/entity/remit_partner_allocations.ts @@ -0,0 +1,55 @@ +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, JoinColumn, ManyToOne, JoinTable } from "typeorm"; +import { Status } from "../types/status"; +import { RemitPartner } from "./remit_partners"; + +@Entity("remit_partner_allocations", { schema: "remits" }) +export class RemitPartnerAllocation { + @PrimaryGeneratedColumn("uuid") + id: string; + + @ManyToOne(() => RemitPartner, { onDelete: "CASCADE" }) + @JoinTable() + partner: RemitPartner; + + @Column({ + nullable: true, + length: 256, + }) + bri_value: string; + + @Column({ + nullable: true, + length: 256, + }) + partner_value: string; + + @Column({ + nullable: false, + length: 64, + }) + status: Status; + + @Column() + @CreateDateColumn() + created_at: Date; + + @Column({ + nullable: true, + length: 256, + }) + created_by: string; + + @Column({ nullable: true }) + @UpdateDateColumn() + updated_at: Date; + + @Column({ + nullable: true, + length: 256, + }) + updated_by: string; + + @Column({ nullable: true }) + @DeleteDateColumn() + deleted_at: Date; +} diff --git a/src/entity/remit_partner_transactions.ts b/src/entity/remit_partner_transactions.ts new file mode 100644 index 0000000..7c059b3 --- /dev/null +++ b/src/entity/remit_partner_transactions.ts @@ -0,0 +1,67 @@ +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, JoinColumn, ManyToOne, JoinTable } from "typeorm"; +import { Status } from "../types/status"; +import { RemitPartner } from "./remit_partners"; + +@Entity("remit_partner_transactions", { schema: "remits" }) +export class RemitPartnerTransaction { + @PrimaryGeneratedColumn("uuid") + id: string; + + @ManyToOne(() => RemitPartner, { onDelete: "CASCADE" }) + @JoinTable() + partner: RemitPartner; + + @Column({ + nullable: true, + length: 256, + }) + min: string; + + @Column({ + nullable: true, + length: 256, + }) + max: string; + + @Column({ + nullable: true, + length: 256, + }) + type: string; + + @Column({ + nullable: true, + length: 256, + }) + value: string; + + @Column({ + nullable: false, + length: 64, + }) + status: Status; + + @Column() + @CreateDateColumn() + created_at: Date; + + @Column({ + nullable: true, + length: 256, + }) + created_by: string; + + @Column({ nullable: true }) + @UpdateDateColumn() + updated_at: Date; + + @Column({ + nullable: true, + length: 256, + }) + updated_by: string; + + @Column({ nullable: true }) + @DeleteDateColumn() + deleted_at: Date; +} diff --git a/src/entity/remit_partners.ts b/src/entity/remit_partners.ts index c5884fe..d390fb4 100644 --- a/src/entity/remit_partners.ts +++ b/src/entity/remit_partners.ts @@ -26,6 +26,13 @@ export class RemitPartner { }) phone: string; + @Column({ + nullable: true, + unique: false, + length: 256, + }) + email: string; + @Column({ nullable: true, length: 4096, @@ -183,4 +190,14 @@ export class RemitPartner { @Column({ nullable: true }) @DeleteDateColumn() deleted_at: Date; + + @Column({ type: "timestamp", nullable: true }) + finalized_at: Date; + + @Column({ + nullable: true, + length: 256, + unique: false, + }) + finalized_by: string; } diff --git a/src/entity/remit_tansfer.ts b/src/entity/remit_tansfer.ts index 5f744ee..ad95c73 100644 --- a/src/entity/remit_tansfer.ts +++ b/src/entity/remit_tansfer.ts @@ -2,6 +2,7 @@ import bcrypt from "bcryptjs"; import { Status } from "../types/status"; import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, OneToOne, JoinColumn, ManyToOne, OneToMany, ManyToMany, JoinTable } from "typeorm"; import { RemitPartner } from "./remit_partners"; +import { ApprovalStatus } from "../enum/approvalStatus"; @Entity("remit_transfer", { schema: "remits" }) export class RemitTransfer { @@ -47,11 +48,65 @@ export class RemitTransfer { }) amount: string; + // new field + @Column({ + nullable: true, + length: 64, + unique: false, + }) + sender_name: string; + + @Column({ + nullable: true, + length: 64, + unique: false, + }) + sender_id_type: string; + + @Column({ + nullable: true, + length: 64, + unique: false, + }) + sender_id_number: string; + + @Column({ + nullable: true, + type: "text", + unique: false, + }) + sender_id_file: string; + + @Column({ + nullable: true, + length: 64, + unique: false, + }) + sender_country: string; + @Column({ nullable: false, length: 64, }) status: string; + @Column({ + nullable: true, + length: 64, + }) + transaction_fee: string; + + @Column({ + nullable: true, + length: 64, + }) + allocation_bri_value: string; + + @Column({ + nullable: true, + length: 64, + }) + allocation_partner_value: string; + @Column({ nullable: false, length: 64, @@ -63,6 +118,19 @@ export class RemitTransfer { @CreateDateColumn() created_at: Date; + @Column({ type: "timestamp", nullable: true }) + finalized_at: Date; + + @Column({ + nullable: true, + length: 256, + unique: false, + }) + finalized_by: string; + + @Column({ nullable: true }) + approved_at: Date; + @Column({ nullable: true }) @UpdateDateColumn() updated_at: Date; diff --git a/src/entity/remit_topup.ts b/src/entity/remit_topup.ts index 041e134..4778e5f 100644 --- a/src/entity/remit_topup.ts +++ b/src/entity/remit_topup.ts @@ -30,6 +30,16 @@ export class RemitTopup { }) status: string; + @Column({ type: "timestamp", nullable: true }) + finalized_at: Date; + + @Column({ + nullable: true, + length: 256, + unique: false, + }) + finalized_by: string; + @Column() @CreateDateColumn() created_at: Date; diff --git a/src/index.ts b/src/index.ts index 2c77d36..2f17799 100644 --- a/src/index.ts +++ b/src/index.ts @@ -87,13 +87,15 @@ import { AssetInventoryDepreciationLog } from "./entity/asset_inventory_deprecia import { RemitOtp } from "./entity/remit_otp"; import { RemitPartnerUser } from "./entity/remit_partner_users"; import { RemitPartner } from "./entity/remit_partners"; +import { RemitPartnerTransaction } from "./entity/remit_partner_transactions"; +import { RemitPartnerAllocation } from "./entity/remit_partner_allocations"; import { RemitRegion } from "./entity/remit_region"; import { RemitTransfer } from "./entity/remit_tansfer"; import { RemitTopup } from "./entity/remit_topup"; import { RemitMutation } from "./entity/remit_mutation"; import { RemitBank } from "./entity/remit_bank"; -import { RemitConfigTransaction } from "./entity/remit_config_transaction"; -import { RemitConfigAllocation } from "./entity/remit_config_allocation"; +import { RemitConfigTransaction } from "./entity/remit_config_transactions"; +import { RemitConfigAllocation } from "./entity/remit_config_allocations"; import { RemitConfigKurs } from "./entity/remit_config_kurs"; import { BrizziBatchStatus, BrizziCardStatus, BrizziHistoryActvity, BrizziHistoryType, BrizziHistoryRemarks } from "./types/brizzi"; @@ -101,28 +103,7 @@ import { BrizziBatch } from "./entity/brizzi_batchs"; import { BrizziCard } from "./entity/brizzi_cards"; import { BrizziHistory } from "./entity/brizzi_history"; -import { - BrilinkMerchantStatus, - BrilinkTerminalType, - BrilinkTerminalCondition, - BrilinkTerminalOnline, - BrilinkBalanceType, - BrilinkBalanceCode, - BrilinkBalanceMutationType, - BrilinkBalanceMutationActvity, - BrilinkBalanceSourceType, - BrilinkBalanceDestinationType, - BrilinkBalanceMutationStatus, - BrilinkTransactionType, - BrilinkTransactionActivity, - BrilinkTransactionStatus, - BrilinkMerchantSettlementStatus, - BrilinkTransactionCodePrefixType, - BrilinkTransactionCodePrefixActivity, - BrilinkBalanceMutationCodePrefixType, - BrilinkBalanceMutationCodePrefixActvity, - BrilinkBalanceTopupCodePrefix -} from "./types/brilink"; +import { BrilinkMerchantStatus, BrilinkTerminalType, BrilinkTerminalCondition, BrilinkTerminalOnline, BrilinkBalanceType, BrilinkBalanceCode, BrilinkBalanceMutationType, BrilinkBalanceMutationActvity, BrilinkBalanceSourceType, BrilinkBalanceDestinationType, BrilinkBalanceMutationStatus, BrilinkTransactionType, BrilinkTransactionActivity, BrilinkTransactionStatus, BrilinkMerchantSettlementStatus, BrilinkTransactionCodePrefixType, BrilinkTransactionCodePrefixActivity, BrilinkBalanceMutationCodePrefixType, BrilinkBalanceMutationCodePrefixActvity, BrilinkBalanceTopupCodePrefix } from "./types/brilink"; import { BrilinkMerchant } from "./entity/brilink_merchants"; import { BrilinkMerchantUser } from "./entity/brilink_merchant_users"; @@ -244,6 +225,8 @@ export { RemitOtp, RemitPartnerUser, RemitPartner, + RemitPartnerTransaction, + RemitPartnerAllocation, RemitRegion, RemitTransfer, RemitTopup,