Skip to content

Commit 37f36df

Browse files
NabuteNabute
authored
Revert "feat: made db transaction atomic for major cases"
1 parent fb7c4a7 commit 37f36df

32 files changed

+898
-1034
lines changed

‎app/db/data-source.ts

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import { DataSource, DataSourceOptions } from 'typeorm';
22
import { ConfigService } from '@nestjs/config';
3-
import * as dotenv from 'dotenv';
4-
5-
// Load .env file manually
6-
dotenv.config();
73

84
const config = new ConfigService();
95

@@ -13,11 +9,10 @@ export const dataSrouceOptions: DataSourceOptions = {
139
host: config.get('DB_HOST'),
1410
port: parseInt(config.get('DB_PORT') as string),
1511
username: config.get('DB_USER'),
16-
password: config.get('DB_PASSWORD'),
12+
password: config.get('DB_PASSWORD') as string,
1713
entities: ['dist/**/*.entity.js'],
1814
migrations: ['dist/db/migrations/*.js'],
1915
};
2016

2117
const dataSource = new DataSource(dataSrouceOptions);
22-
2318
export default dataSource;

‎app/db/migrations/1724278857374-initial_table.ts

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import { MigrationInterface, QueryRunner } from "typeorm";
2+
3+
export class InitialTable1724278857374 implements MigrationInterface {
4+
name = 'InitialTable1724278857374'
5+
6+
public async up(queryRunner: QueryRunner): Promise<void> {
7+
await queryRunner.query(`CREATE TABLE "data_lookup" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "type" character varying(256) NOT NULL, "name" character varying(256) NOT NULL, "value" character varying(256) NOT NULL, "description" character varying, "category" character varying(256), "note" character varying, "index" integer NOT NULL DEFAULT '0', "is_default" boolean NOT NULL DEFAULT false, "is_active" boolean NOT NULL DEFAULT true, "remark" character varying, "createdDate" TIMESTAMP NOT NULL DEFAULT now(), "updatedDate" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "UQ_9f60ded44dcddb72401bd6e0d73" UNIQUE ("value"), CONSTRAINT "PK_e50dfedbaea85294d054845459e" PRIMARY KEY ("id"))`);
8+
await queryRunner.query(`CREATE TABLE "customers" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdDate" TIMESTAMP NOT NULL DEFAULT now(), "updatedDate" TIMESTAMP NOT NULL DEFAULT now(), "firstName" character varying NOT NULL, "lastName" character varying NOT NULL, "email" character varying NOT NULL, "objectStateId" uuid, CONSTRAINT "UQ_8536b8b85c06969f84f0c098b03" UNIQUE ("email"), CONSTRAINT "PK_133ec679a801fab5e070f73d3ea" PRIMARY KEY ("id"))`);
9+
await queryRunner.query(`CREATE TABLE "payment_methods" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdDate" TIMESTAMP NOT NULL DEFAULT now(), "updatedDate" TIMESTAMP NOT NULL DEFAULT now(), "name" character varying(100) NOT NULL, "accountHolderName" character varying(100), "accountNumber" character varying(50), "logo" character varying, "objectStateId" uuid, "typeId" uuid, "statusId" uuid, CONSTRAINT "UQ_a793d7354d7c3aaf76347ee5a66" UNIQUE ("name"), CONSTRAINT "PK_34f9b8c6dfb4ac3559f7e2820d1" PRIMARY KEY ("id"))`);
10+
await queryRunner.query(`CREATE TABLE "payments" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdDate" TIMESTAMP NOT NULL DEFAULT now(), "updatedDate" TIMESTAMP NOT NULL DEFAULT now(), "amount" numeric(10,2) NOT NULL, "currency" character varying(3) NOT NULL, "referenceNumber" character varying(100) NOT NULL, "payerName" character varying(100) NOT NULL, "paymentDate" date, "objectStateId" uuid, "statusId" uuid, "subscriptionId" uuid, "paymentMethodId" uuid, CONSTRAINT "PK_197ab7af18c93fbb0c9b28b4a59" PRIMARY KEY ("id"))`);
11+
await queryRunner.query(`CREATE TABLE "subscriptions" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdDate" TIMESTAMP NOT NULL DEFAULT now(), "updatedDate" TIMESTAMP NOT NULL DEFAULT now(), "startDate" TIMESTAMP NOT NULL, "endDate" TIMESTAMP, "objectStateId" uuid, "customerId" uuid, "planId" uuid, "statusId" uuid, CONSTRAINT "PK_a87248d73155605cf782be9ee5e" PRIMARY KEY ("id"))`);
12+
await queryRunner.query(`CREATE TABLE "subscription_plans" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdDate" TIMESTAMP NOT NULL DEFAULT now(), "updatedDate" TIMESTAMP NOT NULL DEFAULT now(), "name" character varying NOT NULL, "price" numeric NOT NULL, "billingCycleDays" integer NOT NULL, "objectStateId" uuid, "statusId" uuid, CONSTRAINT "PK_9ab8fe6918451ab3d0a4fb6bb0c" PRIMARY KEY ("id"))`);
13+
await queryRunner.query(`CREATE TABLE "invoices" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "customerId" character varying NOT NULL, "amount" numeric NOT NULL, "status" character varying NOT NULL DEFAULT 'pending', "paymentDueDate" date NOT NULL, "paymentDate" TIMESTAMP, CONSTRAINT "PK_668cef7c22a427fd822cc1be3ce" PRIMARY KEY ("id"))`);
14+
await queryRunner.query(`ALTER TABLE "customers" ADD CONSTRAINT "FK_128b6a4d0e6f02a7076a604648c" FOREIGN KEY ("objectStateId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
15+
await queryRunner.query(`ALTER TABLE "payment_methods" ADD CONSTRAINT "FK_9b5a223a0b92d4804864af68e52" FOREIGN KEY ("objectStateId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
16+
await queryRunner.query(`ALTER TABLE "payment_methods" ADD CONSTRAINT "FK_137bf799227505edd74b045bcce" FOREIGN KEY ("typeId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
17+
await queryRunner.query(`ALTER TABLE "payment_methods" ADD CONSTRAINT "FK_f0a221fbe9c5b4004a1479f7bb9" FOREIGN KEY ("statusId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
18+
await queryRunner.query(`ALTER TABLE "payments" ADD CONSTRAINT "FK_4394f8cd4011218d070d80093d1" FOREIGN KEY ("objectStateId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
19+
await queryRunner.query(`ALTER TABLE "payments" ADD CONSTRAINT "FK_fe15297113c30bf8a39505ac568" FOREIGN KEY ("statusId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
20+
await queryRunner.query(`ALTER TABLE "payments" ADD CONSTRAINT "FK_2017d0cbfdbfec6b1b388e6aa08" FOREIGN KEY ("subscriptionId") REFERENCES "subscriptions"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
21+
await queryRunner.query(`ALTER TABLE "payments" ADD CONSTRAINT "FK_cbe18cae039006a9c217d5a66a6" FOREIGN KEY ("paymentMethodId") REFERENCES "payment_methods"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
22+
await queryRunner.query(`ALTER TABLE "subscriptions" ADD CONSTRAINT "FK_42329dc93149312811cb8dc7c07" FOREIGN KEY ("objectStateId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
23+
await queryRunner.query(`ALTER TABLE "subscriptions" ADD CONSTRAINT "FK_e0fbe75e9db162a00ecaf7ab56a" FOREIGN KEY ("customerId") REFERENCES "customers"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
24+
await queryRunner.query(`ALTER TABLE "subscriptions" ADD CONSTRAINT "FK_7536cba909dd7584a4640cad7d5" FOREIGN KEY ("planId") REFERENCES "subscription_plans"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
25+
await queryRunner.query(`ALTER TABLE "subscriptions" ADD CONSTRAINT "FK_65f3292e30fccbb0dfe4ae6dcb3" FOREIGN KEY ("statusId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
26+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD CONSTRAINT "FK_b21861cdd922eb98a449c752cdd" FOREIGN KEY ("objectStateId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
27+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD CONSTRAINT "FK_437b83f8551833438d63f78086f" FOREIGN KEY ("statusId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
28+
}
29+
30+
public async down(queryRunner: QueryRunner): Promise<void> {
31+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP CONSTRAINT "FK_437b83f8551833438d63f78086f"`);
32+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP CONSTRAINT "FK_b21861cdd922eb98a449c752cdd"`);
33+
await queryRunner.query(`ALTER TABLE "subscriptions" DROP CONSTRAINT "FK_65f3292e30fccbb0dfe4ae6dcb3"`);
34+
await queryRunner.query(`ALTER TABLE "subscriptions" DROP CONSTRAINT "FK_7536cba909dd7584a4640cad7d5"`);
35+
await queryRunner.query(`ALTER TABLE "subscriptions" DROP CONSTRAINT "FK_e0fbe75e9db162a00ecaf7ab56a"`);
36+
await queryRunner.query(`ALTER TABLE "subscriptions" DROP CONSTRAINT "FK_42329dc93149312811cb8dc7c07"`);
37+
await queryRunner.query(`ALTER TABLE "payments" DROP CONSTRAINT "FK_cbe18cae039006a9c217d5a66a6"`);
38+
await queryRunner.query(`ALTER TABLE "payments" DROP CONSTRAINT "FK_2017d0cbfdbfec6b1b388e6aa08"`);
39+
await queryRunner.query(`ALTER TABLE "payments" DROP CONSTRAINT "FK_fe15297113c30bf8a39505ac568"`);
40+
await queryRunner.query(`ALTER TABLE "payments" DROP CONSTRAINT "FK_4394f8cd4011218d070d80093d1"`);
41+
await queryRunner.query(`ALTER TABLE "payment_methods" DROP CONSTRAINT "FK_f0a221fbe9c5b4004a1479f7bb9"`);
42+
await queryRunner.query(`ALTER TABLE "payment_methods" DROP CONSTRAINT "FK_137bf799227505edd74b045bcce"`);
43+
await queryRunner.query(`ALTER TABLE "payment_methods" DROP CONSTRAINT "FK_9b5a223a0b92d4804864af68e52"`);
44+
await queryRunner.query(`ALTER TABLE "customers" DROP CONSTRAINT "FK_128b6a4d0e6f02a7076a604648c"`);
45+
await queryRunner.query(`DROP TABLE "invoices"`);
46+
await queryRunner.query(`DROP TABLE "subscription_plans"`);
47+
await queryRunner.query(`DROP TABLE "subscriptions"`);
48+
await queryRunner.query(`DROP TABLE "payments"`);
49+
await queryRunner.query(`DROP TABLE "payment_methods"`);
50+
await queryRunner.query(`DROP TABLE "customers"`);
51+
await queryRunner.query(`DROP TABLE "data_lookup"`);
52+
}
53+
54+
}

‎app/db/migrations/1724285282196-initial_table.ts

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
import { MigrationInterface, QueryRunner } from "typeorm";
2+
3+
export class InitialTable1724285282196 implements MigrationInterface {
4+
name = 'InitialTable1724285282196'
5+
6+
public async up(queryRunner: QueryRunner): Promise<void> {
7+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "firstName"`);
8+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "lastName"`);
9+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "deletedDate" TIMESTAMP`);
10+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "description" character varying`);
11+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "trialPeriodDays" integer`);
12+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "maxUsers" integer`);
13+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "maxStorage" numeric`);
14+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "overageCharge" numeric`);
15+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "autoRenewal" boolean NOT NULL DEFAULT true`);
16+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "setupFee" numeric`);
17+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "currency" character varying NOT NULL DEFAULT 'USD'`);
18+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "discount" numeric`);
19+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "cancellationPolicy" character varying`);
20+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "gracePeriodDays" integer`);
21+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "upgradeToPlanId" character varying`);
22+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "downgradeToPlanId" character varying`);
23+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "trialConversionPlanId" character varying`);
24+
await queryRunner.query(`ALTER TABLE "subscription_plans" ADD "prorate" boolean NOT NULL DEFAULT true`);
25+
await queryRunner.query(`ALTER TABLE "customers" ADD "deletedDate" TIMESTAMP`);
26+
await queryRunner.query(`ALTER TABLE "customers" ADD "name" character varying NOT NULL`);
27+
await queryRunner.query(`ALTER TABLE "customers" ADD "phoneNumber" character varying`);
28+
await queryRunner.query(`ALTER TABLE "customers" ADD "billingAddress" character varying`);
29+
await queryRunner.query(`ALTER TABLE "customers" ADD "country" character varying`);
30+
await queryRunner.query(`ALTER TABLE "customers" ADD "city" character varying`);
31+
await queryRunner.query(`ALTER TABLE "customers" ADD "postalCode" character varying`);
32+
await queryRunner.query(`ALTER TABLE "customers" ADD "subscriptionPlanId" uuid`);
33+
await queryRunner.query(`ALTER TABLE "customers" ADD "subscriptionStatusId" uuid`);
34+
await queryRunner.query(`ALTER TABLE "payment_methods" ADD "deletedDate" TIMESTAMP`);
35+
await queryRunner.query(`ALTER TABLE "payments" ADD "deletedDate" TIMESTAMP`);
36+
await queryRunner.query(`ALTER TABLE "subscriptions" ADD "deletedDate" TIMESTAMP`);
37+
await queryRunner.query(`ALTER TABLE "customers" ADD CONSTRAINT "FK_88dd6cde3b31a1088abb2e9ad44" FOREIGN KEY ("subscriptionPlanId") REFERENCES "subscription_plans"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
38+
await queryRunner.query(`ALTER TABLE "customers" ADD CONSTRAINT "FK_8ed83c12a858234d7cfe192f79a" FOREIGN KEY ("subscriptionStatusId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
39+
}
40+
41+
public async down(queryRunner: QueryRunner): Promise<void> {
42+
await queryRunner.query(`ALTER TABLE "customers" DROP CONSTRAINT "FK_8ed83c12a858234d7cfe192f79a"`);
43+
await queryRunner.query(`ALTER TABLE "customers" DROP CONSTRAINT "FK_88dd6cde3b31a1088abb2e9ad44"`);
44+
await queryRunner.query(`ALTER TABLE "subscriptions" DROP COLUMN "deletedDate"`);
45+
await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "deletedDate"`);
46+
await queryRunner.query(`ALTER TABLE "payment_methods" DROP COLUMN "deletedDate"`);
47+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "subscriptionStatusId"`);
48+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "subscriptionPlanId"`);
49+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "postalCode"`);
50+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "city"`);
51+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "country"`);
52+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "billingAddress"`);
53+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "phoneNumber"`);
54+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "name"`);
55+
await queryRunner.query(`ALTER TABLE "customers" DROP COLUMN "deletedDate"`);
56+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "prorate"`);
57+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "trialConversionPlanId"`);
58+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "downgradeToPlanId"`);
59+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "upgradeToPlanId"`);
60+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "gracePeriodDays"`);
61+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "cancellationPolicy"`);
62+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "discount"`);
63+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "currency"`);
64+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "setupFee"`);
65+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "autoRenewal"`);
66+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "overageCharge"`);
67+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "maxStorage"`);
68+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "maxUsers"`);
69+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "trialPeriodDays"`);
70+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "description"`);
71+
await queryRunner.query(`ALTER TABLE "subscription_plans" DROP COLUMN "deletedDate"`);
72+
await queryRunner.query(`ALTER TABLE "customers" ADD "lastName" character varying NOT NULL`);
73+
await queryRunner.query(`ALTER TABLE "customers" ADD "firstName" character varying NOT NULL`);
74+
}
75+
76+
}

‎app/db/migrations/1724317920258-user_account.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { MigrationInterface, QueryRunner } from "typeorm";
2+
3+
export class UserAccount1724317920258 implements MigrationInterface {
4+
name = 'UserAccount1724317920258'
5+
6+
public async up(queryRunner: QueryRunner): Promise<void> {
7+
await queryRunner.query(`CREATE TABLE "users" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdDate" TIMESTAMP NOT NULL DEFAULT now(), "updatedDate" TIMESTAMP NOT NULL DEFAULT now(), "deletedDate" TIMESTAMP, "name" character varying NOT NULL, "email" character varying NOT NULL, "password" character varying NOT NULL, "phoneNumber" character varying, "objectStateId" uuid, CONSTRAINT "UQ_97672ac88f789774dd47f7c8be3" UNIQUE ("email"), CONSTRAINT "PK_a3ffb1c0c8416b9fc6f907b7433" PRIMARY KEY ("id"))`);
8+
await queryRunner.query(`ALTER TABLE "users" ADD CONSTRAINT "FK_fb02bf159ff549154df233aa6e9" FOREIGN KEY ("objectStateId") REFERENCES "data_lookup"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
9+
}
10+
11+
public async down(queryRunner: QueryRunner): Promise<void> {
12+
await queryRunner.query(`ALTER TABLE "users" DROP CONSTRAINT "FK_fb02bf159ff549154df233aa6e9"`);
13+
await queryRunner.query(`DROP TABLE "users"`);
14+
}
15+
16+
}

0 commit comments

Comments
 (0)