diff --git a/src/entity/remit_partner_users.ts b/src/entity/remit_partner_users.ts index 8b4a726..e811065 100644 --- a/src/entity/remit_partner_users.ts +++ b/src/entity/remit_partner_users.ts @@ -11,14 +11,14 @@ export class RemitPartnerUser { id: string; @Column({ - nullable: false, + nullable: true, unique: false, length: 64, }) email: string; @Column({ - nullable: false, + nullable: true, length: 64, select: false, }) @@ -32,7 +32,7 @@ export class RemitPartnerUser { username: string; @Column({ - nullable: true, + nullable: false, length: 64, unique: false, }) @@ -54,7 +54,7 @@ export class RemitPartnerUser { nullable: false, length: 64, }) - status: Status; + status: String; @Column() @CreateDateColumn() diff --git a/src/entity/remit_partners.ts b/src/entity/remit_partners.ts index 6876b29..bafd3fa 100644 --- a/src/entity/remit_partners.ts +++ b/src/entity/remit_partners.ts @@ -1,6 +1,4 @@ -import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, JoinColumn, ManyToOne } from "typeorm"; - -import { Status } from "../types/status"; +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn } from "typeorm"; @Entity("remit_partners", { schema: "remits" }) export class RemitPartner { @@ -16,7 +14,7 @@ export class RemitPartner { @Column({ nullable: false, - unique: true, + unique: false, length: 256, }) name: string; @@ -136,7 +134,7 @@ export class RemitPartner { nullable: false, length: 64, }) - status: Status; + status: String; @Column() @CreateDateColumn() diff --git a/src/entity/remit_tansfer.ts b/src/entity/remit_tansfer.ts new file mode 100644 index 0000000..41b5f41 --- /dev/null +++ b/src/entity/remit_tansfer.ts @@ -0,0 +1,66 @@ +import bcrypt from "bcryptjs"; +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, OneToOne, JoinColumn, ManyToOne, OneToMany, ManyToMany, JoinTable } from "typeorm"; +import { RemitPartner } from "./remit_partners"; + +@Entity("remit_transfer", { schema: "remits" }) +export class RemitTransfer { + @PrimaryGeneratedColumn("uuid") + id: string; + + @Column({ + nullable: false, + unique: true, + length: 256, + }) + ref_number: string; + + @ManyToOne(() => RemitPartner, { onDelete: "CASCADE" }) + @JoinTable() + partner: RemitPartner; + + @Column({ + nullable: true, + length: 64, + unique: false, + }) + bank_name: string; + + @Column({ + nullable: true, + length: 64, + unique: false, + }) + account_number: string; + + @Column({ + nullable: true, + length: 64, + unique: false, + }) + account_name: string; + + @Column({ + nullable: true, + length: 64, + unique: false, + }) + amount: string; + + @Column({ + nullable: false, + length: 64, + }) + status: string; + + @Column() + @CreateDateColumn() + created_at: Date; + + @Column({ nullable: true }) + @UpdateDateColumn() + updated_at: Date; + + @Column({ nullable: true }) + @DeleteDateColumn() + deleted_at: Date; +} diff --git a/src/entity/remit_topup.ts b/src/entity/remit_topup.ts new file mode 100644 index 0000000..041e134 --- /dev/null +++ b/src/entity/remit_topup.ts @@ -0,0 +1,44 @@ +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, ManyToOne, JoinTable } from "typeorm"; +import { RemitPartner } from "./remit_partners"; + +@Entity("remit_topup", { schema: "remits" }) +export class RemitTopup { + @PrimaryGeneratedColumn("uuid") + id: string; + + @Column({ + nullable: false, + unique: true, + length: 256, + }) + ref_number: string; + + @ManyToOne(() => RemitPartner, { onDelete: "CASCADE" }) + @JoinTable() + partner: RemitPartner; + + @Column({ + nullable: true, + length: 64, + unique: false, + }) + amount: string; + + @Column({ + nullable: false, + length: 64, + }) + status: string; + + @Column() + @CreateDateColumn() + created_at: Date; + + @Column({ nullable: true }) + @UpdateDateColumn() + updated_at: Date; + + @Column({ nullable: true }) + @DeleteDateColumn() + deleted_at: Date; +} diff --git a/src/index.ts b/src/index.ts index 60d15c1..21b12d7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -77,6 +77,8 @@ import { RemitOtp } from "./entity/remit_otp"; import { RemitPartnerUser } from "./entity/remit_partner_users"; import { RemitPartner } from "./entity/remit_partners"; import { RemitRegion } from "./entity/remit_region"; +import { RemitTransfer } from "./entity/remit_tansfer"; +import { RemitTopup } from "./entity/remit_topup"; export { User, // @@ -165,4 +167,6 @@ export { RemitPartnerUser, RemitPartner, RemitRegion, + RemitTransfer, + RemitTopup, }; diff --git a/src/types/status.ts b/src/types/status.ts index 7408c75..33589e3 100644 --- a/src/types/status.ts +++ b/src/types/status.ts @@ -1,4 +1,4 @@ export enum Status { - "Active" = "Y", - "Not Active" = "N" -}; \ No newline at end of file + "Active" = "Y", + "Not Active" = "N", +}