From 2b64ea68d6341583623705d9998c4b8e4945b6b9 Mon Sep 17 00:00:00 2001 From: Jeongho Nam Date: Thu, 28 Mar 2024 06:04:05 +0900 Subject: [PATCH] Upgrade `tstl@3.0.0` --- package.json | 2 +- packages/fake-iamport-server/package.json | 12 +- .../src/FakeIamportConfiguration.ts | 4 +- .../src/api/IamportConnector.ts | 4 +- .../api/functional/certifications/index.ts | 4 +- .../functional/certifications/otp/index.ts | 4 +- .../src/api/functional/internal/index.ts | 4 +- .../src/api/functional/payments/index.ts | 4 +- .../src/api/functional/receipts/index.ts | 6 +- .../functional/subscribe/customers/index.ts | 6 +- .../functional/subscribe/payments/index.ts | 4 +- .../src/api/functional/users/index.ts | 2 +- .../src/api/functional/vbanks/index.ts | 4 +- .../FakeIamportVbanksController.ts | 2 +- .../src/executable/server.ts | 3 +- .../providers/FakeIamportPaymentProvider.ts | 2 +- .../src/utils/AdvancedRandomGenerator.ts | 2 +- .../fake-iamport-server/src/utils/Terminal.ts | 2 +- .../src/utils/VolatileMap.ts | 6 +- .../fake-toss-payments-server/package.json | 12 +- .../src/FakeTossConfiguration.ts | 4 +- .../src/api/functional/internal/index.ts | 4 +- .../v1/billing/authorizations/card/index.ts | 2 +- .../v1/billing/authorizations/index.ts | 2 +- .../src/api/functional/v1/billing/index.ts | 2 +- .../api/functional/v1/cash_receipts/index.ts | 4 +- .../src/api/functional/v1/payments/index.ts | 8 +- .../functional/v1/virtual_accounts/index.ts | 2 +- .../src/executable/server.ts | 3 +- .../src/utils/ErrorUtil.ts | 3 +- .../src/utils/Terminal.ts | 2 +- .../src/utils/VolatileMap.ts | 5 +- .../features/test_fake_storage_capacity.ts | 3 +- .../test_fake_storage_expiration_time.ts | 4 +- .../test/internal/AdvancedRandomGenerator.ts | 2 +- packages/iamport-server-api/package.json | 6 +- packages/iamport-server-api/swagger.json | 60 ++++----- packages/payment-api/README.md | 2 +- packages/payment-api/package.json | 10 +- packages/payment-api/swagger.json | 116 +++++++++--------- packages/payment-backend/README.md | 6 +- packages/payment-backend/docs/ERD.md | 88 ++++++------- packages/payment-backend/package.json | 20 +-- .../payment-backend/src/executable/server.ts | 3 +- .../src/providers/monitors/SystemProvider.ts | 2 +- .../providers/payments/FakePaymentStorage.ts | 2 +- .../payments/PaymentWebhookProvider.ts | 2 +- .../src/services/iamport/IamportAsset.ts | 2 +- .../services/iamport/IamportPaymentService.ts | 2 +- .../payment-backend/src/utils/ErrorUtil.ts | 3 +- .../payment-backend/src/utils/Terminal.ts | 2 +- .../payment-backend/src/utils/TokenManager.ts | 3 +- .../iamport/test_api_iamport_vbank_payment.ts | 2 +- .../toss/test_api_toss_vbank_payment.ts | 2 +- packages/payment-backend/test/index.ts | 2 +- packages/payment-backend/test/webpack.ts | 2 +- .../toss-payments-server-api/package.json | 6 +- .../toss-payments-server-api/swagger.json | 98 +++++++-------- 58 files changed, 278 insertions(+), 302 deletions(-) diff --git a/package.json b/package.json index cbf1d4a..a66fbd5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@samchon/payments", - "version": "6.0.6", + "version": "7.0.0", "description": "Collection of Payment system of Samchon", "scripts": { "package:latest": "node deploy latest", diff --git a/packages/fake-iamport-server/package.json b/packages/fake-iamport-server/package.json index 1e80129..3aad077 100644 --- a/packages/fake-iamport-server/package.json +++ b/packages/fake-iamport-server/package.json @@ -1,6 +1,6 @@ { "name": "fake-iamport-server", - "version": "6.0.6", + "version": "7.0.0", "description": "Fake iamport server for testing", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/samchon/fake-iamport-server", "devDependencies": { - "@nestia/sdk": "^2.5.8", + "@nestia/sdk": "^2.6.2", "@types/atob": "^2.1.2", "@types/btoa": "^1.2.3", "@types/cli": "^0.11.19", @@ -57,9 +57,9 @@ "typescript": "^5.3.2" }, "dependencies": { - "@nestia/core": "^2.5.8", + "@nestia/core": "^2.6.2", "@nestia/e2e": "^0.4.1", - "@nestia/fetcher": "^2.5.8", + "@nestia/fetcher": "^2.6.2", "@nestjs/common": "^10.2.8", "@nestjs/core": "^10.2.8", "@nestjs/platform-fastify": "^10.2.8", @@ -68,9 +68,9 @@ "fastify": "^4.24.3", "serialize-error": "^4.1.0", "source-map-support": "^0.5.19", - "tstl": "^2.5.13", + "tstl": "^3.0.0", "typescript-transform-paths": "^3.4.6", - "typia": "^5.4.9", + "typia": "^5.5.7", "uuid": "^9.0.0" }, "keywords": [ diff --git a/packages/fake-iamport-server/src/FakeIamportConfiguration.ts b/packages/fake-iamport-server/src/FakeIamportConfiguration.ts index c9fdbca..d9ec692 100644 --- a/packages/fake-iamport-server/src/FakeIamportConfiguration.ts +++ b/packages/fake-iamport-server/src/FakeIamportConfiguration.ts @@ -5,9 +5,7 @@ import { NotFoundException, UnprocessableEntityException, } from "@nestjs/common"; -import { DomainError } from "tstl/exception/DomainError"; -import { InvalidArgument } from "tstl/exception/InvalidArgument"; -import { OutOfRange } from "tstl/exception/OutOfRange"; +import { DomainError, InvalidArgument, OutOfRange } from "tstl"; /* eslint-disable */ const EXTENSION = __filename.substring(__filename.length - 2); diff --git a/packages/fake-iamport-server/src/api/IamportConnector.ts b/packages/fake-iamport-server/src/api/IamportConnector.ts index 3899592..d713ae0 100644 --- a/packages/fake-iamport-server/src/api/IamportConnector.ts +++ b/packages/fake-iamport-server/src/api/IamportConnector.ts @@ -1,6 +1,4 @@ -import { SharedLock } from "tstl/thread/SharedLock"; -import { SharedMutex } from "tstl/thread/SharedMutex"; -import { UniqueLock } from "tstl/thread/UniqueLock"; +import { SharedLock, SharedMutex, UniqueLock } from "tstl"; import { IConnection } from "./IConnection"; import { users } from "./functional"; diff --git a/packages/fake-iamport-server/src/api/functional/certifications/index.ts b/packages/fake-iamport-server/src/api/functional/certifications/index.ts index e270793..d71a195 100644 --- a/packages/fake-iamport-server/src/api/functional/certifications/index.ts +++ b/packages/fake-iamport-server/src/api/functional/certifications/index.ts @@ -27,7 +27,7 @@ export * as otp from "./otp"; * @security bearer * @author Samchon * - * @controller FakeIamportCertificationsController.at + * @controller FakeIamportCertificationsController. * @path GET /certifications/:imp_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -66,7 +66,7 @@ export namespace at { * @security bearer * @author Samchon * - * @controller FakeIamportCertificationsController.erase + * @controller FakeIamportCertificationsController. * @path DELETE /certifications/:imp_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-iamport-server/src/api/functional/certifications/otp/index.ts b/packages/fake-iamport-server/src/api/functional/certifications/otp/index.ts index 37e6dab..78577a4 100644 --- a/packages/fake-iamport-server/src/api/functional/certifications/otp/index.ts +++ b/packages/fake-iamport-server/src/api/functional/certifications/otp/index.ts @@ -28,7 +28,7 @@ import type { IIamportResponse } from "../../../structures/IIamportResponse"; * @security bearer * @author Samchon * - * @controller FakeIamportCertificationsController.request + * @controller FakeIamportCertificationsController. * @path POST /certifications/otp/request * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -90,7 +90,7 @@ export namespace request { * @security bearer * @author Samchon * - * @controller FakeIamportCertificationsController.confirm + * @controller FakeIamportCertificationsController. * @path POST /certifications/otp/confirm/:imp_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-iamport-server/src/api/functional/internal/index.ts b/packages/fake-iamport-server/src/api/functional/internal/index.ts index 54f9070..7682c79 100644 --- a/packages/fake-iamport-server/src/api/functional/internal/index.ts +++ b/packages/fake-iamport-server/src/api/functional/internal/index.ts @@ -24,7 +24,7 @@ import type { IIamportPayment } from "../../structures/IIamportPayment"; * @param input 웹훅 이벤트 정보 * @author Samchon * - * @controller FakeIamportInternalController.webhook + * @controller FakeIamportInternalController. * @path POST /internal/webhook * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -82,7 +82,7 @@ export namespace webhook { * @security bearer * @author Samchon * - * @controller FakeIamportInternalController.deposit + * @controller FakeIamportInternalController. * @path PUT /internal/deposit/:imp_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-iamport-server/src/api/functional/payments/index.ts b/packages/fake-iamport-server/src/api/functional/payments/index.ts index a4a8c98..baf2277 100644 --- a/packages/fake-iamport-server/src/api/functional/payments/index.ts +++ b/packages/fake-iamport-server/src/api/functional/payments/index.ts @@ -22,7 +22,7 @@ import type { IIamportResponse } from "../../structures/IIamportResponse"; * @security bearer * @author Samchon * - * @controller FakeIamportPaymentsController.at + * @controller FakeIamportPaymentsController. * @path GET /payments/:imp_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -75,7 +75,7 @@ export namespace at { * @security bearer * @author Samchon * - * @controller FakeIamportPaymentsController.cancel + * @controller FakeIamportPaymentsController. * @path POST /payments/cancel * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-iamport-server/src/api/functional/receipts/index.ts b/packages/fake-iamport-server/src/api/functional/receipts/index.ts index 3a6e083..52a1205 100644 --- a/packages/fake-iamport-server/src/api/functional/receipts/index.ts +++ b/packages/fake-iamport-server/src/api/functional/receipts/index.ts @@ -18,7 +18,7 @@ import type { IIamportResponse } from "../../structures/IIamportResponse"; * @security bearer * @author Samchon * - * @controller FakeIamportReceiptsController.at + * @controller FakeIamportReceiptsController. * @path GET /receipts/:imp_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -58,7 +58,7 @@ export namespace at { * @security bearer * @author Samchon * - * @controller FakeIamportReceiptsController.create + * @controller FakeIamportReceiptsController. * @path POST /receipts/:imp_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -112,7 +112,7 @@ export namespace create { * @security bearer * @author Samchon * - * @controller FakeIamportReceiptsController.erase + * @controller FakeIamportReceiptsController. * @path DELETE /receipts/:imp_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-iamport-server/src/api/functional/subscribe/customers/index.ts b/packages/fake-iamport-server/src/api/functional/subscribe/customers/index.ts index bc644f3..bfc78d9 100644 --- a/packages/fake-iamport-server/src/api/functional/subscribe/customers/index.ts +++ b/packages/fake-iamport-server/src/api/functional/subscribe/customers/index.ts @@ -22,7 +22,7 @@ import type { IIamportSubscription } from "../../../structures/IIamportSubscript * @security bearer * @author Samchon * - * @controller FakeIamportSubscribeCustomersController.at + * @controller FakeIamportSubscribeCustomersController. * @path GET /subscribe/customers/:customer_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -71,7 +71,7 @@ export namespace at { * @security bearer * @author Samchon * - * @controller FakeIamportSubscribeCustomersController.create + * @controller FakeIamportSubscribeCustomersController. * @path POST /subscribe/customers/:customer_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -127,7 +127,7 @@ export namespace create { * @security bearer * @author Samchon * - * @controller FakeIamportSubscribeCustomersController.erase + * @controller FakeIamportSubscribeCustomersController. * @path DELETE /subscribe/customers/:customer_uid * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-iamport-server/src/api/functional/subscribe/payments/index.ts b/packages/fake-iamport-server/src/api/functional/subscribe/payments/index.ts index 54e257f..2c9da89 100644 --- a/packages/fake-iamport-server/src/api/functional/subscribe/payments/index.ts +++ b/packages/fake-iamport-server/src/api/functional/subscribe/payments/index.ts @@ -35,7 +35,7 @@ import type { IIamportSubscription } from "../../../structures/IIamportSubscript * @security bearer * @author Samchon * - * @controller FakeIampotSubscribePaymentsController.onetime + * @controller FakeIampotSubscribePaymentsController. * @path POST /subscribe/payments/onetime * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -97,7 +97,7 @@ export namespace onetime { * @security bearer * @author Samchon * - * @controller FakeIampotSubscribePaymentsController.again + * @controller FakeIampotSubscribePaymentsController. * @path POST /subscribe/payments/again * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-iamport-server/src/api/functional/users/index.ts b/packages/fake-iamport-server/src/api/functional/users/index.ts index 09afa39..3eeca84 100644 --- a/packages/fake-iamport-server/src/api/functional/users/index.ts +++ b/packages/fake-iamport-server/src/api/functional/users/index.ts @@ -24,7 +24,7 @@ import type { IIamportUser } from "../../structures/IIamportUser"; * @returns 유저 인증 토큰 정보 * @author Samchon * - * @controller FakeIamportUsersController.getToken + * @controller FakeIamportUsersController. * @path POST /users/getToken * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-iamport-server/src/api/functional/vbanks/index.ts b/packages/fake-iamport-server/src/api/functional/vbanks/index.ts index cb6b8ba..1049780 100644 --- a/packages/fake-iamport-server/src/api/functional/vbanks/index.ts +++ b/packages/fake-iamport-server/src/api/functional/vbanks/index.ts @@ -18,7 +18,7 @@ import type { IIamportVBankPayment } from "../../structures/IIamportVBankPayment * @security bearer * @author Samchon * - * @controller FakeIamportVbanksController.create + * @controller FakeIamportVbanksController. * @path POST /vbanks * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -70,7 +70,7 @@ export namespace create { * @security bearer * @author Samchon * - * @controller FakeIamportVbanksController.update + * @controller FakeIamportVbanksController. * @path PUT /vbanks * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-iamport-server/src/controllers/FakeIamportVbanksController.ts b/packages/fake-iamport-server/src/controllers/FakeIamportVbanksController.ts index b2d603e..365c0e3 100644 --- a/packages/fake-iamport-server/src/controllers/FakeIamportVbanksController.ts +++ b/packages/fake-iamport-server/src/controllers/FakeIamportVbanksController.ts @@ -4,7 +4,7 @@ import { IIamportPayment } from "iamport-server-api/lib/structures/IIamportPayme import { IIamportResponse } from "iamport-server-api/lib/structures/IIamportResponse"; import { IIamportUser } from "iamport-server-api/lib/structures/IIamportUser"; import { IIamportVBankPayment } from "iamport-server-api/lib/structures/IIamportVBankPayment"; -import { randint } from "tstl/algorithm/random"; +import { randint } from "tstl"; import { v4 } from "uuid"; import { FakeIamportUserAuth } from "../decorators/FakeIamportUserAuth"; diff --git a/packages/fake-iamport-server/src/executable/server.ts b/packages/fake-iamport-server/src/executable/server.ts index 16b2e96..f981f53 100644 --- a/packages/fake-iamport-server/src/executable/server.ts +++ b/packages/fake-iamport-server/src/executable/server.ts @@ -1,6 +1,5 @@ import fs from "fs"; -import { randint } from "tstl/algorithm/random"; -import { Singleton } from "tstl/thread/Singleton"; +import { Singleton, randint } from "tstl"; import { FakeIamportBackend } from "../FakeIamportBackend"; import { ErrorUtil } from "../utils/ErrorUtil"; diff --git a/packages/fake-iamport-server/src/providers/FakeIamportPaymentProvider.ts b/packages/fake-iamport-server/src/providers/FakeIamportPaymentProvider.ts index a3bfcc3..bdeeae6 100644 --- a/packages/fake-iamport-server/src/providers/FakeIamportPaymentProvider.ts +++ b/packages/fake-iamport-server/src/providers/FakeIamportPaymentProvider.ts @@ -1,7 +1,7 @@ import { IIamportPayment } from "iamport-server-api/lib/structures/IIamportPayment"; import { IIamportPaymentCancel } from "iamport-server-api/lib/structures/IIamportPaymentCancel"; import { IIamportVBankPayment } from "iamport-server-api/lib/structures/IIamportVBankPayment"; -import { DomainError } from "tstl/exception/DomainError"; +import { DomainError } from "tstl"; import { FakeIamportConfiguration } from "../FakeIamportConfiguration"; import { FakeIamportStorage } from "./FakeIamportStorage"; diff --git a/packages/fake-iamport-server/src/utils/AdvancedRandomGenerator.ts b/packages/fake-iamport-server/src/utils/AdvancedRandomGenerator.ts index b289e9b..f5e0f13 100644 --- a/packages/fake-iamport-server/src/utils/AdvancedRandomGenerator.ts +++ b/packages/fake-iamport-server/src/utils/AdvancedRandomGenerator.ts @@ -1,5 +1,5 @@ import { RandomGenerator } from "@nestia/e2e"; -import { randint } from "tstl/algorithm/random"; +import { randint } from "tstl"; export const AdvancedRandomGenerator = { ...RandomGenerator, diff --git a/packages/fake-iamport-server/src/utils/Terminal.ts b/packages/fake-iamport-server/src/utils/Terminal.ts index c7fe808..d90de1f 100644 --- a/packages/fake-iamport-server/src/utils/Terminal.ts +++ b/packages/fake-iamport-server/src/utils/Terminal.ts @@ -1,5 +1,5 @@ import cp from "child_process"; -import { Pair } from "tstl/utility/Pair"; +import { Pair } from "tstl"; export namespace Terminal { export function execute( diff --git a/packages/fake-iamport-server/src/utils/VolatileMap.ts b/packages/fake-iamport-server/src/utils/VolatileMap.ts index cea87d0..42c121b 100644 --- a/packages/fake-iamport-server/src/utils/VolatileMap.ts +++ b/packages/fake-iamport-server/src/utils/VolatileMap.ts @@ -1,8 +1,4 @@ -import { HashMap } from "tstl/container/HashMap"; -import { TreeMap } from "tstl/container/TreeMap"; -import { OutOfRange } from "tstl/exception/OutOfRange"; -import { equal_to } from "tstl/functional/comparators"; -import { hash } from "tstl/functional/hash"; +import { HashMap, OutOfRange, TreeMap, equal_to, hash } from "tstl"; export class VolatileMap { private readonly dict_: HashMap; diff --git a/packages/fake-toss-payments-server/package.json b/packages/fake-toss-payments-server/package.json index 735ebf5..2b6f7a3 100644 --- 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": "6.0.6", + "version": "7.0.0", "description": "Fake toss-payments server for testing", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -39,7 +39,7 @@ "homepage": "https://github.com/samchon/fake-toss-payments-server", "devDependencies": { "@nestia/e2e": "^0.4.1", - "@nestia/sdk": "^2.5.8", + "@nestia/sdk": "^2.6.2", "@types/atob": "^2.1.2", "@types/btoa": "^1.2.3", "@types/cli": "^0.11.19", @@ -59,8 +59,8 @@ "typescript-transform-paths": "^3.4.6" }, "dependencies": { - "@nestia/core": "^2.5.8", - "@nestia/fetcher": "^2.5.8", + "@nestia/core": "^2.6.2", + "@nestia/fetcher": "^2.6.2", "@nestjs/common": "^10.2.8", "@nestjs/core": "^10.2.8", "@nestjs/platform-fastify": "^10.2.8", @@ -69,8 +69,8 @@ "fastify": "^4.24.3", "serialize-error": "^4.1.0", "source-map-support": "^0.5.19", - "tstl": "^2.5.13", - "typia": "^5.4.9", + "tstl": "^3.0.0", + "typia": "^5.5.7", "uuid": "^9.0.0" }, "keywords": [ diff --git a/packages/fake-toss-payments-server/src/FakeTossConfiguration.ts b/packages/fake-toss-payments-server/src/FakeTossConfiguration.ts index 0b54c8e..c68a6cf 100644 --- a/packages/fake-toss-payments-server/src/FakeTossConfiguration.ts +++ b/packages/fake-toss-payments-server/src/FakeTossConfiguration.ts @@ -5,9 +5,7 @@ import { NotFoundException, UnprocessableEntityException, } from "@nestjs/common"; -import { DomainError } from "tstl/exception/DomainError"; -import { InvalidArgument } from "tstl/exception/InvalidArgument"; -import { OutOfRange } from "tstl/exception/OutOfRange"; +import { DomainError, InvalidArgument, OutOfRange } from "tstl"; /* eslint-disable */ diff --git a/packages/fake-toss-payments-server/src/api/functional/internal/index.ts b/packages/fake-toss-payments-server/src/api/functional/internal/index.ts index 45130e0..b329fe6 100644 --- a/packages/fake-toss-payments-server/src/api/functional/internal/index.ts +++ b/packages/fake-toss-payments-server/src/api/functional/internal/index.ts @@ -25,7 +25,7 @@ import type { ITossPaymentWebhook } from "../../structures/ITossPaymentWebhook"; * @param input 웹훅 이벤트 정보 * @author Samchon * - * @controller FakeTossInternalController.webhook + * @controller FakeTossInternalController. * @path POST /internal/webhook * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -84,7 +84,7 @@ export namespace webhook { * @security basic * @author Samchon * - * @controller FakeTossInternalController.deposit + * @controller FakeTossInternalController. * @path PUT /internal/:paymentKey/deposit * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-toss-payments-server/src/api/functional/v1/billing/authorizations/card/index.ts b/packages/fake-toss-payments-server/src/api/functional/v1/billing/authorizations/card/index.ts index 8b978ad..69a7272 100644 --- a/packages/fake-toss-payments-server/src/api/functional/v1/billing/authorizations/card/index.ts +++ b/packages/fake-toss-payments-server/src/api/functional/v1/billing/authorizations/card/index.ts @@ -26,7 +26,7 @@ import type { ITossBilling } from "../../../../../structures/ITossBilling"; * @security basic * @author Samchon * - * @controller FakeTossBillingController.create + * @controller FakeTossBillingController. * @path POST /v1/billing/authorizations/card * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-toss-payments-server/src/api/functional/v1/billing/authorizations/index.ts b/packages/fake-toss-payments-server/src/api/functional/v1/billing/authorizations/index.ts index d2742aa..7cffb75 100644 --- a/packages/fake-toss-payments-server/src/api/functional/v1/billing/authorizations/index.ts +++ b/packages/fake-toss-payments-server/src/api/functional/v1/billing/authorizations/index.ts @@ -27,7 +27,7 @@ export * as card from "./card"; * @security basic * @author Samchon * - * @controller FakeTossBillingController.at + * @controller FakeTossBillingController. * @path POST /v1/billing/authorizations/:billingKey * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-toss-payments-server/src/api/functional/v1/billing/index.ts b/packages/fake-toss-payments-server/src/api/functional/v1/billing/index.ts index 0359a61..cf516fc 100644 --- a/packages/fake-toss-payments-server/src/api/functional/v1/billing/index.ts +++ b/packages/fake-toss-payments-server/src/api/functional/v1/billing/index.ts @@ -35,7 +35,7 @@ export * as authorizations from "./authorizations"; * @security basic * @author Samchon * - * @controller FakeTossBillingController.pay + * @controller FakeTossBillingController. * @path POST /v1/billing/:billingKey * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-toss-payments-server/src/api/functional/v1/cash_receipts/index.ts b/packages/fake-toss-payments-server/src/api/functional/v1/cash_receipts/index.ts index de68704..02a40eb 100644 --- a/packages/fake-toss-payments-server/src/api/functional/v1/cash_receipts/index.ts +++ b/packages/fake-toss-payments-server/src/api/functional/v1/cash_receipts/index.ts @@ -17,7 +17,7 @@ import type { ITossCashReceipt } from "../../../structures/ITossCashReceipt"; * @security basic * @author Samchon * - * @controller FakeTossCashReceiptsController.create + * @controller FakeTossCashReceiptsController. * @path POST /v1/cash-receipts * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -70,7 +70,7 @@ export namespace create { * @security basic * @author Samchon * - * @controller FakeTossCashReceiptsController.cancel + * @controller FakeTossCashReceiptsController. * @path POST /v1/cash-receipts/:receiptKey/cancel * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-toss-payments-server/src/api/functional/v1/payments/index.ts b/packages/fake-toss-payments-server/src/api/functional/v1/payments/index.ts index 08c4e87..910d65a 100644 --- a/packages/fake-toss-payments-server/src/api/functional/v1/payments/index.ts +++ b/packages/fake-toss-payments-server/src/api/functional/v1/payments/index.ts @@ -29,7 +29,7 @@ import type { ITossPaymentCancel } from "../../../structures/ITossPaymentCancel" * @returns 결제 정보 * @author Samchon * - * @controller FakeTossPaymentsController.at + * @controller FakeTossPaymentsController. * @path GET /v1/payments/:paymentKey * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -86,7 +86,7 @@ export namespace at { * @security basic * @author Samchon * - * @controller FakeTossPaymentsController.key_in + * @controller FakeTossPaymentsController. * @path POST /v1/payments/key-in * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -149,7 +149,7 @@ export namespace key_in { * @security basic * @author Samchon * - * @controller FakeTossPaymentsController.approve + * @controller FakeTossPaymentsController. * @path POST /v1/payments/:paymentKey * @nestia Generated by Nestia - https://github.com/samchon/nestia */ @@ -209,7 +209,7 @@ export namespace approve { * @security basic * @author Samchon * - * @controller FakeTossPaymentsController.cancel + * @controller FakeTossPaymentsController. * @path POST /v1/payments/:paymentKey/cancel * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-toss-payments-server/src/api/functional/v1/virtual_accounts/index.ts b/packages/fake-toss-payments-server/src/api/functional/v1/virtual_accounts/index.ts index 7ad39bf..51e0e98 100644 --- a/packages/fake-toss-payments-server/src/api/functional/v1/virtual_accounts/index.ts +++ b/packages/fake-toss-payments-server/src/api/functional/v1/virtual_accounts/index.ts @@ -33,7 +33,7 @@ import type { ITossVirtualAccountPayment } from "../../../structures/ITossVirtua * @security basic * @author Samchon * - * @controller FakeTossVirtualAccountsController.create + * @controller FakeTossVirtualAccountsController. * @path POST /v1/virtual-accounts * @nestia Generated by Nestia - https://github.com/samchon/nestia */ diff --git a/packages/fake-toss-payments-server/src/executable/server.ts b/packages/fake-toss-payments-server/src/executable/server.ts index 65022f7..c77c87d 100644 --- a/packages/fake-toss-payments-server/src/executable/server.ts +++ b/packages/fake-toss-payments-server/src/executable/server.ts @@ -1,6 +1,5 @@ import fs from "fs"; -import { randint } from "tstl/algorithm/random"; -import { Singleton } from "tstl/thread/Singleton"; +import { Singleton, randint } from "tstl"; import { FakeTossBackend } from "../FakeTossBackend"; import { ErrorUtil } from "../utils/ErrorUtil"; diff --git a/packages/fake-toss-payments-server/src/utils/ErrorUtil.ts b/packages/fake-toss-payments-server/src/utils/ErrorUtil.ts index 12bd0df..8f6682f 100644 --- a/packages/fake-toss-payments-server/src/utils/ErrorUtil.ts +++ b/packages/fake-toss-payments-server/src/utils/ErrorUtil.ts @@ -1,7 +1,6 @@ import fs from "fs"; import serializeError from "serialize-error"; -import { randint } from "tstl/algorithm/random"; -import { Singleton } from "tstl/thread/Singleton"; +import { Singleton, randint } from "tstl"; import { FakeTossConfiguration } from "../FakeTossConfiguration"; diff --git a/packages/fake-toss-payments-server/src/utils/Terminal.ts b/packages/fake-toss-payments-server/src/utils/Terminal.ts index c7fe808..d90de1f 100644 --- a/packages/fake-toss-payments-server/src/utils/Terminal.ts +++ b/packages/fake-toss-payments-server/src/utils/Terminal.ts @@ -1,5 +1,5 @@ import cp from "child_process"; -import { Pair } from "tstl/utility/Pair"; +import { Pair } from "tstl"; export namespace Terminal { export function execute( diff --git a/packages/fake-toss-payments-server/src/utils/VolatileMap.ts b/packages/fake-toss-payments-server/src/utils/VolatileMap.ts index 022c979..1842c1b 100644 --- a/packages/fake-toss-payments-server/src/utils/VolatileMap.ts +++ b/packages/fake-toss-payments-server/src/utils/VolatileMap.ts @@ -1,7 +1,4 @@ -import { HashMap } from "tstl/container/HashMap"; -import { TreeMap } from "tstl/container/TreeMap"; -import { equal_to } from "tstl/functional/comparators"; -import { hash } from "tstl/functional/hash"; +import { HashMap, TreeMap, equal_to, hash } from "tstl"; export class VolatileMap { private readonly dict_: HashMap; diff --git a/packages/fake-toss-payments-server/test/features/test_fake_storage_capacity.ts b/packages/fake-toss-payments-server/test/features/test_fake_storage_capacity.ts index a1796ae..ac1520d 100644 --- a/packages/fake-toss-payments-server/test/features/test_fake_storage_capacity.ts +++ b/packages/fake-toss-payments-server/test/features/test_fake_storage_capacity.ts @@ -2,8 +2,7 @@ import { TestValidator } from "@nestia/e2e"; import toss from "toss-payments-server-api"; import { ITossBilling } from "toss-payments-server-api/lib/structures/ITossBilling"; import { ITossPayment } from "toss-payments-server-api/lib/structures/ITossPayment"; -import { randint } from "tstl/algorithm/random"; -import { IPointer } from "tstl/functional/IPointer"; +import { IPointer, randint } from "tstl"; import { assert } from "typia"; import { v4 } from "uuid"; diff --git a/packages/fake-toss-payments-server/test/features/test_fake_storage_expiration_time.ts b/packages/fake-toss-payments-server/test/features/test_fake_storage_expiration_time.ts index addb746..8a23171 100644 --- a/packages/fake-toss-payments-server/test/features/test_fake_storage_expiration_time.ts +++ b/packages/fake-toss-payments-server/test/features/test_fake_storage_expiration_time.ts @@ -2,9 +2,7 @@ import { ArrayUtil, TestValidator } from "@nestia/e2e"; import toss from "toss-payments-server-api"; import { ITossCardPayment } from "toss-payments-server-api/lib/structures/ITossCardPayment"; import { ITossPayment } from "toss-payments-server-api/lib/structures/ITossPayment"; -import { randint } from "tstl/algorithm/random"; -import { IPointer } from "tstl/functional/IPointer"; -import { sleep_for } from "tstl/thread/global"; +import { IPointer, randint, sleep_for } from "tstl"; import { assert } from "typia"; import { v4 } from "uuid"; diff --git a/packages/fake-toss-payments-server/test/internal/AdvancedRandomGenerator.ts b/packages/fake-toss-payments-server/test/internal/AdvancedRandomGenerator.ts index 57f9590..e36b655 100644 --- a/packages/fake-toss-payments-server/test/internal/AdvancedRandomGenerator.ts +++ b/packages/fake-toss-payments-server/test/internal/AdvancedRandomGenerator.ts @@ -1,5 +1,5 @@ import { RandomGenerator } from "@nestia/e2e"; -import { randint } from "tstl/algorithm/random"; +import { randint } from "tstl"; export const AdvancedRandomGenerator = { ...RandomGenerator, diff --git a/packages/iamport-server-api/package.json b/packages/iamport-server-api/package.json index d0de96f..930d7ce 100644 --- a/packages/iamport-server-api/package.json +++ b/packages/iamport-server-api/package.json @@ -1,6 +1,6 @@ { "name": "iamport-server-api", - "version": "6.0.6", + "version": "7.0.0", "description": "API for Iamport Server", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -34,7 +34,7 @@ "typescript": "^5.3.2" }, "dependencies": { - "@nestia/fetcher": "^2.5.8", - "typia": "^5.4.9" + "@nestia/fetcher": "^2.6.2", + "typia": "^5.5.7" } } \ No newline at end of file diff --git a/packages/iamport-server-api/swagger.json b/packages/iamport-server-api/swagger.json index db3efef..b55eae3 100644 --- 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": "6.0.6", + "version": "7.0.0", "license": { "name": "MIT" } @@ -936,10 +936,10 @@ "currency": { "type": "string", "enum": [ - "KRW", - "USD", "EUR", - "JPY" + "JPY", + "KRW", + "USD" ], "title": "통화 정보", "description": "통화 정보." @@ -1319,10 +1319,10 @@ "currency": { "type": "string", "enum": [ - "KRW", - "USD", "EUR", - "JPY" + "JPY", + "KRW", + "USD" ], "title": "통화 정보", "description": "통화 정보." @@ -1464,9 +1464,9 @@ "carrier": { "type": "string", "enum": [ - "SKT", "KT", - "LGT" + "LGT", + "SKT" ], "title": "본인인증 대상자 통신사 코드", "description": "본인인증 대상자 통신사 코드." @@ -1556,9 +1556,9 @@ "carrier": { "type": "string", "enum": [ - "SKT", "KT", - "LGT" + "LGT", + "SKT" ], "title": "본인인증 대상자 통신사 코드", "description": "본인인증 대상자 통신사 코드." @@ -1667,10 +1667,10 @@ "status": { "type": "string", "enum": [ - "paid", - "ready", + "cancelled", "failed", - "cancelled" + "paid", + "ready" ], "title": "현재 상태", "description": "현재 상태." @@ -2160,18 +2160,18 @@ "pay_method": { "type": "string", "enum": [ - "phone", - "kpay", + "booknlife", + "cultureland", + "happymoney", "kakaopay", - "payco", + "kpay", "lpay", - "ssgpay", - "tosspay", - "cultureland", + "payco", + "phone", + "point", "smartculture", - "happymoney", - "booknlife", - "point" + "ssgpay", + "tosspay" ] }, "imp_uid": { @@ -2446,7 +2446,7 @@ "properties": { "imp_uid": { "type": "string", - "title": "귀속 결제의 {@link IIamportPayment", + "title": "귀속 결제의 {@link IIamportPayment.imp_uid }", "description": "귀속 결제의 {@link IIamportPayment.imp_uid }." }, "receipt_uid": { @@ -2518,7 +2518,7 @@ "properties": { "imp_uid": { "type": "string", - "title": "귀속 결제의 {@link IIamportPayment", + "title": "귀속 결제의 {@link IIamportPayment.imp_uid }", "description": "귀속 결제의 {@link IIamportPayment.imp_uid }." }, "identifier": { @@ -2529,9 +2529,9 @@ "identifier_type": { "type": "string", "enum": [ - "phone", - "person", "business", + "person", + "phone", "taxcard" ], "title": "현금영수증 발행대상 유형", @@ -2540,8 +2540,8 @@ "type": { "type": "string", "enum": [ - "person", - "company" + "company", + "person" ], "title": "현금영수증 발행 타입 (대상)", "description": "현금영수증 발행 타입 (대상).\n\n누락시 person 이 사용됨." @@ -2756,7 +2756,7 @@ "properties": { "imp_uid": { "type": "string", - "title": "대상 결제 기록의 {@link IIamportPayment", + "title": "대상 결제 기록의 {@link IIamportPayment.imp_uid }", "description": "대상 결제 기록의 {@link IIamportPayment.imp_uid }." }, "amount": { diff --git a/packages/payment-api/README.md b/packages/payment-api/README.md index 21bf5f2..486567b 100644 --- a/packages/payment-api/README.md +++ b/packages/payment-api/README.md @@ -48,7 +48,7 @@ import { IPaymentHistory } from "@samchon/payment-api/lib/structures/payments/IP import { IPaymentWebhookHistory } from "@samchon/payment-api/lib/structures/payments/IPaymentWebhookHistory"; import toss from "toss-payments-server-api"; import { ITossPayment } from "toss-payments-server-api/lib/structures/ITossPayment"; -import { sleep_for } from "tstl/thread/global"; +import { sleep_for } from "tstl"; import typia from "typia"; import { v4 } from "uuid"; diff --git a/packages/payment-api/package.json b/packages/payment-api/package.json index 77cf1c5..14e0a23 100644 --- a/packages/payment-api/package.json +++ b/packages/payment-api/package.json @@ -1,6 +1,6 @@ { "name": "@samchon/payment-api", - "version": "6.0.6", + "version": "7.0.0", "description": "API for Payment Backend", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -34,10 +34,10 @@ "typescript": "^5.3.2" }, "dependencies": { - "@nestia/fetcher": "^2.5.8", + "@nestia/fetcher": "^2.6.2", "@types/node": "^20.11.5", - "iamport-server-api": "^6.0.6", - "toss-payments-server-api": "^6.0.6", - "typia": "^5.4.9" + "iamport-server-api": "^7.0.0", + "toss-payments-server-api": "^7.0.0", + "typia": "^5.5.7" } } \ No newline at end of file diff --git a/packages/payment-api/swagger.json b/packages/payment-api/swagger.json index 6ab9a22..513b79c 100644 --- a/packages/payment-api/swagger.json +++ b/packages/payment-api/swagger.json @@ -7,7 +7,7 @@ } ], "info": { - "version": "6.0.6", + "version": "7.0.0", "title": "@samchon/payment-backend", "description": "Payment Backend Server", "license": { @@ -490,7 +490,6 @@ "items": { "type": "string" }, - "title": "`process", "description": "`process.argv`" }, "commit": { @@ -500,7 +499,6 @@ }, "package": { "$ref": "#/components/schemas/ISystem.IPackage", - "title": "`package", "description": "`package.json`" }, "created_at": { @@ -1606,18 +1604,18 @@ "pay_method": { "type": "string", "enum": [ - "phone", - "kpay", + "booknlife", + "cultureland", + "happymoney", "kakaopay", - "payco", + "kpay", "lpay", - "ssgpay", - "tosspay", - "cultureland", + "payco", + "phone", + "point", "smartculture", - "happymoney", - "booknlife", - "point" + "ssgpay", + "tosspay" ] }, "imp_uid": { @@ -1992,9 +1990,9 @@ "easyPay": { "type": "string", "enum": [ + "삼성페이", "토스결제", - "페이코", - "삼성페이" + "페이코" ], "nullable": true, "title": "간편결제로 결제한 경우 간편결제 타입 정보", @@ -2011,8 +2009,8 @@ "type": { "type": "string", "enum": [ - "NORMAL", - "BILLING" + "BILLING", + "NORMAL" ], "title": "결제 타입", "description": "결제 타입.\n\n - NORMAL: 일반 결제\n - BILLING: 미리 등록한 카드에 의한 간편 결제." @@ -2020,14 +2018,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -2199,9 +2197,9 @@ "cardType": { "type": "string", "enum": [ + "기프트", "신용", - "체크", - "기프트" + "체크" ], "title": "카드 타입", "description": "카드 타입." @@ -2218,11 +2216,11 @@ "acquireStatus": { "type": "string", "enum": [ - "READY", "CANCELED", - "REQUESTED", + "CANCEL_REQUESTED", "COMPLETED", - "CANCEL_REQUESTED" + "READY", + "REQUESTED" ], "title": "카드 결제의 매입 상태", "description": "카드 결제의 매입 상태.\n\n - READY: 매입 대기\n - REQUESTED: 매입 요청됨\n - COMPLETED: 매입 완료\n - CANCEL_REQUESTED: 매입 취소 요청됨\n - CANCELD: 매입 취소됨" @@ -2384,14 +2382,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -2573,14 +2571,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -2768,14 +2766,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -2962,14 +2960,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -3111,8 +3109,8 @@ "accountType": { "type": "string", "enum": [ - "일반", - "고정" + "고정", + "일반" ], "title": "가상 계좌 타입", "description": "가상 계좌 타입." @@ -3151,10 +3149,10 @@ "type": "string", "enum": [ "COMPLETED", - "NONE", "FAILED", - "PENDING", - "PARTIAL_FAILED" + "NONE", + "PARTIAL_FAILED", + "PENDING" ], "title": "환불 처리 상태", "description": "환불 처리 상태.\n\n - NONE: 해당 없음\n - FAILED: 환불 실패\n - PENDING: 환불 처리중\n - PARTIAL_FAILED: 부분 환불 실패\n - COMPLETED: 환불 완료" @@ -3661,10 +3659,10 @@ "status": { "type": "string", "enum": [ - "paid", - "ready", + "cancelled", "failed", - "cancelled" + "paid", + "ready" ], "title": "현재 상태", "description": "현재 상태." diff --git a/packages/payment-backend/README.md b/packages/payment-backend/README.md index fee8f4b..382be59 100644 --- a/packages/payment-backend/README.md +++ b/packages/payment-backend/README.md @@ -52,7 +52,7 @@ import { IPaymentHistory } from "@samchon/payment-api/lib/structures/payments/IP import { IPaymentWebhookHistory } from "@samchon/payment-api/lib/structures/payments/IPaymentWebhookHistory"; import toss from "toss-payments-server-api"; import { ITossPayment } from "toss-payments-server-api/lib/structures/ITossPayment"; -import { sleep_for } from "tstl/thread/global"; +import { sleep_for } from "tstl"; import typia from "typia"; import { v4 } from "uuid"; @@ -326,7 +326,7 @@ import { IIamportResponse } from "iamport-server-api/lib/structures/IIamportResp import PaymentAPI from "@samchon/payment-api"; import { IPaymentHistory } from "@samchon/payment-api/lib/structures/payments/IPaymentHistory"; import { IPaymentWebhookHistory } from "@samchon/payment-api/lib/structures/payments/IPaymentWebhookHistory"; -import { sleep_for } from "tstl/thread/global"; +import { sleep_for } from "tstl"; import typia from "typia"; import { v4 } from "uuid"; @@ -490,7 +490,7 @@ npm run test ```typescript import { v4 } from "uuid"; -import { sleep_for } from "tstl/thread/global"; +import { sleep_for } from "tstl"; import imp from "iamport-server-api"; import payments from "../../../../api"; diff --git a/packages/payment-backend/docs/ERD.md b/packages/payment-backend/docs/ERD.md index a80ec80..e395c2e 100644 --- a/packages/payment-backend/docs/ERD.md +++ b/packages/payment-backend/docs/ERD.md @@ -7,58 +7,58 @@ ```mermaid erDiagram "payment_reservations" { - String id PK - String source_schema - String source_table - String source_id - String vendor_code - String vendor_uid - String vendor_store_id - String title - String data - String password - DateTime created_at + String id PK + String source_schema + String source_table + String source_id + String vendor_code + String vendor_uid + String vendor_store_id + String title + String data + String password + DateTime created_at } "payment_histories" { - String id PK - String source_schema - String source_table - String source_id - String vendor_code - String vendor_uid - String vendor_store_id - String currency - Float price - Float refund "nullable" - String webhook_url - String data - String password - DateTime created_at - DateTime paid_at "nullable" - DateTime cancelled_at "nullable" + String id PK + String source_schema + String source_table + String source_id + String vendor_code + String vendor_uid + String vendor_store_id + String currency + Float price + Float refund "nullable" + String webhook_url + String data + String password + DateTime created_at + DateTime paid_at "nullable" + DateTime cancelled_at "nullable" } "payment_history_cancels" { - String id PK - String payment_history_id FK - Float amount - String reason - String data - DateTime created_at + String id PK + String payment_history_id FK + Float amount + String reason + String data + DateTime created_at } "payment_history_webhooks" { - String id PK - String payment_history_id FK - String previous - String current - String data - DateTime created_at + String id PK + String payment_history_id FK + String previous + String current + String data + DateTime created_at } "payment_history_webhook_responses" { - String id PK - String payment_history_webhook_id FK - Int status "nullable" - String body "nullable" - DateTime created_at + String id PK + String payment_history_webhook_id FK + Int status "nullable" + String body "nullable" + DateTime created_at } "payment_history_cancels" }o--|| "payment_histories" : history "payment_history_webhooks" }o--|| "payment_histories" : history diff --git a/packages/payment-backend/package.json b/packages/payment-backend/package.json index 8ecf8fd..0fec053 100644 --- a/packages/payment-backend/package.json +++ b/packages/payment-backend/package.json @@ -1,6 +1,6 @@ { "name": "@samchon/payment-backend", - "version": "6.0.6", + "version": "7.0.0", "description": "Payment Backend Server", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -37,8 +37,8 @@ }, "homepage": "https://github.com/samchon/payments", "devDependencies": { - "@nestia/fetcher": "^2.5.8", - "@nestia/sdk": "^2.5.8", + "@nestia/fetcher": "^2.6.2", + "@nestia/sdk": "^2.6.2", "@types/atob": "^2.1.2", "@types/bcryptjs": "^2.4.4", "@types/btoa": "^1.2.3", @@ -53,12 +53,12 @@ "cli": "^1.0.1", "copy-webpack-plugin": "^11.0.0", "copyfiles": "^2.4.1", - "iamport-server-api": "^6.0.6", + "iamport-server-api": "^7.0.0", "nestia": "^5.0.3", "pm2": "^4.5.6", "rimraf": "^3.0.2", "sloc": "^0.2.1", - "toss-payments-server-api": "^6.0.6", + "toss-payments-server-api": "^7.0.0", "ts-loader": "^9.5.0", "ts-node": "^10.9.1", "ts-patch": "^3.1.1", @@ -69,7 +69,7 @@ "write-file-webpack-plugin": "^4.5.1" }, "dependencies": { - "@nestia/core": "^2.5.8", + "@nestia/core": "^2.6.2", "@nestia/e2e": "^0.4.1", "@nestjs/common": "^10.2.8", "@nestjs/core": "^10.2.8", @@ -81,8 +81,8 @@ "commander": "10.0.0", "dotenv": "^16.3.1", "dotenv-expand": "^10.0.0", - "fake-iamport-server": "^6.0.6", - "fake-toss-payments-server": "^6.0.6", + "fake-iamport-server": "^7.0.0", + "fake-toss-payments-server": "^7.0.0", "fastify": "^4.24.3", "git-last-commit": "^1.0.0", "inquirer": "^8.2.5", @@ -91,8 +91,8 @@ "prisma-markdown": "^1.0.8", "serialize-error": "^4.1.0", "source-map-support": "^0.5.19", - "tstl": "^2.5.13", - "typia": "^5.4.9", + "tstl": "^3.0.0", + "typia": "^5.5.7", "uuid": "^9.0.1" }, "files": [ diff --git a/packages/payment-backend/src/executable/server.ts b/packages/payment-backend/src/executable/server.ts index cc4f943..aa34ae2 100644 --- a/packages/payment-backend/src/executable/server.ts +++ b/packages/payment-backend/src/executable/server.ts @@ -1,8 +1,7 @@ import { FakeIamportBackend } from "fake-iamport-server"; import { FakeTossBackend } from "fake-toss-payments-server"; import fs from "fs"; -import { randint } from "tstl/algorithm/random"; -import { Singleton } from "tstl/thread/Singleton"; +import { Singleton, randint } from "tstl"; import { PaymentBackend } from "../PaymentBackend"; import { PaymentGlobal } from "../PaymentGlobal"; diff --git a/packages/payment-backend/src/providers/monitors/SystemProvider.ts b/packages/payment-backend/src/providers/monitors/SystemProvider.ts index 121c8c2..db10848 100644 --- a/packages/payment-backend/src/providers/monitors/SystemProvider.ts +++ b/packages/payment-backend/src/providers/monitors/SystemProvider.ts @@ -1,6 +1,6 @@ import fs from "fs"; import git from "git-last-commit"; -import { Singleton } from "tstl/thread/Singleton"; +import { Singleton } from "tstl"; import { v4 } from "uuid"; import { PaymentConfiguration } from "../../PaymentConfiguration"; diff --git a/packages/payment-backend/src/providers/payments/FakePaymentStorage.ts b/packages/payment-backend/src/providers/payments/FakePaymentStorage.ts index 9b21026..bac3ad2 100644 --- a/packages/payment-backend/src/providers/payments/FakePaymentStorage.ts +++ b/packages/payment-backend/src/providers/payments/FakePaymentStorage.ts @@ -1,5 +1,5 @@ import { IPaymentWebhookHistory } from "@samchon/payment-api/lib/structures/payments/IPaymentWebhookHistory"; -import { Vector } from "tstl/container/Vector"; +import { Vector } from "tstl"; export namespace FakePaymentStorage { export const webhooks: Vector = new Vector(); diff --git a/packages/payment-backend/src/providers/payments/PaymentWebhookProvider.ts b/packages/payment-backend/src/providers/payments/PaymentWebhookProvider.ts index 1d69e94..4ed9dbf 100644 --- a/packages/payment-backend/src/providers/payments/PaymentWebhookProvider.ts +++ b/packages/payment-backend/src/providers/payments/PaymentWebhookProvider.ts @@ -3,7 +3,7 @@ import { AesPkcs5 } from "@nestia/fetcher/lib/AesPkcs5"; import { payment_histories, payment_history_webhooks } from "@prisma/client"; import { IPaymentHistory } from "@samchon/payment-api/lib/structures/payments/IPaymentHistory"; import { IPaymentWebhookHistory } from "@samchon/payment-api/lib/structures/payments/IPaymentWebhookHistory"; -import { InvalidArgument } from "tstl/exception/InvalidArgument"; +import { InvalidArgument } from "tstl"; import { v4 } from "uuid"; import { PaymentConfiguration } from "../../PaymentConfiguration"; diff --git a/packages/payment-backend/src/services/iamport/IamportAsset.ts b/packages/payment-backend/src/services/iamport/IamportAsset.ts index 0136e52..55dab84 100644 --- a/packages/payment-backend/src/services/iamport/IamportAsset.ts +++ b/packages/payment-backend/src/services/iamport/IamportAsset.ts @@ -1,6 +1,6 @@ import fake from "fake-iamport-server"; import imp from "iamport-server-api"; -import { VariadicSingleton } from "tstl/thread/VariadicSingleton"; +import { VariadicSingleton } from "tstl"; import { PaymentConfiguration } from "../../PaymentConfiguration"; import { PaymentGlobal } from "../../PaymentGlobal"; diff --git a/packages/payment-backend/src/services/iamport/IamportPaymentService.ts b/packages/payment-backend/src/services/iamport/IamportPaymentService.ts index 46d1ac5..7831438 100644 --- a/packages/payment-backend/src/services/iamport/IamportPaymentService.ts +++ b/packages/payment-backend/src/services/iamport/IamportPaymentService.ts @@ -2,7 +2,7 @@ import { IPaymentHistory } from "@samchon/payment-api/lib/structures/payments/IP import imp from "iamport-server-api"; import { IIamportPayment } from "iamport-server-api/lib/structures/IIamportPayment"; import { IIamportPaymentCancel } from "iamport-server-api/lib/structures/IIamportPaymentCancel"; -import { DomainError } from "tstl/exception/DomainError"; +import { DomainError } from "tstl"; import { ErrorUtil } from "../../utils/ErrorUtil"; import { IamportAsset } from "./IamportAsset"; diff --git a/packages/payment-backend/src/utils/ErrorUtil.ts b/packages/payment-backend/src/utils/ErrorUtil.ts index 7191819..d48a52a 100644 --- a/packages/payment-backend/src/utils/ErrorUtil.ts +++ b/packages/payment-backend/src/utils/ErrorUtil.ts @@ -1,7 +1,6 @@ import fs from "fs"; import serializeError from "serialize-error"; -import { randint } from "tstl/algorithm/random"; -import { Singleton } from "tstl/thread/Singleton"; +import { Singleton, randint } from "tstl"; import { PaymentConfiguration } from "../PaymentConfiguration"; diff --git a/packages/payment-backend/src/utils/Terminal.ts b/packages/payment-backend/src/utils/Terminal.ts index c7fe808..d90de1f 100644 --- a/packages/payment-backend/src/utils/Terminal.ts +++ b/packages/payment-backend/src/utils/Terminal.ts @@ -1,5 +1,5 @@ import cp from "child_process"; -import { Pair } from "tstl/utility/Pair"; +import { Pair } from "tstl"; export namespace Terminal { export function execute( diff --git a/packages/payment-backend/src/utils/TokenManager.ts b/packages/payment-backend/src/utils/TokenManager.ts index 02daa5f..9591ba3 100644 --- a/packages/payment-backend/src/utils/TokenManager.ts +++ b/packages/payment-backend/src/utils/TokenManager.ts @@ -1,6 +1,5 @@ import { AesPkcs5 } from "@nestia/fetcher/lib/AesPkcs5"; -import { randint } from "tstl/algorithm/random"; -import { Pair } from "tstl/utility/Pair"; +import { Pair, randint } from "tstl"; import { v4 } from "uuid"; export namespace TokenManager { diff --git a/packages/payment-backend/test/features/iamport/test_api_iamport_vbank_payment.ts b/packages/payment-backend/test/features/iamport/test_api_iamport_vbank_payment.ts index b81b47a..62e7ac6 100644 --- a/packages/payment-backend/test/features/iamport/test_api_iamport_vbank_payment.ts +++ b/packages/payment-backend/test/features/iamport/test_api_iamport_vbank_payment.ts @@ -5,7 +5,7 @@ import { IPaymentWebhookHistory } from "@samchon/payment-api/lib/structures/paym import imp from "iamport-server-api"; import { IIamportPayment } from "iamport-server-api/lib/structures/IIamportPayment"; import { IIamportResponse } from "iamport-server-api/lib/structures/IIamportResponse"; -import { sleep_for } from "tstl/thread/global"; +import { sleep_for } from "tstl"; import typia from "typia"; import { v4 } from "uuid"; diff --git a/packages/payment-backend/test/features/toss/test_api_toss_vbank_payment.ts b/packages/payment-backend/test/features/toss/test_api_toss_vbank_payment.ts index 85e1d5b..b48c726 100644 --- a/packages/payment-backend/test/features/toss/test_api_toss_vbank_payment.ts +++ b/packages/payment-backend/test/features/toss/test_api_toss_vbank_payment.ts @@ -4,7 +4,7 @@ import { IPaymentHistory } from "@samchon/payment-api/lib/structures/payments/IP import { IPaymentWebhookHistory } from "@samchon/payment-api/lib/structures/payments/IPaymentWebhookHistory"; import toss from "toss-payments-server-api"; import { ITossPayment } from "toss-payments-server-api/lib/structures/ITossPayment"; -import { sleep_for } from "tstl/thread/global"; +import { sleep_for } from "tstl"; import typia from "typia"; import { v4 } from "uuid"; diff --git a/packages/payment-backend/test/index.ts b/packages/payment-backend/test/index.ts index ed6d22d..e1a7ba5 100644 --- a/packages/payment-backend/test/index.ts +++ b/packages/payment-backend/test/index.ts @@ -2,7 +2,7 @@ import { DynamicExecutor, StopWatch } from "@nestia/e2e"; import api from "@samchon/payment-api/lib/index"; import fs from "fs"; import { Singleton, randint } from "tstl"; -import { sleep_for } from "tstl/thread/global"; +import { sleep_for } from "tstl"; import { PaymentBackend, diff --git a/packages/payment-backend/test/webpack.ts b/packages/payment-backend/test/webpack.ts index 0691e2c..85733a7 100644 --- a/packages/payment-backend/test/webpack.ts +++ b/packages/payment-backend/test/webpack.ts @@ -2,7 +2,7 @@ import { DynamicExecutor } from "@nestia/e2e"; import api from "@samchon/payment-api/lib/index"; import fs from "fs"; import { Singleton, randint } from "tstl"; -import { sleep_for } from "tstl/thread/global"; +import { sleep_for } from "tstl"; import { PaymentBackend, PaymentConfiguration, PaymentGlobal } from "../src"; import { ErrorUtil } from "../src/utils/ErrorUtil"; diff --git a/packages/toss-payments-server-api/package.json b/packages/toss-payments-server-api/package.json index fe2e989..9d49ad5 100644 --- a/packages/toss-payments-server-api/package.json +++ b/packages/toss-payments-server-api/package.json @@ -1,6 +1,6 @@ { "name": "toss-payments-server-api", - "version": "6.0.6", + "version": "7.0.0", "description": "API for Toss Payments Server", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -34,7 +34,7 @@ "typescript": "^5.3.2" }, "dependencies": { - "@nestia/fetcher": "^2.5.8", - "typia": "^5.4.9" + "@nestia/fetcher": "^2.6.2", + "typia": "^5.5.7" } } \ No newline at end of file diff --git a/packages/toss-payments-server-api/swagger.json b/packages/toss-payments-server-api/swagger.json index c71c085..9c764fa 100644 --- a/packages/toss-payments-server-api/swagger.json +++ b/packages/toss-payments-server-api/swagger.json @@ -13,7 +13,7 @@ "info": { "title": "Toss Payments API", "description": "Built by [fake-toss-payments-server](https://github.com/samchon/payments/tree/master/packages/toss-payments-server-api) with [nestia](https://github.com/samchon/nestia)", - "version": "6.0.6", + "version": "7.0.0", "license": { "name": "MIT" } @@ -720,9 +720,9 @@ "easyPay": { "type": "string", "enum": [ + "삼성페이", "토스결제", - "페이코", - "삼성페이" + "페이코" ], "nullable": true, "title": "간편결제로 결제한 경우 간편결제 타입 정보", @@ -739,8 +739,8 @@ "type": { "type": "string", "enum": [ - "NORMAL", - "BILLING" + "BILLING", + "NORMAL" ], "title": "결제 타입", "description": "결제 타입.\n\n - NORMAL: 일반 결제\n - BILLING: 미리 등록한 카드에 의한 간편 결제." @@ -748,14 +748,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -927,9 +927,9 @@ "cardType": { "type": "string", "enum": [ + "기프트", "신용", - "체크", - "기프트" + "체크" ], "title": "카드 타입", "description": "카드 타입." @@ -946,11 +946,11 @@ "acquireStatus": { "type": "string", "enum": [ - "READY", "CANCELED", - "REQUESTED", + "CANCEL_REQUESTED", "COMPLETED", - "CANCEL_REQUESTED" + "READY", + "REQUESTED" ], "title": "카드 결제의 매입 상태", "description": "카드 결제의 매입 상태.\n\n - READY: 매입 대기\n - REQUESTED: 매입 요청됨\n - COMPLETED: 매입 완료\n - CANCEL_REQUESTED: 매입 취소 요청됨\n - CANCELD: 매입 취소됨" @@ -1112,14 +1112,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -1301,14 +1301,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -1496,14 +1496,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -1690,14 +1690,14 @@ "status": { "type": "string", "enum": [ - "READY", - "IN_PROGRESS", - "WAITING_FOR_DEPOSIT", - "DONE", + "ABORTED", "CANCELED", + "DONE", + "EXPIRED", + "IN_PROGRESS", "PARTIAL_CANCELED", - "ABORTED", - "EXPIRED" + "READY", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - READY\n - IN_PROGRESS\n - WAITING_FOR_DEPOSIT\n - DONE\n - CANCELED\n - PARTIAL_CANCELED\n - ABORTED\n - EXPIRED" @@ -1839,8 +1839,8 @@ "accountType": { "type": "string", "enum": [ - "일반", - "고정" + "고정", + "일반" ], "title": "가상 계좌 타입", "description": "가상 계좌 타입." @@ -1879,10 +1879,10 @@ "type": "string", "enum": [ "COMPLETED", - "NONE", "FAILED", - "PENDING", - "PARTIAL_FAILED" + "NONE", + "PARTIAL_FAILED", + "PENDING" ], "title": "환불 처리 상태", "description": "환불 처리 상태.\n\n - NONE: 해당 없음\n - FAILED: 환불 실패\n - PENDING: 환불 처리중\n - PARTIAL_FAILED: 부분 환불 실패\n - COMPLETED: 환불 완료" @@ -1915,7 +1915,7 @@ }, "paymentKey": { "type": "string", - "title": "귀속 결제의 {@link ITossPayment", + "title": "귀속 결제의 {@link ITossPayment.paymentKey }", "description": "귀속 결제의 {@link ITossPayment.paymentKey }." }, "orderId": { @@ -2072,10 +2072,10 @@ "status": { "type": "string", "enum": [ - "WAITING_FOR_DEPOSIT", - "DONE", "CANCELED", - "PARTIAL_CANCELED" + "DONE", + "PARTIAL_CANCELED", + "WAITING_FOR_DEPOSIT" ], "title": "결제 상태", "description": "결제 상태.\n\n - DONE: 결제 완료\n - CANCELED: 결제가 취소됨\n - PARTIAL_CANCELED: 결제가 부분 취소됨\n - WAITING_FOR_DEPOSIT: 입금 대기 중"