Merge pull request #171 from samchon/features/local

Fix duplicated cancel histories archiving problem.
samchon · Nov 3, 2023 · 90a3980 · 90a3980
2 parents 563170e + cfa1389
commit 90a3980
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 164 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 bin/
 lib/
+migrations/
 node_modules/
 
 package-lock.json

diff --git a/packages/fake-iamport-server/package.json b/packages/fake-iamport-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fake-iamport-server",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Fake iamport server for testing",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/packages/fake-toss-payments-server/package.json b/packages/fake-toss-payments-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fake-toss-payments-server",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Fake toss-payments server for testing",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/packages/iamport-server-api/package.json b/packages/iamport-server-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iamport-server-api",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "API for Iamport Server",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/packages/iamport-server-api/swagger.json b/packages/iamport-server-api/swagger.json
@@ -13,7 +13,7 @@
   "info": {
     "title": "Iamport API",
     "description": "Built by [fake-iamport-server](https://github.com/samchon/payments/tree/master/packages/fake-iamport-server) with [nestia](https://github.com/samchon/nestia)",
-    "version": "5.0.1",
+    "version": "5.0.2",
     "license": {
       "name": "MIT"
     }

diff --git a/packages/payment-api/package.json b/packages/payment-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@samchon/payment-api",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "API for Payment Backend",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "@nestia/fetcher": "^2.3.4",
-    "iamport-server-api": "^5.0.1",
-    "toss-payments-server-api": "^5.0.1",
+    "iamport-server-api": "^5.0.2",
+    "toss-payments-server-api": "^5.0.2",
     "typia": "^5.2.4"
   }
 }
diff --git a/packages/payment-api/swagger.json b/packages/payment-api/swagger.json
@@ -7,7 +7,7 @@
     }
   ],
   "info": {
-    "version": "5.0.1",
+    "version": "5.0.2-dev.20231103",
     "title": "@samchon/payment-backend",
     "description": "Payment Backend Server",
     "license": {

diff --git a/packages/payment-backend/docs/ERD.md b/packages/payment-backend/docs/ERD.md
@@ -6,7 +6,7 @@
 ## Payments
 ```mermaid
 erDiagram
-payment_reservations {
+"payment_reservations" {
     String id PK
     String source_schema
     String source_table
@@ -19,7 +19,7 @@ payment_reservations {
     String password
     DateTime created_at
 }
-payment_histories {
+"payment_histories" {
     String id PK
     String source_schema
     String source_table
@@ -37,32 +37,32 @@ payment_histories {
     DateTime paid_at "nullable"
     DateTime cancelled_at "nullable"
 }
-payment_history_cancels {
+"payment_history_cancels" {
     String id PK
     String payment_history_id FK
     Float amount
     String reason
     String data
     DateTime created_at
 }
-payment_history_webhooks {
+"payment_history_webhooks" {
     String id PK
     String payment_history_id FK
     String previous
     String current
     String data
     DateTime created_at
 }
-payment_history_webhook_responses {
+"payment_history_webhook_responses" {
     String id PK
     String payment_history_webhook_id FK
     Int status "nullable"
     String body "nullable"
     DateTime created_at
 }
-payment_history_cancels }|--|| payment_histories : history
-payment_history_webhooks }|--|| payment_histories : history
-payment_history_webhook_responses }|--|| payment_history_webhooks : webhook
+"payment_history_cancels" }|--|| "payment_histories" : history
+"payment_history_webhooks" }|--|| "payment_histories" : history
+"payment_history_webhook_responses" }|--|| "payment_history_webhooks" : webhook
 ```
 
 ### `payment_reservations`

diff --git a/packages/payment-backend/package.json b/packages/payment-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@samchon/payment-backend",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Payment Backend Server",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -12,12 +12,10 @@
     "build:prisma": "prisma generate --schema=src/schema.prisma",
     "build:sdk": "rimraf src/api/functional && nestia sdk",
     "build:swagger": "nestia swagger",
-    "build:test": "rimraf bin && tsc -p test/tsconfig.json",
+    "build:test": "npm run build:prisma && rimraf bin && tsc -p test/tsconfig.json",
     "dev": "npm run build:test -- --watch",
     "eslint": "eslint src && eslint test",
     "eslint:fix": "eslint src --fix && eslint test --fix",
-    "package:api": "npm run build:api && cd packages/api && npm publish",
-    "package:models": "npm run build:models && cd packags/models && npm publish",
     "prepare": "ts-patch install && npm run build:prisma",
     "prettier": "prettier src --write && prettier test --write",
     "-----------------------------------------------": "",
@@ -67,14 +65,14 @@
     "@typescript-eslint/parser": "^5.26.0",
     "cli": "^1.0.1",
     "copyfiles": "^2.4.1",
-    "iamport-server-api": "^5.0.1",
+    "iamport-server-api": "^5.0.2",
     "nestia": "^5.0.1",
     "pm2": "^4.5.6",
     "prettier": "^2.6.2",
-    "prisma-markdown": "^1.0.0",
+    "prisma-markdown": "^1.0.5",
     "rimraf": "^3.0.2",
     "sloc": "^0.2.1",
-    "toss-payments-server-api": "^5.0.1",
+    "toss-payments-server-api": "^5.0.2",
     "ts-node": "^10.9.1",
     "ts-patch": "^3.0.2",
     "typescript": "^5.2.2",
@@ -86,8 +84,8 @@
     "bcryptjs": "^2.4.3",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",
-    "fake-iamport-server": "^5.0.1",
-    "fake-toss-payments-server": "^5.0.1",
+    "fake-iamport-server": "^5.0.2",
+    "fake-toss-payments-server": "^5.0.2",
     "git-last-commit": "^1.0.0",
     "inquirer": "^8.2.5",
     "mutex-server": "^0.3.1",

diff --git a/packages/payment-backend/src/executable/server.ts b/packages/payment-backend/src/executable/server.ts
@@ -4,6 +4,7 @@ import { Singleton } from "tstl/thread/Singleton";
 
 import { PaymentBackend } from "../PaymentBackend";
 import { PaymentGlobal } from "../PaymentGlobal";
+import { PaymentUpdator } from "../PaymentUpdator";
 import { Scheduler } from "../schedulers/Scheduler";
 import { ErrorUtil } from "../utils/ErrorUtil";
 
@@ -59,8 +60,13 @@ async function main(): Promise<void> {
     global.process.on("unhandledRejection", handle_error);
 
     // SCHEDULER ONLY WHEN MASTER
-    if (PaymentGlobal.mode !== "real" || process.argv[3] === "master")
+    if (PaymentGlobal.mode !== "real" || process.argv[3] === "master") {
+        if (PaymentGlobal.mode === "local")
+            try {
+                await PaymentUpdator.master();
+            } catch {}
         await Scheduler.repeat();
+    }
 }
 main().catch((exp) => {
     console.log(exp);

diff --git a/packages/payment-backend/src/migrations/20230919094622_init/migration.sql b/packages/payment-backend/src/migrations/20230919094622_init/migration.sql
diff --git a/packages/payment-backend/src/providers/payments/PaymentCancelHistoryProvider.ts b/packages/payment-backend/src/providers/payments/PaymentCancelHistoryProvider.ts
@@ -6,7 +6,6 @@ import { IPaymentCancelHistory } from "@samchon/payment-api/lib/structures/payme
 import { IPaymentHistory } from "@samchon/payment-api/lib/structures/payments/IPaymentHistory";
 import { IIamportPayment } from "iamport-server-api/lib/structures/IIamportPayment";
 import { ITossPayment } from "toss-payments-server-api/lib/structures/ITossPayment";
-import { sleep_for } from "tstl";
 import { v4 } from "uuid";
 
 import { PaymentGlobal } from "../../PaymentGlobal";
@@ -42,7 +41,6 @@ export namespace PaymentCancelHistoryProvider {
             source_id: input.source.id,
         })(input.password);
         const props: IPaymentHistory.IProps = await request(history)(input);
-        await sleep_for(50);
         return PaymentHistoryProvider.update(history)(props);
     };
 

diff --git a/packages/payment-backend/src/providers/payments/PaymentHistoryProvider.ts b/packages/payment-backend/src/providers/payments/PaymentHistoryProvider.ts
@@ -148,17 +148,15 @@ export namespace PaymentHistoryProvider {
         (history: IEntity) =>
         async (input: IPaymentHistory.IProps): Promise<IPaymentHistory> => {
             // RE-CONSTRUCT CANCEL HISTORIES
-            await PaymentGlobal.prisma.payment_history_cancels.deleteMany({
-                where: { payment_history_id: history.id },
-            });
             await PaymentGlobal.prisma.payment_history_cancels.createMany({
                 data: input.cancels.map(
                     PaymentCancelHistoryProvider.collect(history),
                 ),
+                skipDuplicates: true,
             });
 
             // UPDATE HISTORY
-            const record = await PaymentGlobal.prisma.payment_histories.update({
+            await PaymentGlobal.prisma.payment_histories.update({
                 where: { id: history.id },
                 data: {
                     currency: input.currency,
@@ -170,6 +168,11 @@ export namespace PaymentHistoryProvider {
                 },
                 ...json.select(),
             });
+            const record =
+                await PaymentGlobal.prisma.payment_histories.findFirstOrThrow({
+                    where: { id: history.id },
+                    ...json.select(),
+                });
             return json.transform(record);
         };
 

diff --git a/packages/payment-backend/src/schema.prisma b/packages/payment-backend/src/schema.prisma
@@ -226,7 +226,7 @@ model payment_history_cancels {
     /// 귀속 결제 이력.
     history payment_histories @relation(fields: [payment_history_id], references: [id], onDelete: Cascade)
 
-    @@index([payment_history_id])
+    @@unique([payment_history_id, amount, reason, created_at])
 }
 
 /// 웹훅 이벤트 레코드.