@chevre/domain 24.0.0-alpha.80 → 24.0.0-alpha.81

package/lib/chevre/service/assetTransaction/pay/start/preStart/validateAcceptedPaymentMethodIfNeeded.js

@@ -127,29 +127,21 @@ const TIMEOUT = 2000;
 //     isAllowed: boolean;
 // };
 async function validateByCustomUrl(params) {
-    try {
-        // 判定エンジンへのリクエスト
-        const validationRequest = {
-            eventSeriesIds: params.eventSeriesIds,
-            paymentMethodType: params.paymentMethodType,
-            // amount: params.amount
-        };
-        const res = await fetch(params.customValidationUrl, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(validationRequest),
-            // body data type must match "Content-Type" header
-            signal: AbortSignal.timeout(TIMEOUT)
-        });
-        if (!res.ok) {
-            throw new factory_1.factory.errors.Argument('paymentMethod', `paymentMethod denied by the customValidation. statusCode: ${res.status}`);
-        }
-    }
-    catch (error) {
-        // ネットワークエラーやタイムアウト時のハンドリング
-        // サービス継続を優先するか、安全側に倒してエラーにするかはポリシー次第
-        debug('Custom validation failed:', error.message);
-        throw error;
+    // 判定エンジンへのリクエスト
+    const validationRequest = {
+        eventSeriesIds: params.eventSeriesIds,
+        paymentMethodType: params.paymentMethodType,
+        // amount: params.amount
+    };
+    const res = await fetch(params.customValidationUrl, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(validationRequest),
+        // body data type must match "Content-Type" header
+        signal: AbortSignal.timeout(TIMEOUT)
+    });
+    if (!res.ok) {
+        throw new factory_1.factory.errors.Argument('paymentMethod', `paymentMethod denied by the customValidation. statusCode: ${res.status}`);
     }
 }
 // /**

package/lib/chevre/service/event.js

@@ -15,6 +15,7 @@ const saveScreeningEvents_1 = require("./event/saveScreeningEvents");
 Object.defineProperty(exports, "saveScreeningEvents", { enumerable: true, get: function () { return saveScreeningEvents_1.saveScreeningEvents; } });
 const saveScreeningEventSeries_1 = require("./event/saveScreeningEventSeries");
 Object.defineProperty(exports, "saveScreeningEventSeries", { enumerable: true, get: function () { return saveScreeningEventSeries_1.saveScreeningEventSeries; } });
+const errorHandler_1 = require("../errorHandler");
 // const customsearch = google.customsearch('v1');
 const debug = (0, debug_1.default)('chevre-domain:service:event');
 /**
@@ -118,18 +119,11 @@ function importFromCOA(params) {
             }
             catch (error) {
                 let throwsError = true;
-                if (error.name === 'AbortError'
-                    || error.name === 'TimeoutError' // native AbortSignalの場合
-                ) {
-                    console.error('saveScreeningEvents throwed an error', error.name, error.message);
+                const handledCOAError = (0, errorHandler_1.handleCOAError)(error);
+                if (handledCOAError instanceof factory_1.factory.errors.GatewayTimeout) {
+                    console.error('saveScreeningEvents threw an error', handledCOAError.name, handledCOAError.message);
                     throwsError = false;
                 }
-                if (error.name === 'COAServiceError') {
-                    if (error.message === 'ESOCKETTIMEDOUT') {
-                        console.error('saveScreeningEvents throwed an error', error.name, error.message);
-                        throwsError = false;
-                    }
-                }
                 if (throwsError) {
                     throw error;
                 }

package/lib/chevre/service/offer/event/importFromCOA/factory.js

@@ -5,17 +5,6 @@ const coa_service_1 = require("@motionpicture/coa-service");
 const util_1 = require("util");
 const factory_1 = require("../../../../factory");
 function coaTicket2offer(params) {
-    // discontinue eligibleMonetaryAmount(2025-01-03~)
-    // 適用通貨区分
-    // const eligibleMonetaryAmount: [factory.offer.IEligibleMonetaryAmount] | undefined
-    //     = (typeof params.ticketResult.usePoint === 'number' && params.ticketResult.usePoint > 0
-    //         && typeof params.defaultCurrencyType?.typeOf === 'string')
-    //         ? [{
-    //             typeOf: 'MonetaryAmount',
-    //             currency: params.defaultCurrencyType.codeValue,
-    //             value: Number(params.ticketResult.usePoint)
-    //         }]
-    //         : undefined;
     // 決済カード条件へ変更(2025-01-03~)
     // 適用メンバーシップ区分
     // const eligibleMembershipType: [factory.offer.IEligibleCategoryCode] | undefined
@@ -85,7 +74,6 @@ function coaTicket2offer(params) {
         },
         priceSpecification: unitPriceSpec,
         // ...(Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined, // 決済カード条件へ変更(2025-01-03~)
-        // ...(Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined, // discontinue(2025-01-03~)
         additionalProperty: [
             { name: 'theaterCode', value: params.theaterCode },
             { name: 'ticketCode', value: String(params.ticketResult.ticketCode) },

package/lib/chevre/service/offer/event/importFromCOA.js

@@ -5,6 +5,7 @@ exports.importCategoryCodesFromCOA = importCategoryCodesFromCOA;
 // import type { TaskRepo } from '../../../repo/task';
 const factory_1 = require("../../../factory");
 const factory_2 = require("./importFromCOA/factory");
+const errorHandler_1 = require("../../../errorHandler");
 function importFromCOA(params) {
     return async (repos) => {
         // 通貨区分検索
@@ -45,16 +46,10 @@ function importFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            if (error.name === 'AbortError'
-                || error.name === 'TimeoutError' // native AbortSignalの場合
-            ) {
+            const handledCOAError = (0, errorHandler_1.handleCOAError)(error);
+            if (handledCOAError instanceof factory_1.factory.errors.GatewayTimeout) {
                 throwsError = false;
             }
-            if (error.name === 'COAServiceError') {
-                if (error.message === 'ESOCKETTIMEDOUT') {
-                    throwsError = false;
-                }
-            }
             if (throwsError) {
                 throw error;
             }
@@ -114,16 +109,10 @@ function importCategoryCodesFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            if (error.name === 'AbortError'
-                || error.name === 'TimeoutError' // native AbortSignalの場合
-            ) {
+            const handledCOAError = (0, errorHandler_1.handleCOAError)(error);
+            if (handledCOAError instanceof factory_1.factory.errors.GatewayTimeout) {
                 throwsError = false;
             }
-            if (error.name === 'COAServiceError') {
-                if (error.message === 'ESOCKETTIMEDOUT') {
-                    throwsError = false;
-                }
-            }
             if (throwsError) {
                 throw error;
             }

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/authorize.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAcceptedOffersWithoutDetails = createAcceptedOffersWithoutDetails;
 exports.validateOffers = validateOffers;
 const coa_service_1 = require("@motionpicture/coa-service");
-const http_status_1 = require("http-status");
 const errorHandler_1 = require("../../../../errorHandler");
 const factory_1 = require("../../../../factory");
+const errorHandler_2 = require("../../../../errorHandler");
 function createAcceptedOffersWithoutDetails(params) {
     return async (repos) => {
         const { listSeat } = await repos.reserveService.stateReserveSeat(params.coaInfo);
@@ -98,13 +98,8 @@ function offer2availableSalesTicket(params) {
             }
             catch (error) {
                 // COAサービスエラーの場合ハンドリング
-                if (error.name === 'COAServiceError') {
-                    // COAはクライアントエラーかサーバーエラーかに関わらずステータスコード200 or 500を返却する。
-                    // 500未満であればクライアントエラーとみなす
-                    if (typeof error.code === 'number'
-                        && error.code < http_status_1.status.INTERNAL_SERVER_ERROR) {
-                        throw new factory_1.factory.errors.NotFound(`offers.${offerIndex}`, `ticketCode ${offer.ticketInfo.ticketCode} not found. ${error.message}`);
-                    }
+                if ((0, errorHandler_2.isCOAClientError)(error)) {
+                    throw new factory_1.factory.errors.NotFound(`offers.${offerIndex}`, `ticketCode ${offer.ticketInfo.ticketCode} not found. ${error.message}`);
                 }
                 throw error;
             }
@@ -130,13 +125,8 @@ function offer2availableSalesTicket(params) {
                 }
                 catch (error) {
                     // COAサービスエラーの場合ハンドリング
-                    if (error.name === 'COAServiceError') {
-                        // COAはクライアントエラーかサーバーエラーかに関わらずステータスコード200 or 500を返却する。
-                        // 500未満であればクライアントエラーとみなす
-                        if (typeof error.code === 'number'
-                            && error.code < http_status_1.status.INTERNAL_SERVER_ERROR) {
-                            throw new factory_1.factory.errors.NotFound(`offers.${offerIndex}`, `couponTicket ${offer.ticketInfo.ticketCode} not found. ${error.message}`);
-                        }
+                    if ((0, errorHandler_2.isCOAClientError)(error)) {
+                        throw new factory_1.factory.errors.NotFound(`offers.${offerIndex}`, `couponTicket ${offer.ticketInfo.ticketCode} not found. ${error.message}`);
                     }
                     throw error;
                 }

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -20,7 +20,6 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
  */
 export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
     price: number;
-    eligibleMonetaryAmount: never[];
 };
 type IResultAcceptedOffer = Omit<factory.order.IAcceptedOffer, 'itemOffered'> & {
     itemOffered: factory.order.ICOAEventReservation;

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js

@@ -59,18 +59,7 @@ function createAuthorizeSeatReservationActionAttributes(params) {
  */
 function offers2resultPrice(offers) {
     const price = offers.reduce((a, b) => a + b.price, 0);
-    // discontinue eligibleMonetaryAmount(2025-01-03~)
-    // const eligibleMonetaryAmount = offers.reduce<factory.offer.IEligibleMonetaryAmount[]>(
-    //     (a, b) => {
-    //         if (Array.isArray(b.eligibleMonetaryAmount)) {
-    //             return [...a, ...b.eligibleMonetaryAmount];
-    //         } else {
-    //             return a;
-    //         }
-    //     },
-    //     []
-    // );
-    return { price, eligibleMonetaryAmount: [] };
+    return { price };
 }
 /**
  * COA仮予約結果から注文アイテムを生成する

package/lib/chevre/service/offer/eventServiceByCOA/authorize/validateAcceptedOffers.js

@@ -55,7 +55,6 @@ function createPriceComponent(params) {
     });
     let surfrockChargePriceSpec;
     let appliesToMovieTicket4surfrock;
-    // let eligibleMonetaryAmount: [factory.offer.IEligibleMonetaryAmount] | undefined;
     // appliesToSurfrockの指定があれば強制的にMovieTicket決済
     const appliesToSurfrockByUnitPriceOffer = availableUnitPriceOffer.priceSpecification.appliesToMovieTicket?.at(0);
     const surfrockIdentifier = acceptedOffer.priceSpecification?.appliesToSurfrock?.identifier;
@@ -89,11 +88,6 @@ function createPriceComponent(params) {
         };
     }
     else {
-        // discontinue eligibleMonetaryAmount(2025-01-03~)
-        // appliesToSurfrockの指定がなければ単価オファーの適用通貨条件を強制適用
-        // if (Array.isArray(availableUnitPriceOffer.eligibleMonetaryAmount)) {
-        //     eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
-        // }
         if (typeof appliesToSurfrockByUnitPriceOffer?.serviceType === 'string') {
             throw new factory_1.factory.errors.ArgumentNull('priceSpecification.appliesToSurfrock');
         }
@@ -377,15 +371,6 @@ function validateAcceptedOffers(params) {
                 id: availableUnitPriceOffer.id,
                 identifier: availableUnitPriceOffer.identifier,
                 typeOf: availableUnitPriceOffer.typeOf,
-                // discontinue eligibleMonetaryAmount(2025-01-03~)
-                // ...(Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined,
-                // ↓互換性維持対応として
-                ...{
-                // discontinue(2025-01-03~)
-                // seatNumber: itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber,
-                // discontinue(2025-01-03~)
-                // seatSection: itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatSection
-                }
             };
         });
         return { acceptedOffers };

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -97,7 +97,7 @@ function authorize(params) {
         const action = await repos.action.start(actionAttributes);
         try {
             // 座席仮予約からオファー情報を生成する
-            const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
+            const { price } = (0, factory_1.offers2resultPrice)(acceptedOffers);
             const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
                 project: { id: transaction.project.id },
                 responseBody: params.result.responseBody,
@@ -112,10 +112,7 @@ function authorize(params) {
                 typeOf: factory_2.factory.offerType.AggregateOffer, // add(2024-06-18~)
                 price: price,
                 priceCurrency: factory_2.factory.priceCurrency.JPY,
-                amount: eligibleMonetaryAmount
-                // requestBody: params.result.requestBody, // discontinue(2024-06-11~)
-                // responseBody: params.result.responseBody, // discontinue(2024-06-11~)
-                // acceptedOffers: [] // discontinue(2024-06-17~)
+                amount: []
             };
             // add orderInTransaction(2024-01-15~)
             // if (params.options.useCreateOrderOnOfferAccepted) {

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -120,7 +120,7 @@ function changeOffers(params) {
         if (updTmpReserveSeatResult === undefined) {
             throw new factory_2.factory.errors.NotFound('afterMedia by recipe');
         }
-        const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
+        const { price } = (0, factory_1.offers2resultPrice)(acceptedOffers);
         const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             project: { id: authorizeAction.project.id },
             responseBody: updTmpReserveSeatResult,
@@ -134,8 +134,7 @@ function changeOffers(params) {
         const actionResult = {
             ...authorizeAction.result,
             price: price,
-            amount: eligibleMonetaryAmount
-            // acceptedOffers: [] // discontinue(2024-06-17~)
+            amount: []
         };
         // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
         await repos.action.reStart({ id: authorizeAction.id, typeOf: authorizeAction.typeOf });

package/lib/chevre/service/offer/factory.js

@@ -122,11 +122,15 @@ function createCompoundPriceSpec4event(params) {
         priceComponent
     };
     // 必要な属性のみに限定(2023-02-24~)
-    const { acceptedPaymentMethod, name, description, alternateName, color, typeOf, id, availability, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex, parentOffer } = params.offer;
+    const { acceptedPaymentMethod, name, description, alternateName, color, typeOf, id, availability, category, eligibleMembershipType, eligibleSeatingType, 
+    // eligibleMonetaryAmount, // discontinue(2026-04-19~)
+    eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex, parentOffer } = params.offer;
     return {
         name, description, alternateName, color, typeOf, id,
         category,
-        eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
+        eligibleMembershipType, eligibleSeatingType,
+        // eligibleMonetaryAmount, // discontinue(2026-04-19~)
+        eligibleSubReservation,
         priceCurrency,
         validFrom, validThrough, validRateLimit, additionalProperty,
         identifier, itemOffered,

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processSeatInfoSync = processSeatInfoSync;
+const sdk_1 = require("@surfrock/sdk");
 const http_status_1 = require("http-status");
-const errorHandler_1 = require("../../../../errorHandler");
 const factory_1 = require("../factory");
 function processSeatInfoSync(params) {
     return async (repos) => {
@@ -14,7 +14,7 @@ function processSeatInfoSync(params) {
         catch (error) {
             let throwsError = true;
             // 「既に存在する興行システム座席予約番号が入力されました」の場合、着券済なのでok
-            if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
+            if (error instanceof sdk_1.Surfrock.RequestError) {
                 if (error.code === http_status_1.status.BAD_REQUEST && error.message === factory_1.MovieticketReserveRequestErrorMessage.AlreadyPaid) {
                     seatInfoSyncResult = error;
                     throwsError = false;

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processSeatInfoSync = processSeatInfoSync;
+const sdk_1 = require("@surfrock/sdk");
 const http_status_1 = require("http-status");
-const errorHandler_1 = require("../../../../errorHandler");
 const factory_1 = require("../../../../factory");
 const factory_2 = require("../factory");
 function processSeatInfoSync(params) {
@@ -16,7 +16,7 @@ function processSeatInfoSync(params) {
         catch (error) {
             let throwsError = true;
             // 「存在しない興行会社システム座席予約番号が入力されました」の場合、取消済なのでok
-            if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
+            if (error instanceof sdk_1.Surfrock.RequestError) {
                 if (error.code === http_status_1.status.BAD_REQUEST && error.message === factory_2.MovieticketReserveRequestErrorMessage.NotFound) {
                     seatInfoSyncResult = error;
                     throwsError = false;

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processSeatInfoSyncCancel = processSeatInfoSyncCancel;
 const sdk_1 = require("@surfrock/sdk");
 const http_status_1 = require("http-status");
-const errorHandler_1 = require("../../../../errorHandler");
 function processSeatInfoSyncCancel(params) {
     return async (repos) => {
         let seatInfoSyncCancelResult;
@@ -13,7 +12,7 @@ function processSeatInfoSyncCancel(params) {
         }
         catch (error) {
             let throwsError = true;
-            if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
+            if (error instanceof sdk_1.Surfrock.RequestError) {
                 const surfrockRequestError = error;
                 if (surfrockRequestError.code === http_status_1.status.BAD_REQUEST) {
                     const firstSoapServeError = surfrockRequestError.errors?.at(0);

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

@@ -123,16 +123,23 @@ function refundMovieTicket(params, options) {
             }
         }
         catch (error) {
-            let message = String(error.message);
+            let message = (error instanceof Error) ? error.message : String(error);
             message += `決済ID:${paymentMethodId}`; // エラー通知先で情報を読み取りやすくするために、messageに情報付加
             try {
-                const actionError = { ...error, message: message, name: error.name };
+                const actionError = {
+                    ...(error instanceof Error) ? error : {},
+                    message: message,
+                    name: (error instanceof Error) ? error.name : 'UnknownError'
+                };
                 await repos.actions.refund.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
-            const handledError = (0, errorHandler_1.handleMvtkReserveError)({ ...error, message: message });
+            const handledError = (0, errorHandler_1.handleMvtkReserveError)({
+                ...(error instanceof Error) ? error : {},
+                message: message
+            });
             throw handledError;
         }
         // アクションとしてはFailedだが後続処理を実行するケースに対応(2024-03-21~)

package/lib/chevre/service/reserveCOA/cancelReservation.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancelPendingReservation = cancelPendingReservation;
-const http_status_1 = require("http-status");
 const factory_1 = require("../../factory");
 const factory_2 = require("./factory");
+const errorHandler_1 = require("../../errorHandler");
 function createCancelPendingReservationAction(params) {
     const { object, instrument, project } = params;
     return {
@@ -31,21 +31,17 @@ function cancelPendingReservation(params) {
             catch (error) {
                 let deleted = false;
                 // COAサービスエラーの場合ハンドリング
-                /* istanbul ignore if */
-                if (error.name === 'COAServiceError') {
-                    if (typeof error.code === 'number'
-                        && error.code < http_status_1.status.INTERNAL_SERVER_ERROR) {
-                        // すでに取消済の場合こうなるので、okとする
-                        if (error.message === '座席取消失敗') {
-                            recipe = (0, factory_2.processCancelPendingCOAReserveResult2recipe)({
-                                processCancelPendingCOAReserveResult: {
-                                    delTmpReserveArgs,
-                                    delTmpReserveResult: { ...error, message: error.message }
-                                },
-                                project: { id: params.project.id }
-                            });
-                            deleted = true;
-                        }
+                if ((0, errorHandler_1.isCOAClientError)(error)) {
+                    // すでに取消済の場合こうなるので、okとする
+                    if (error.message === '座席取消失敗') {
+                        recipe = (0, factory_2.processCancelPendingCOAReserveResult2recipe)({
+                            processCancelPendingCOAReserveResult: {
+                                delTmpReserveArgs,
+                                delTmpReserveResult: { ...error, message: error.message }
+                            },
+                            project: { id: params.project.id }
+                        });
+                        deleted = true;
                     }
                 }
                 if (!deleted) {

package/lib/chevre/service/taskHandler.js

@@ -100,7 +100,6 @@ function executeTask(task, next) {
             }, (typeof next === 'function') ? next : undefined);
         }
         catch (error) {
-            debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error?.name, error?.message);
             await (0, onOperationFailed_1.onOperationFailed)({
                 task, now, error,
                 ...(typeof next === 'function') ? { next } : undefined

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -36,38 +36,32 @@ eventReservationAcceptedOffers, payTransactions, customer) {
     debug('processing validateMovieTicket... movieTicketPaymentMethodTypes:', movieTicketPaymentMethodTypes);
     if (Array.isArray(movieTicketPaymentMethodTypes) && movieTicketPaymentMethodTypes.length > 0) {
         movieTicketPaymentMethodTypes.forEach((paymentMethodType) => {
-            try {
-                const authorizeMovieTicketActions = authorizePaymentActions.filter((a) => {
-                    const resultAsInvoice = (Array.isArray(a.result))
-                        // ? a.result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-                        ? a.result[0]
-                        : undefined;
-                    return resultAsInvoice?.issuedThrough.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket
-                        // 決済方法区分は必ず存在するはず(2023-08-15~)
-                        && resultAsInvoice.paymentMethodAsObject?.typeOf === paymentMethodType;
-                });
-                // 決済承認アクションobject.movieTicketsではなく、payTransaction.object参照で再実装(2024-06-20~)
-                const authorizedMovieTickets = [];
-                // authorizeMovieTicketActions.forEach((a) => {
-                //     authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
-                // });
-                // 決済承認アクションのinstrument依存をobject依存へ変更(2025-12-14~)
-                const payTransactionNumbers = authorizeMovieTicketActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
-                // const payTransactionNumbers = authorizeMovieTicketActions.map(({ instrument }) => instrument.transactionNumber);
-                payTransactions.filter(({ object }) => payTransactionNumbers.includes(object.paymentMethodId))
-                    .forEach(({ object }) => {
-                    if (Array.isArray(object.paymentMethod.movieTickets)) {
-                        authorizedMovieTickets.push(...object.paymentMethod.movieTickets);
-                    }
-                });
-                debug(authorizedMovieTickets.length, 'movie tickets authorized', 'transaction:', transaction.id);
-                // validateMovieTicket(paymentMethodType, { id: transaction.id }, authorizePaymentActions, eventReservationAcceptedOffers);
-                (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, { id: transaction.id }, authorizedMovieTickets, eventReservationAcceptedOffers);
-            }
-            catch (error) {
-                debug('validateMovieTicket throwed an error. transaction:', transaction.id, 'paymentMethodType:', paymentMethodType, 'message:', error.message);
-                throw error;
-            }
+            const authorizeMovieTicketActions = authorizePaymentActions.filter((a) => {
+                const resultAsInvoice = (Array.isArray(a.result))
+                    // ? a.result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                    ? a.result[0]
+                    : undefined;
+                return resultAsInvoice?.issuedThrough.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket
+                    // 決済方法区分は必ず存在するはず(2023-08-15~)
+                    && resultAsInvoice.paymentMethodAsObject?.typeOf === paymentMethodType;
+            });
+            // 決済承認アクションobject.movieTicketsではなく、payTransaction.object参照で再実装(2024-06-20~)
+            const authorizedMovieTickets = [];
+            // authorizeMovieTicketActions.forEach((a) => {
+            //     authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
+            // });
+            // 決済承認アクションのinstrument依存をobject依存へ変更(2025-12-14~)
+            const payTransactionNumbers = authorizeMovieTicketActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
+            // const payTransactionNumbers = authorizeMovieTicketActions.map(({ instrument }) => instrument.transactionNumber);
+            payTransactions.filter(({ object }) => payTransactionNumbers.includes(object.paymentMethodId))
+                .forEach(({ object }) => {
+                if (Array.isArray(object.paymentMethod.movieTickets)) {
+                    authorizedMovieTickets.push(...object.paymentMethod.movieTickets);
+                }
+            });
+            debug(authorizedMovieTickets.length, 'movie tickets authorized', 'transaction:', transaction.id);
+            // validateMovieTicket(paymentMethodType, { id: transaction.id }, authorizePaymentActions, eventReservationAcceptedOffers);
+            (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, { id: transaction.id }, authorizedMovieTickets, eventReservationAcceptedOffers);
         });
     }
     // 決済URLが発行されている場合、検証

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -168,12 +168,10 @@ function confirm(params, options) {
             });
         }
         catch (error) {
-            if (await (0, errorHandler_1.isMongoError)(error)) {
+            if (await (0, errorHandler_1.isMongoDuplicateError)(error)) {
                 // 万が一同一注文番号で確定しようとすると、MongoDBでE11000 duplicate key errorが発生する
                 // message: 'E11000 duplicate key error collection: prodttts.transactions index:result.order.orderNumber_1 dup key:...',
-                if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                    throw new factory_1.factory.errors.AlreadyInUse('transaction', ['result.order.orderNumber']);
-                }
+                throw new factory_1.factory.errors.AlreadyInUse('transaction', ['result.order.orderNumber']);
             }
             throw error;
         }

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -18,7 +18,7 @@ function fixCustomer(params) {
             formattedTelephone = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
         }
         catch (error) {
-            throw new factory_1.factory.errors.Argument('telephone', error.message);
+            throw new factory_1.factory.errors.Argument('telephone', (error instanceof Error) ? error.message : String(error));
         }
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: params.typeOf,

package/lib/chevre/service/transaction/returnOrder.js

@@ -40,12 +40,9 @@ function start(params) {
             returnOrderTransaction = await repos.returnOrder.startReturnOrder(returnOrderAttributes);
         }
         catch (error) {
-            if (await (0, errorHandler_1.isMongoError)(error)) {
+            if (await (0, errorHandler_1.isMongoDuplicateError)(error)) {
                 // 同一取引に対して返品取引を作成しようとすると、MongoDBでE11000 duplicate key errorが発生する
-                /* istanbul ignore else */
-                if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                    throw new factory_1.factory.errors.Argument('orderNumber', 'Already returned');
-                }
+                throw new factory_1.factory.errors.Argument('orderNumber', 'Already returned');
             }
             throw error;
         }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "8.0.0-alpha.2",
+    "@chevre/factory": "8.0.0-alpha.3",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.0.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.80"
+  "version": "24.0.0-alpha.81"
 }

package/lib/chevre/repo/place/busStop.d.ts

@@ -1,27 +0,0 @@
-import type { Connection, FilterQuery } from 'mongoose';
-import { factory } from '../../factory';
-/**
- * ターミナルリポジトリ
- */
-export declare class BusStopRepo {
-    private readonly civicStructureModel;
-    constructor(connection: Connection);
-    static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/place/busStop").IPlace>[];
-    saveBusStop(params: factory.place.busStop.IPlace): Promise<factory.place.busStop.IPlace>;
-    findBusStopByBranchCode(params: {
-        project: {
-            id: string;
-        };
-        branchCode: string;
-    }): Promise<factory.place.movieTheater.IPlace>;
-    searchBusStops(params: factory.place.busStop.ISearchConditions): Promise<factory.place.busStop.IPlace[]>;
-    findBusStopById(params: {
-        id: string;
-    }, projection?: any): Promise<factory.place.busStop.IPlace>;
-    deleteBusStopById(params: {
-        project: {
-            id: string;
-        };
-        id: string;
-    }): Promise<void>;
-}