From 39cd3fd54e63fd8a21737fdbe79c6019fbfc1492 Mon Sep 17 00:00:00 2001 From: meusinfirmary Date: Tue, 25 Mar 2025 00:46:26 +0700 Subject: [PATCH 1/8] update --- src/entity/remit_partners.ts | 2 +- src/entity/remit_send_money.ts | 66 ++++++++++++++++++++++++++++++++++ src/index.ts | 2 ++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 src/entity/remit_send_money.ts diff --git a/src/entity/remit_partners.ts b/src/entity/remit_partners.ts index 6876b29..d4ff37a 100644 --- a/src/entity/remit_partners.ts +++ b/src/entity/remit_partners.ts @@ -16,7 +16,7 @@ export class RemitPartner { @Column({ nullable: false, - unique: true, + unique: false, length: 256, }) name: string; diff --git a/src/entity/remit_send_money.ts b/src/entity/remit_send_money.ts new file mode 100644 index 0000000..dfd88ba --- /dev/null +++ b/src/entity/remit_send_money.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_send_money", { schema: "remits" }) +export class RemitSendMoney { + @PrimaryGeneratedColumn("uuid") + id: string; + + @Column({ + nullable: false, + unique: true, + length: 256, + }) + code: 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/index.ts b/src/index.ts index 60d15c1..41691d9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -77,6 +77,7 @@ 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 { RemitSendMoney } from "./entity/remit_send_money"; export { User, // @@ -165,4 +166,5 @@ export { RemitPartnerUser, RemitPartner, RemitRegion, + RemitSendMoney, }; From b1d49998964cbd2312da6f471ffebf0cc1a89dd0 Mon Sep 17 00:00:00 2001 From: meusinfirmary Date: Tue, 25 Mar 2025 01:35:08 +0700 Subject: [PATCH 2/8] update --- src/entity/remit_partners.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/entity/remit_partners.ts b/src/entity/remit_partners.ts index d4ff37a..908e954 100644 --- a/src/entity/remit_partners.ts +++ b/src/entity/remit_partners.ts @@ -136,7 +136,7 @@ export class RemitPartner { nullable: false, length: 64, }) - status: Status; + status: String; @Column() @CreateDateColumn() From 4bde43679f1cbc08b3d7580a32df92093a8eda3f Mon Sep 17 00:00:00 2001 From: meusinfirmary Date: Tue, 25 Mar 2025 01:50:15 +0700 Subject: [PATCH 3/8] update --- src/entity/{remit_send_money.ts => remit_tansfer.ts} | 4 ++-- src/index.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/entity/{remit_send_money.ts => remit_tansfer.ts} (93%) diff --git a/src/entity/remit_send_money.ts b/src/entity/remit_tansfer.ts similarity index 93% rename from src/entity/remit_send_money.ts rename to src/entity/remit_tansfer.ts index dfd88ba..914eee5 100644 --- a/src/entity/remit_send_money.ts +++ b/src/entity/remit_tansfer.ts @@ -2,8 +2,8 @@ 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_send_money", { schema: "remits" }) -export class RemitSendMoney { +@Entity("remit_transfer", { schema: "remits" }) +export class RemitTransfer { @PrimaryGeneratedColumn("uuid") id: string; diff --git a/src/index.ts b/src/index.ts index 41691d9..72e27a4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -77,7 +77,7 @@ 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 { RemitSendMoney } from "./entity/remit_send_money"; +import { RemitTransfer } from "./entity/remit_tansfer"; export { User, // @@ -166,5 +166,5 @@ export { RemitPartnerUser, RemitPartner, RemitRegion, - RemitSendMoney, + RemitTransfer, }; From 2d6deb420ec533da01a7aed837b6f6fdd3453f46 Mon Sep 17 00:00:00 2001 From: meusinfirmary Date: Tue, 25 Mar 2025 02:05:25 +0700 Subject: [PATCH 4/8] update --- src/entity/remit_tansfer.ts | 2 +- src/entity/remit_topup.ts | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/entity/remit_topup.ts diff --git a/src/entity/remit_tansfer.ts b/src/entity/remit_tansfer.ts index 914eee5..41b5f41 100644 --- a/src/entity/remit_tansfer.ts +++ b/src/entity/remit_tansfer.ts @@ -12,7 +12,7 @@ export class RemitTransfer { unique: true, length: 256, }) - code: string; + ref_number: string; @ManyToOne(() => RemitPartner, { onDelete: "CASCADE" }) @JoinTable() diff --git a/src/entity/remit_topup.ts b/src/entity/remit_topup.ts new file mode 100644 index 0000000..4561703 --- /dev/null +++ b/src/entity/remit_topup.ts @@ -0,0 +1,45 @@ +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_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; +} From 3f8d3d09ec5865c5bf216b41ec4f269a4107a244 Mon Sep 17 00:00:00 2001 From: meusinfirmary Date: Tue, 25 Mar 2025 02:06:36 +0700 Subject: [PATCH 5/8] update remit topup --- src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/index.ts b/src/index.ts index 72e27a4..21b12d7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -78,6 +78,7 @@ 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, // @@ -167,4 +168,5 @@ export { RemitPartner, RemitRegion, RemitTransfer, + RemitTopup, }; From 61c6d8ec6d6f403b04b690fb4a74fc0e07b7e018 Mon Sep 17 00:00:00 2001 From: meusinfirmary Date: Tue, 25 Mar 2025 03:03:30 +0700 Subject: [PATCH 6/8] update --- src/entity/remit_partners.ts | 4 +--- src/entity/remit_topup.ts | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/entity/remit_partners.ts b/src/entity/remit_partners.ts index 908e954..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 { diff --git a/src/entity/remit_topup.ts b/src/entity/remit_topup.ts index 4561703..041e134 100644 --- a/src/entity/remit_topup.ts +++ b/src/entity/remit_topup.ts @@ -1,5 +1,4 @@ -import bcrypt from "bcryptjs"; -import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Index, OneToOne, JoinColumn, ManyToOne, OneToMany, ManyToMany, JoinTable } from "typeorm"; +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, DeleteDateColumn, ManyToOne, JoinTable } from "typeorm"; import { RemitPartner } from "./remit_partners"; @Entity("remit_topup", { schema: "remits" }) From 7eaf9885e28ac03886af892285bb6162afe256c8 Mon Sep 17 00:00:00 2001 From: meusinfirmary Date: Tue, 25 Mar 2025 03:16:16 +0700 Subject: [PATCH 7/8] update --- src/entity/remit_partner_users.ts | 2 +- src/types/status.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/entity/remit_partner_users.ts b/src/entity/remit_partner_users.ts index 8b4a726..98a6344 100644 --- a/src/entity/remit_partner_users.ts +++ b/src/entity/remit_partner_users.ts @@ -54,7 +54,7 @@ export class RemitPartnerUser { nullable: false, length: 64, }) - status: Status; + status: String; @Column() @CreateDateColumn() 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", +} From 5ac199e7b18bfeb823dfd00f5f5d8d297d575d39 Mon Sep 17 00:00:00 2001 From: meusinfirmary Date: Tue, 25 Mar 2025 03:25:00 +0700 Subject: [PATCH 8/8] update --- src/entity/remit_partner_users.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/entity/remit_partner_users.ts b/src/entity/remit_partner_users.ts index 98a6344..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, })