@chevre/domain 21.30.0-alpha.20 → 21.30.0-alpha.21

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

@@ -350,9 +350,9 @@ function payActionParams2seatInfoSyncIn(params) {
  * MovieTicket着券取消
  */
 function refundMovieTicket(params) {
-    // tslint:disable-next-line:max-func-body-length
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         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;
         const availableChannel = yield repos.paymentService.findAvailableChannel({
@@ -368,66 +368,133 @@ function refundMovieTicket(params) {
             state: ''
         });
         const movieTicketSeatService = new surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: credentials_1.credentials.movieticketReserve.timeout });
+        let seatInfoSyncCancelIn;
+        let seatInfoSyncIn;
+        const useSeatInfoSyncCancel = ((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.useSeatInfoSyncCancel) === true;
+        if (useSeatInfoSyncCancel) {
+            seatInfoSyncCancelIn = yield createSeatInfoSyncCancelInOnRefund({
+                project: { id: params.project.id },
+                paymentMethodId
+            })({ action: repos.action });
+        }
+        else {
+            seatInfoSyncIn = yield createSeatInfoSyncInOnRefund({
+                project: { id: params.project.id },
+                paymentMethodId
+            })({ action: repos.action });
+        }
         // アクション開始
-        let action = yield repos.action.start(Object.assign(Object.assign({}, params), (typeof ((_f = params.sameAs) === null || _f === void 0 ? void 0 : _f.id) === 'string')
+        // instrumentをセット(2024-04-30~)
+        const instrument = Object.assign(Object.assign({ typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket }, (seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined), (seatInfoSyncCancelIn !== undefined) ? { seatInfoSyncCancelIn } : undefined);
+        let action = yield repos.action.start(Object.assign(Object.assign(Object.assign({}, params), (typeof ((_g = params.sameAs) === null || _g === void 0 ? void 0 : _g.id) === 'string')
             ? {
                 sameAs: {
                     id: params.sameAs.id,
                     typeOf: 'Task'
                 }
             }
-            : undefined));
-        let seatInfoSyncIn;
+            : undefined), { instrument }));
+        let seatInfoSyncCancelResult;
         let seatInfoSyncResult;
         let seatInfoSyncResultAsError;
-        try {
-            seatInfoSyncIn = yield createSeatInfoSyncInOnRefund({
-                project: { id: params.project.id },
-                paymentMethodId
-            })({ action: repos.action });
-            seatInfoSyncResult = yield movieTicketSeatService.seatInfoSync(seatInfoSyncIn);
-        }
-        catch (error) {
-            let throwsError = true;
-            // 「存在しない興行会社システム座席予約番号が入力されました」の場合、取消済なのでok
-            if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
-                if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.NotFound) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
-                }
-                // ReservationResult 19の内容が不明だがリトライする意味はおそらくないパターン
-                if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.ReservationResult19) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
-                }
-                // surfrock: bookingNoが存在しないケースをハンドル(2024-03-13~)
-                const expectedMessage4surfrockNotFound = JSON.stringify({ message: `bookingNo:"${paymentMethodId}" が見つかりません。` });
-                if (error.code === http_status_1.BAD_REQUEST && error.message === expectedMessage4surfrockNotFound) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
+        if (useSeatInfoSyncCancel) {
+            try {
+                if (seatInfoSyncCancelIn === undefined) {
+                    throw new factory.errors.ServiceUnavailable('seatInfoSyncCancelIn must be set');
                 }
-                // 着券取消可能期間超過を認識した上でのあえての返金の場合(注文からしばらく経って返品など)(2024-03-19~)
-                if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.CancellationPeriodPassed) {
-                    if (params.purpose.typeOf === factory.actionType.ReturnAction) {
-                        // seatInfoSyncResult = error;
-                        seatInfoSyncResultAsError = error;
+                seatInfoSyncCancelResult = yield movieTicketSeatService.seatInfoSyncCancel(seatInfoSyncCancelIn);
+            }
+            catch (error) {
+                let throwsError = true;
+                // 「存在しない興行会社システム座席予約番号が入力されました」の場合、取消済なのでok
+                if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.NotFound) {
+                        seatInfoSyncCancelResult = error;
                         throwsError = false;
                     }
+                    // ReservationResult 19の内容が不明だがリトライする意味はおそらくないパターン
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.ReservationResult19) {
+                        seatInfoSyncCancelResult = error;
+                        throwsError = false;
+                    }
+                    // surfrock: bookingNoが存在しないケースをハンドル(2024-03-13~)
+                    const expectedMessage4surfrockNotFound = JSON.stringify({ message: `bookingNo:"${paymentMethodId}" が見つかりません。` });
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === expectedMessage4surfrockNotFound) {
+                        seatInfoSyncCancelResult = error;
+                        throwsError = false;
+                    }
+                    // 着券取消可能期間超過を認識した上でのあえての返金の場合(注文からしばらく経って返品など)(2024-03-19~)
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.CancellationPeriodPassed) {
+                        if (params.purpose.typeOf === factory.actionType.ReturnAction) {
+                            seatInfoSyncResultAsError = error;
+                            throwsError = false;
+                        }
+                    }
+                }
+                if (throwsError) {
+                    let message = String(error.message);
+                    // エラー通知先で情報を読み取りやすくするために、messageに情報付加
+                    message += `決済ID:${paymentMethodId}`;
+                    try {
+                        const actionError = Object.assign(Object.assign({}, error), { message: message, name: error.name });
+                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                    }
+                    catch (__) {
+                        // 失敗したら仕方ない
+                    }
+                    error = (0, errorHandler_1.handleMvtkReserveError)(Object.assign(Object.assign({}, error), { message: message }));
+                    throw error;
                 }
             }
-            if (throwsError) {
-                let message = String(error.message);
-                // エラー通知先で情報を読み取りやすくするために、messageに情報付加
-                message += `決済ID:${paymentMethodId}`;
-                try {
-                    const actionError = Object.assign(Object.assign({}, error), { message: message, name: error.name });
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+        }
+        else {
+            try {
+                if (seatInfoSyncIn === undefined) {
+                    throw new factory.errors.ServiceUnavailable('seatInfoSyncIn must be set');
                 }
-                catch (__) {
-                    // 失敗したら仕方ない
+                seatInfoSyncResult = yield movieTicketSeatService.seatInfoSync(seatInfoSyncIn);
+            }
+            catch (error) {
+                let throwsError = true;
+                // 「存在しない興行会社システム座席予約番号が入力されました」の場合、取消済なのでok
+                if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.NotFound) {
+                        seatInfoSyncResult = error;
+                        throwsError = false;
+                    }
+                    // ReservationResult 19の内容が不明だがリトライする意味はおそらくないパターン
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.ReservationResult19) {
+                        seatInfoSyncResult = error;
+                        throwsError = false;
+                    }
+                    // surfrock: bookingNoが存在しないケースをハンドル(2024-03-13~)
+                    const expectedMessage4surfrockNotFound = JSON.stringify({ message: `bookingNo:"${paymentMethodId}" が見つかりません。` });
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === expectedMessage4surfrockNotFound) {
+                        seatInfoSyncResult = error;
+                        throwsError = false;
+                    }
+                    // 着券取消可能期間超過を認識した上でのあえての返金の場合(注文からしばらく経って返品など)(2024-03-19~)
+                    if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.CancellationPeriodPassed) {
+                        if (params.purpose.typeOf === factory.actionType.ReturnAction) {
+                            seatInfoSyncResultAsError = error;
+                            throwsError = false;
+                        }
+                    }
+                }
+                if (throwsError) {
+                    let message = String(error.message);
+                    // エラー通知先で情報を読み取りやすくするために、messageに情報付加
+                    message += `決済ID:${paymentMethodId}`;
+                    try {
+                        const actionError = Object.assign(Object.assign({}, error), { message: message, name: error.name });
+                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                    }
+                    catch (__) {
+                        // 失敗したら仕方ない
+                    }
+                    error = (0, errorHandler_1.handleMvtkReserveError)(Object.assign(Object.assign({}, error), { message: message }));
+                    throw error;
                 }
-                error = (0, errorHandler_1.handleMvtkReserveError)(Object.assign(Object.assign({}, error), { message: message }));
-                throw error;
             }
         }
         // アクションとしてはFailedだが後続処理を実行するケースに対応(2024-03-21~)
@@ -435,11 +502,10 @@ function refundMovieTicket(params) {
             action = (yield repos.action.giveUpWithObject({ typeOf: action.typeOf, id: action.id, error: seatInfoSyncResultAsError }));
         }
         else {
-            const actionResult = Object.assign(Object.assign({}, (seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined), (seatInfoSyncResult !== undefined) ? { seatInfoSyncResult } : undefined);
+            const actionResult = Object.assign(Object.assign({}, (seatInfoSyncResult !== undefined) ? { seatInfoSyncResult } : undefined), (seatInfoSyncCancelResult !== undefined) ? { seatInfoSyncCancelResult } : undefined);
             action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
         }
         yield (0, onRefund_1.onRefund)(action)(repos);
-        // return action;
     });
 }
 exports.refundMovieTicket = refundMovieTicket;
@@ -468,9 +534,43 @@ function createSeatInfoSyncInOnRefund(params) {
         }
         let seatInfoSyncIn;
         // 着券時のseatInfoSyncInに対してtrkshFlgだけ変更してリクエストする
-        // instrument参照に統一(2022-05-02~)
         seatInfoSyncIn = Object.assign(Object.assign({}, seatInfoSyncInOnPay), { trkshFlg: surfrock.service.seat.factory.DeleteFlag.True // 取消フラグ
          });
         return seatInfoSyncIn;
     });
 }
+function createSeatInfoSyncCancelInOnRefund(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // 本アクションに対応する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 seatInfoSyncInOnPay = (_a = payAction.instrument) === null || _a === void 0 ? void 0 : _a.seatInfoSyncIn;
+        if (seatInfoSyncInOnPay === undefined) {
+            throw new factory.errors.NotFound('PayAction.instrument?.seatInfoSyncIn');
+        }
+        let seatInfoSyncCancelIn;
+        seatInfoSyncCancelIn = {
+            kgygishCd: seatInfoSyncInOnPay.kgygishCd,
+            kgysystmzskyykNo: seatInfoSyncInOnPay.kgysystmzskyykNo,
+            kgysystmzskyykNoIkktsCnclFlg: '1',
+            jyuTyp: surfrock.service.seat.factory.seatInfoSyncCancel.IJyuTyp.IJyuTyp05,
+            jyuTypRmk: ''
+            // knyknrNoInfoIn: [],
+        };
+        return seatInfoSyncCancelIn;
+    });
+}

package/package.json

@@ -10,12 +10,12 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.369.0-alpha.1",
+    "@chevre/factory": "4.369.0-alpha.2",
     "@cinerino/sdk": "5.17.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
-    "@surfrock/sdk": "1.2.0",
+    "@surfrock/sdk": "1.3.0-alpha.0",
     "cdigit": "2.6.7",
     "debug": "^3.2.7",
     "google-libphonenumber": "^3.2.18",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.30.0-alpha.20"
+  "version": "21.30.0-alpha.21"
 }