@chevre/domain 21.27.0-alpha.8 → 21.27.0

package/lib/chevre/service/offer.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createInformTasks = exports.createAggregateScreeningEventIfNotExist = exports.syncEventSeries2screeningEvents = exports.onEventChanged = exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
+exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
 const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
@@ -20,8 +20,6 @@ const MoneyTransferOfferService = require("./offer/moneyTransfer");
 exports.moneyTransfer = MoneyTransferOfferService;
 const ProductOfferService = require("./offer/product");
 exports.product = ProductOfferService;
-const settings_1 = require("../settings");
-const informEvents = settings_1.settings.onEventChanged.informEvent;
 /**
  * 座席にオファー情報を付加する
  */
@@ -127,184 +125,3 @@ function searchEventSeatOffersWithPaging(params) {
     });
 }
 exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
-/**
- * イベント変更時処理
- */
-function onEventChanged(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.id.length > 0) {
-            // ScreeningEventであれば集計タスク
-            if (params.typeOf === factory.eventType.ScreeningEvent) {
-                yield createAggregateScreeningEventIfNotExist({
-                    project: { id: params.project.id },
-                    reservationFor: params.id.map((id) => {
-                        return { id };
-                    }),
-                    // 新規作成の場合は強制的に集計
-                    force: params.isNew,
-                    identifier: `onEventChanged`
-                })(repos);
-            }
-            // 通知タスク作成(2023-06-08~)
-            if (params.useInform === true) {
-                yield createInformTasks({
-                    project: { id: params.project.id },
-                    ids: params.id,
-                    typeOf: params.typeOf
-                })(repos);
-            }
-            if (params.useSync === true) {
-                switch (params.typeOf) {
-                    case factory.eventType.ScreeningEventSeries:
-                        // 施設コンテンツを興行イベントへ同期(2023-07-28~)
-                        yield syncEventSeries2screeningEvents({
-                            project: { id: params.project.id },
-                            ids: params.id
-                        })(repos);
-                        break;
-                    default:
-                    // no op
-                }
-            }
-        }
-    });
-}
-exports.onEventChanged = onEventChanged;
-function syncEventSeries2screeningEvents(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const now = new Date();
-        for (const eventSeriesId of params.ids) {
-            yield repos.event.syncScreeningEventSeries2screeningEvents({
-                project: { id: params.project.id },
-                superEvent: { id: eventSeriesId },
-                startDate: { $gte: now }
-            });
-        }
-    });
-}
-exports.syncEventSeries2screeningEvents = syncEventSeries2screeningEvents;
-function createAggregateScreeningEventIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let aggregateTasks = [];
-        const runsAt = new Date();
-        const remainingNumberOfTries = 2;
-        const project = {
-            id: params.project.id, typeOf: factory.organizationType.Project
-        };
-        const nowInMilliseconds = Date.now();
-        if (params.force) {
-            aggregateTasks = params.reservationFor.map((reservationFor) => {
-                const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
-                return {
-                    identifier: taskIdentifier,
-                    project,
-                    name: factory.taskName.AggregateScreeningEvent,
-                    status: factory.taskStatus.Ready,
-                    runsAt,
-                    remainingNumberOfTries,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
-                };
-            });
-        }
-        else {
-            for (const reservationFor of params.reservationFor) {
-                // 冗長な作成を避ける
-                const readyAggregateScreeningEventTaskDoc = yield repos.task.taskModel.findOne({
-                    'project.id': { $eq: project.id },
-                    name: { $eq: factory.taskName.AggregateScreeningEvent },
-                    status: { $eq: factory.taskStatus.Ready },
-                    'data.id': { $exists: true, $eq: reservationFor.id }
-                }, { _id: 1 })
-                    .exec();
-                if (readyAggregateScreeningEventTaskDoc === null) {
-                    const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
-                    aggregateTasks.push({
-                        identifier: taskIdentifier,
-                        project,
-                        name: factory.taskName.AggregateScreeningEvent,
-                        status: factory.taskStatus.Ready,
-                        runsAt,
-                        remainingNumberOfTries,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: { typeOf: factory.eventType.ScreeningEvent, id: reservationFor.id }
-                    });
-                }
-            }
-        }
-        if (aggregateTasks.length > 0) {
-            yield repos.task.saveMany(aggregateTasks, { emitImmediately: true });
-        }
-    });
-}
-exports.createAggregateScreeningEventIfNotExist = createAggregateScreeningEventIfNotExist;
-function createInformTasks(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let events4inform;
-        if (params.typeOf === factory.eventType.Event) {
-            events4inform = yield repos.event.search({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
-            }, [], [
-                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
-                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
-            ]);
-        }
-        else if (params.typeOf === factory.eventType.ScreeningEvent) {
-            events4inform = yield repos.event.search({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
-            }, [], [
-                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
-                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
-            ]);
-        }
-        else {
-            events4inform = yield repos.event.search({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
-            }, [], []);
-        }
-        if (events4inform.length > 0) {
-            const taskRunsAt = new Date();
-            const informTasks = [];
-            informEvents === null || informEvents === void 0 ? void 0 : informEvents.forEach((informEvent) => {
-                var _a;
-                const informUrl = String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.url);
-                events4inform.forEach((event4inform) => {
-                    var _a;
-                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    delete event4inform._id;
-                    const informActionAttributes = {
-                        agent: event4inform.project,
-                        object: event4inform,
-                        project: event4inform.project,
-                        recipient: {
-                            id: '',
-                            name: String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.name),
-                            typeOf: factory.creativeWorkType.WebApplication,
-                            url: informUrl
-                        },
-                        typeOf: factory.actionType.InformAction
-                    };
-                    informTasks.push({
-                        project: event4inform.project,
-                        name: factory.taskName.TriggerWebhook,
-                        status: factory.taskStatus.Ready,
-                        runsAt: taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: informActionAttributes
-                    });
-                });
-            });
-            if (informTasks.length > 0) {
-                yield repos.task.saveMany(informTasks, { emitImmediately: true });
-            }
-        }
-    });
-}
-exports.createInformTasks = createInformTasks;

package/lib/chevre/service/payment/any/onPaymentStatusChanged.js

@@ -72,17 +72,10 @@ function optimizeAction4report(action) {
                     typeOf: o.typeOf
                 };
             });
-            const optimizedRefundAction = {
-                actionStatus: action.actionStatus,
-                endDate: action.endDate,
-                id: action.id,
-                object: optimizedRefundActionObject,
+            const optimizedRefundAction = Object.assign({ actionStatus: action.actionStatus, endDate: action.endDate, id: action.id, object: optimizedRefundActionObject, 
                 // 最適化(2023-06-30~)
                 // project: action.project,
-                purpose: action.purpose,
-                startDate: action.startDate,
-                typeOf: action.typeOf
-            };
+                purpose: action.purpose, startDate: action.startDate, typeOf: action.typeOf }, (action.error !== undefined) ? { error: action.error } : undefined);
             optimizedAction = optimizedRefundAction;
             break;
         default:

package/lib/chevre/service/payment/any/onRefund.d.ts

@@ -12,7 +12,5 @@ declare function onRefund(refundAction: factory.action.trade.refund.IAction): (r
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     task: TaskRepo;
-}) => Promise<{
-    id: string;
-}[]>;
+}) => Promise<void>;
 export { onRefund };

package/lib/chevre/service/payment/any/onRefund.js

@@ -20,6 +20,7 @@ const onPaymentStatusChanged_1 = require("./onPaymentStatusChanged");
  * 返金後のアクション
  */
 function onRefund(refundAction) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const aciton4inform = (0, factory_1.optimizeAction4inform)(refundAction);
@@ -31,75 +32,78 @@ function onRefund(refundAction) {
             // 同期的に経理レポート連携する(2022-08-27~)
             yield (0, onPaymentStatusChanged_1.onPaymentStatusChanged)(aciton4inform)(repos);
         }
-        const informPayment = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.informPayment;
-        // 手数料決済があれば処理
-        // CreditCardIFのみ(2023-06-29~)
-        const paymentServiceType = (_a = refundAction.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
-        if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
-            const refundFee = (_b = refundAction.object[0]) === null || _b === void 0 ? void 0 : _b.refundFee;
-            if (typeof refundFee === 'number' && refundFee > 0) {
-                // purpose.typeOf:PlaceOrderは外部決済URL無効化における返金アクションのみなので、手数料決済から除外してよい(2024-03-19~)
-                if (refundAction.purpose.typeOf !== factory.transactionType.PlaceOrder) {
-                    const payObject = refundAction.object.map((o) => {
-                        return {
-                            typeOf: o.typeOf,
-                            id: o.id,
-                            paymentMethod: {
-                                accountId: o.paymentMethod.accountId,
-                                additionalProperty: o.paymentMethod.additionalProperty,
-                                name: o.paymentMethod.name,
-                                paymentMethodId: o.paymentMethod.paymentMethodId,
-                                totalPaymentDue: {
-                                    typeOf: 'MonetaryAmount',
-                                    currency: factory.priceCurrency.JPY,
-                                    value: refundFee
-                                },
-                                typeOf: o.paymentMethod.typeOf
+        // FailedActionStatusに対応(経理レポート連携はするが、通知はしない)(2024-03-21~)
+        if (refundAction.actionStatus === factory.actionStatusType.CompletedActionStatus) {
+            const informPayment = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.informPayment;
+            // 手数料決済があれば処理
+            // CreditCardIFのみ(2023-06-29~)
+            const paymentServiceType = (_a = refundAction.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+            if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                const refundFee = (_b = refundAction.object[0]) === null || _b === void 0 ? void 0 : _b.refundFee;
+                if (typeof refundFee === 'number' && refundFee > 0) {
+                    // purpose.typeOf:PlaceOrderは外部決済URL無効化における返金アクションのみなので、手数料決済から除外してよい(2024-03-19~)
+                    if (refundAction.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+                        const payObject = refundAction.object.map((o) => {
+                            return {
+                                typeOf: o.typeOf,
+                                id: o.id,
+                                paymentMethod: {
+                                    accountId: o.paymentMethod.accountId,
+                                    additionalProperty: o.paymentMethod.additionalProperty,
+                                    name: o.paymentMethod.name,
+                                    paymentMethodId: o.paymentMethod.paymentMethodId,
+                                    totalPaymentDue: {
+                                        typeOf: 'MonetaryAmount',
+                                        currency: factory.priceCurrency.JPY,
+                                        value: refundFee
+                                    },
+                                    typeOf: o.paymentMethod.typeOf
+                                }
+                            };
+                        });
+                        const payAction = {
+                            project: refundAction.project,
+                            typeOf: factory.actionType.PayAction,
+                            object: payObject,
+                            agent: refundAction.project,
+                            recipient: refundAction.agent,
+                            purpose: refundAction.purpose,
+                            potentialActions: {
+                                add2report: true,
+                                informPayment: (Array.isArray(informPayment)) ? informPayment : []
                             }
                         };
-                    });
-                    const payAction = {
-                        project: refundAction.project,
-                        typeOf: factory.actionType.PayAction,
-                        object: payObject,
-                        agent: refundAction.project,
-                        recipient: refundAction.agent,
-                        purpose: refundAction.purpose,
-                        potentialActions: {
-                            add2report: true,
-                            informPayment: (Array.isArray(informPayment)) ? informPayment : []
-                        }
-                    };
-                    const payTask = {
-                        project: refundAction.project,
-                        name: factory.taskName.Pay,
+                        const payTask = {
+                            project: refundAction.project,
+                            name: factory.taskName.Pay,
+                            status: factory.taskStatus.Ready,
+                            runsAt: now,
+                            remainingNumberOfTries: 10,
+                            numberOfTried: 0,
+                            executionResults: [],
+                            data: payAction
+                        };
+                        taskAttributes.push(payTask);
+                    }
+                }
+            }
+            if (Array.isArray(informPayment)) {
+                taskAttributes.push(...informPayment.map((a) => {
+                    return {
+                        project: a.project,
+                        name: factory.taskName.TriggerWebhook,
                         status: factory.taskStatus.Ready,
                         runsAt: now,
-                        remainingNumberOfTries: 10,
+                        remainingNumberOfTries: 30,
                         numberOfTried: 0,
                         executionResults: [],
-                        data: payAction
+                        data: Object.assign(Object.assign({}, a), { object: aciton4inform })
                     };
-                    taskAttributes.push(payTask);
-                }
+                }));
             }
+            // タスク保管
+            yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
         }
-        if (Array.isArray(informPayment)) {
-            taskAttributes.push(...informPayment.map((a) => {
-                return {
-                    project: a.project,
-                    name: factory.taskName.TriggerWebhook,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 30,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: Object.assign(Object.assign({}, a), { object: aciton4inform })
-                };
-            }));
-        }
-        // タスク保管
-        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onRefund = onRefund;

package/lib/chevre/service/payment/any.d.ts

@@ -66,6 +66,7 @@ interface IAuthorizeRepos {
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 interface IPublishPaymentUrlRepos {
+    action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
@@ -84,11 +85,12 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: factory.action.authorize.paymentMethod.any.IObject;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
 /**
  * 決済承認
  */
@@ -99,7 +101,7 @@ declare function authorize(params: {
     agent: {
         id: string;
     };
-    object: factory.action.authorize.paymentMethod.any.IObject;
+    object: IObjectWithoutDetail;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location?: factory.action.trade.pay.ILocation;

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

@@ -222,44 +222,55 @@ exports.processVoidPayTransaction = processVoidPayTransaction;
  */
 function publishPaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
-        const paymentServiceType = params.paymentServiceType;
-        // 取引番号生成
-        const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
-            startDate: new Date()
-        });
-        let result;
-        // URL発行
-        const startParams = (0, factory_1.creatPayTransactionStartParams)({
-            object: params.object,
-            paymentServiceType,
-            transaction: transaction,
-            transactionNumber: transactionNumber,
-            location: params.location
-        });
-        // result = await repos.payTransaction.publishPaymentUrl({ ...startParams, iss: params.iss });
-        result = yield PayTransactionService.publishPaymentUrl(startParams)(repos);
-        // 取引に保管
-        const paymentMethodByPaymentUrl = {
-            typeOf: params.object.paymentMethod,
-            paymentMethodId: result.paymentMethodId,
-            paymentUrl: result.paymentUrl,
-            issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' },
-            // GMO IFを保管(2024-01-01~)
-            entryTranArgs: result.entryTranArgs,
-            entryTranResult: result.entryTranResult,
-            execTranArgs: result.execTranArgs,
-            execTranResult: result.execTranResult,
-            paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~)
-        };
-        yield repos.transaction.findByIdAndUpdateInProgress({
-            id: transaction.id,
-            update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
-        });
-        return {
-            paymentMethodId: result.paymentMethodId,
-            paymentUrl: result.paymentUrl
-        };
+        try {
+            const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
+            const paymentServiceType = params.paymentServiceType;
+            // 取引番号生成
+            const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
+                startDate: new Date()
+            });
+            let result;
+            // URL発行
+            const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
+            const startParams = (0, factory_1.creatPayTransactionStartParams)({
+                object: authorizeObject,
+                paymentServiceType,
+                transaction: transaction,
+                transactionNumber: transactionNumber,
+                location: params.location
+            });
+            result = yield PayTransactionService.publishPaymentUrl(startParams, { id: transaction.id })(repos);
+            // 取引に保管
+            const paymentMethodByPaymentUrl = {
+                typeOf: params.object.paymentMethod,
+                paymentMethodId: result.paymentMethodId,
+                paymentUrl: result.paymentUrl,
+                issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' },
+                // GMO IFを保管(2024-01-01~)
+                entryTranArgs: result.entryTranArgs,
+                entryTranResult: result.entryTranResult,
+                execTranArgs: result.execTranArgs,
+                execTranResult: result.execTranResult,
+                paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~)
+            };
+            yield repos.transaction.findByIdAndUpdateInProgress({
+                id: transaction.id,
+                update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
+            });
+            return {
+                paymentMethodId: result.paymentMethodId,
+                paymentUrl: result.paymentUrl
+            };
+        }
+        catch (error) {
+            // 複数対応(2024-03-27~)
+            if (Array.isArray(error)) {
+                throw error[0];
+            }
+            else {
+                throw error;
+            }
+        }
     });
 }
 exports.publishPaymentUrl = publishPaymentUrl;
@@ -318,7 +329,11 @@ function authorize(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        const authorizeObject = Object.assign(Object.assign(Object.assign({}, params.object), { paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined);
+        const { accountId } = yield fixAccountIdIfPossible({
+            object: params.object,
+            project: { id: transaction.project.id }
+        })({ action: repos.action });
+        const authorizeObject = Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined);
         // 承認アクションを開始する
         const actionAttributes = {
             project: transaction.project,
@@ -346,10 +361,6 @@ function authorize(params) {
         const action = yield repos.action.start(actionAttributes);
         let payTransaction;
         try {
-            const { accountId } = yield validateFromLocation({
-                object: authorizeObject,
-                project: { id: transaction.project.id }
-            })({ action: repos.action });
             const startParams = (0, factory_1.creatPayTransactionStartParams)({
                 accountId,
                 object: authorizeObject,
@@ -384,15 +395,23 @@ function authorize(params) {
                     })(repos);
                 }
             }
-            throw error;
+            // 複数対応(2024-03-27~)
+            if (Array.isArray(error)) {
+                throw error[0];
+            }
+            else {
+                throw error;
+            }
         }
-        // アクションを完了
         const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObject });
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
     });
 }
 exports.authorize = authorize;
+/**
+ * 注文取引に保管された決済情報を承認しようとしている決済の整合性をを検証する
+ */
 function validatePaymentMethodByTransaction(params) {
     var _a, _b;
     const paymentServiceIdByObject = params.object.issuedThrough.id;
@@ -414,11 +433,16 @@ function validatePaymentMethodByTransaction(params) {
         throw new factory.errors.Argument('object.paymentMethod', 'paymentMethod must match the target of the paymentUrl');
     }
 }
-function validateFromLocation(params) {
+/**
+ * 承認しようとしているobjectからaccountIdを決定する
+ */
+function fixAccountIdIfPossible(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        let accountId = (_a = params.object) === null || _a === void 0 ? void 0 : _a.accountId;
-        const fromLocation = (_b = params.object) === null || _b === void 0 ? void 0 : _b.fromLocation;
+        // let accountId = params.object?.accountId;
+        let accountId = '';
+        const fromLocation = (_a = params.object) === null || _a === void 0 ? void 0 : _a.fromLocation;
+        const movieTickets = (_b = params.object) === null || _b === void 0 ? void 0 : _b.movieTickets;
         // トークン化されたペイメントカード情報でリクエストされた場合、実ペイメントカード情報へ変換する
         if (typeof fromLocation === 'string') {
             const paymentCardOwnershipInfo = yield (0, code_1.verifyToken)({
@@ -434,6 +458,10 @@ function validateFromLocation(params) {
             }
             accountId = paymentCardOwnershipInfo.typeOfGood.identifier;
         }
+        // 購入番号管理番号をaccountIdにセット(2024-03-24~)
+        if (Array.isArray(movieTickets) && movieTickets.length > 0) {
+            accountId = movieTickets[0].identifier; // 決済カードidentifierは1つのみ許可の前提
+        }
         return { accountId };
     });
 }

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

@@ -47,9 +47,7 @@ function authorize(params, paymentServiceId, options) {
         if (typeof orderId !== 'string') {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
-        // GMOオーソリ取得
         let authorizeResult;
-        // let searchTradeResult: GMO.factory.credit.ISearchTradeResult | undefined;
         try {
             const pendingPaymentAgencyTransaction = options.pendingPaymentAgencyTransaction;
             const redirectUrl = (_c = pendingPaymentAgencyTransaction === null || pendingPaymentAgencyTransaction === void 0 ? void 0 : pendingPaymentAgencyTransaction.execTranResult) === null || _c === void 0 ? void 0 : _c.redirectUrl;
@@ -62,7 +60,6 @@ function authorize(params, paymentServiceId, options) {
             }
             else {
                 authorizeResult = yield processAuthorizeCreditCard({
-                    // projectSettings: project.settings,
                     shopId: shopId,
                     shopPass: shopPass,
                     returnUrls3ds,
@@ -75,15 +72,15 @@ function authorize(params, paymentServiceId, options) {
             }
         }
         catch (error) {
-            throw handleAuthorizeError(error);
+            // アクション保管用のエラーと両方throw(2024-03-27~)
+            throw [handleAuthorizeError(error), error];
+            // throw handleAuthorizeError(error);
         }
         // クレジットカード詳細情報取得廃止(2024-03-19~)
         // const searchTrade4accountId = options?.searchTrade4accountId === true;
         // if (searchTrade4accountId) {
         // }
-        return Object.assign({ 
-            // accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '',
-            accountId: '', paymentMethodId: orderId, entryTranArgs: authorizeResult.entryTranArgs, entryTranResult: authorizeResult.entryTranResult, execTranArgs: authorizeResult.execTranArgs, execTranResult: authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined) ? { secureTran2Result: authorizeResult.secureTran2Result } : undefined);
+        return Object.assign({ accountId: '', paymentMethodId: orderId, entryTranArgs: authorizeResult.entryTranArgs, entryTranResult: authorizeResult.entryTranResult, execTranArgs: authorizeResult.execTranArgs, execTranResult: authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined) ? { secureTran2Result: authorizeResult.secureTran2Result } : undefined);
     });
 }
 exports.authorize = authorize;
@@ -202,6 +199,16 @@ function handleAuthorizeError(error) {
         // const uri: string | undefined = error.requestOptions?.uri;
         handledError = new factory.errors.GatewayTimeout(`Gateway Timeout. name:${error.name} type:${error.type} message:${error.message}`);
     }
+    else if (error.name === 'AbortError') {
+        // タイムアウト設定によって中止されたリクエストの場合
+        // AbortErrorハンドリング(2024-03-27~)
+        // {
+        //     "type": "aborted",
+        //     "message": "The user aborted a request.",
+        //     "name": "AbortError"
+        // }
+        handledError = new factory.errors.GatewayTimeout(`Gateway Timeout. name:${error.name} type:${error.type} message:${error.message}`);
+    }
     // 決済代行側が4xxを返却した場合
     if (typeof error.code === 'number' && error.code < http_status_1.INTERNAL_SERVER_ERROR) {
         handledError = new factory.errors.Argument('payment', `bad request code:${error.code} message:${error.message}`);