@chevre/domain 22.5.0-alpha.27 → 22.5.0-alpha.28

package/example/src/chevre/aggregateAllEvents2.ts

@@ -71,7 +71,7 @@ export async function aggregateScreeningEvent() {
                         abortedTasksWithoutReport: [],
                         coa: { timeout: 1000 },
                         gmo: { timeout: 1000, timeoutBackground: 1000, useFetch: true },
-                        movieticketReserve: { timeout: 1000, timeoutCheck: 1000 },
+                        movieticketReserve: { timeout: 1000, timeoutCheck: 1000, minIntervalBetweenPayAndRefund: 0 },
                         numTryConfirmReserveTransaction: 10,
                         useAssetTransactionSyncProcessing: true,
                         useExperimentalFeature: false

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js

@@ -12,10 +12,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.refundMovieTicket = void 0;
 const surfrock = require("@surfrock/sdk");
 const http_status_1 = require("http-status");
+const moment = require("moment");
 const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
 const onRefund_1 = require("../any/onRefund");
 const factory_1 = require("./factory");
+function wait4payActionDelayIfNeeded(params) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        const { payAction } = params;
+        const minIntervalBetweenPayAndRefund = settings.movieticketReserve.minIntervalBetweenPayAndRefund;
+        let waitingNecessary = false;
+        if (typeof minIntervalBetweenPayAndRefund === 'number' && minIntervalBetweenPayAndRefund > 0) {
+            if (payAction.actionStatus !== factory.actionStatusType.CompletedActionStatus) {
+                const payStartExpected = moment()
+                    .add(-minIntervalBetweenPayAndRefund, 'milliseconds');
+                waitingNecessary = moment(payAction.startDate)
+                    .isAfter(payStartExpected);
+            }
+        }
+        if (waitingNecessary) {
+            // tslint:disable-next-line:no-console
+            console.log('wait4payActionDelayIfNeeded: waiting... minIntervalBetweenPayAndRefund:', minIntervalBetweenPayAndRefund);
+            yield new Promise((resolve) => {
+                setTimeout(() => {
+                    resolve();
+                }, minIntervalBetweenPayAndRefund);
+            });
+        }
+    });
+}
 /**
  * 決済カード返金
  */
@@ -25,6 +50,24 @@ function refundMovieTicket(params) {
         var _a, _b, _c, _d, _e, _f;
         const paymentMethodId = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.paymentMethodId;
         const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
+        // 本アクションに対応するPayActionを取り出す
+        // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
+        const payAction = yield repos.action.findPayAction({
+            project: { id: params.project.id },
+            paymentMethodId,
+            actionStatus: {
+                $in: [
+                    factory.actionStatusType.ActiveActionStatus,
+                    factory.actionStatusType.CompletedActionStatus,
+                    factory.actionStatusType.FailedActionStatus
+                ]
+            }
+        });
+        if (payAction === undefined) {
+            throw new factory.errors.NotFound(factory.actionType.PayAction);
+        }
+        // handle delays in the side of payment service(2024-10-23~)
+        yield wait4payActionDelayIfNeeded({ payAction })(settings);
         const availableChannel = yield repos.paymentService.findAvailableChannel({
             project: params.project,
             typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
@@ -44,13 +87,15 @@ function refundMovieTicket(params) {
         if (useSeatInfoSyncCancel) {
             seatInfoSyncCancelIn = yield createSeatInfoSyncCancelInOnRefund({
                 project: { id: params.project.id },
-                paymentMethodId
+                paymentMethodId,
+                payAction: { id: payAction.id }
             })({ action: repos.action });
         }
         else {
             seatInfoSyncIn = yield createSeatInfoSyncInOnRefund({
                 project: { id: params.project.id },
-                paymentMethodId
+                paymentMethodId,
+                payAction: { id: payAction.id }
             })({ action: repos.action });
         }
         let recipe = (0, factory_1.processSeatInfoSyncResult2refundRecipe)(Object.assign(Object.assign({ project: { id: params.project.id } }, (seatInfoSyncIn !== undefined) ? { processSeatInfoSyncResult: { seatInfoSyncIn } } : undefined), (seatInfoSyncCancelIn !== undefined) ? { processSeatInfoSyncCancelResult: { seatInfoSyncCancelIn } } : undefined));
@@ -100,15 +145,7 @@ function refundMovieTicket(params) {
         else {
             // add recipe(2024-06-04~)
             recipe = (0, factory_1.processSeatInfoSyncResult2refundRecipe)(Object.assign(Object.assign({ project: { id: params.project.id } }, (processSeatInfoSyncResult !== undefined) ? { processSeatInfoSyncResult } : undefined), (processSeatInfoSyncCancelResult !== undefined) ? { processSeatInfoSyncCancelResult } : undefined));
-            const actionResult = {
-            // ...(seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined, // instrumentへ移行(2024-04-30~)
-            // ...(processSeatInfoSyncResult?.seatInfoSyncResult !== undefined) // discontinue(2024-06-10~)
-            //     ? { seatInfoSyncResult: processSeatInfoSyncResult.seatInfoSyncResult }
-            //     : undefined,
-            // ...(processSeatInfoSyncCancelResult?.seatInfoSyncCancelResult !== undefined) // discontinue(2024-06-10~)
-            //     ? { seatInfoSyncCancelResult: processSeatInfoSyncCancelResult.seatInfoSyncCancelResult }
-            //     : undefined
-            };
+            const actionResult = {};
             yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
             actionStatus = factory.actionStatusType.CompletedActionStatus;
         }
@@ -127,34 +164,12 @@ exports.refundMovieTicket = refundMovieTicket;
 function createSeatInfoSyncInOnRefund(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        // 本アクションに対応するPayActionを取り出す
-        // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
-        const payAction = yield repos.action.findPayAction({
-            project: { id: params.project.id },
-            paymentMethodId: params.paymentMethodId,
-            actionStatus: {
-                $in: [
-                    factory.actionStatusType.ActiveActionStatus,
-                    factory.actionStatusType.CompletedActionStatus,
-                    factory.actionStatusType.FailedActionStatus
-                ]
-            }
-        });
-        if (payAction === undefined) {
-            throw new factory.errors.NotFound('PayAction');
-        }
         const recipe = yield repos.action.findRecipeByAction({
             project: { id: params.project.id },
-            recipeFor: { id: payAction.id }
+            recipeFor: { id: params.payAction.id }
         });
-        // const seatInfoSyncInOnPay: surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn | undefined =
-        //     payAction.instrument?.seatInfoSyncIn;
         const seatInfoSyncInOnPay = (_c = (_b = (_a = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _a === void 0 ? void 0 : _a.itemListElement[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.beforeMedia;
-        // if (seatInfoSyncInOnPay === undefined && payAction.instrument?.seatInfoSyncIn !== undefined) {
-        //     seatInfoSyncInOnPay = payAction.instrument.seatInfoSyncIn; // compatibility
-        // }
         if (seatInfoSyncInOnPay === undefined) {
-            // throw new factory.errors.NotFound('PayAction.instrument?.seatInfoSyncIn');
             throw new factory.errors.NotFound('PayAction.recipe.step.itemListElement.itemListElement.beforeMedia');
         }
         let seatInfoSyncIn;
@@ -167,34 +182,12 @@ function createSeatInfoSyncInOnRefund(params) {
 function createSeatInfoSyncCancelInOnRefund(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        // 本アクションに対応するPayActionを取り出す
-        // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
-        const payAction = yield repos.action.findPayAction({
-            project: { id: params.project.id },
-            paymentMethodId: params.paymentMethodId,
-            actionStatus: {
-                $in: [
-                    factory.actionStatusType.ActiveActionStatus,
-                    factory.actionStatusType.CompletedActionStatus,
-                    factory.actionStatusType.FailedActionStatus
-                ]
-            }
-        });
-        if (payAction === undefined) {
-            throw new factory.errors.NotFound('PayAction');
-        }
         const recipe = yield repos.action.findRecipeByAction({
             project: { id: params.project.id },
-            recipeFor: { id: payAction.id }
+            recipeFor: { id: params.payAction.id }
         });
-        // const seatInfoSyncInOnPay: surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn | undefined =
-        //     payAction.instrument?.seatInfoSyncIn;
         const seatInfoSyncInOnPay = (_c = (_b = (_a = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _a === void 0 ? void 0 : _a.itemListElement[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.beforeMedia;
-        // if (seatInfoSyncInOnPay === undefined && payAction.instrument?.seatInfoSyncIn !== undefined) {
-        //     seatInfoSyncInOnPay = payAction.instrument.seatInfoSyncIn; // compatibility
-        // }
         if (seatInfoSyncInOnPay === undefined) {
-            // throw new factory.errors.NotFound('PayAction.instrument?.seatInfoSyncIn');
             throw new factory.errors.NotFound('PayAction.recipe.step.itemListElement.itemListElement.beforeMedia');
         }
         let seatInfoSyncCancelIn;

package/lib/chevre/settings.d.ts

@@ -52,6 +52,10 @@ interface IOptions {
          * 認証時タイムアウト
          */
         timeoutCheck: number;
+        /**
+         * 決済と返金の最小間隔(ms)
+         */
+        minIntervalBetweenPayAndRefund: number;
     };
     useAssetTransactionSyncProcessing: boolean;
     useExperimentalFeature: boolean;
@@ -119,6 +123,10 @@ declare class Settings {
          * 認証時タイムアウト
          */
         timeoutCheck: number;
+        /**
+         * 決済と返金の最小間隔(ms)
+         */
+        minIntervalBetweenPayAndRefund: number;
     };
     readonly useAssetTransactionSyncProcessing: boolean;
     readonly useExperimentalFeature: boolean;

package/package.json

@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.5.0-alpha.27"
+  "version": "22.5.0-alpha.28"
 }