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

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

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.importFromCOA = importFromCOA;
 const debug_1 = __importDefault(require("debug"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
+const factory_1 = require("../../../factory");
 const saveScreeningEvents_1 = require("../../event/saveScreeningEvents");
+const errorHandler_1 = require("../../../errorHandler");
 const debug = (0, debug_1.default)('chevre-domain:service');
 /**
  * イベント席数を更新する
@@ -66,16 +68,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;
             }

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/assetTransaction/reserve/start.d.ts

@@ -16,7 +16,6 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import { SeatRepo } from '../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
-import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
@@ -39,7 +38,6 @@ interface IStartOperationRepos {
     offerRateLimit: OfferRateLimitRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;

package/lib/chevre/service/assetTransaction/reserve/start.js

@@ -44,7 +44,6 @@ function start(params, options) {
             issuer: repos.issuer,
             member: repos.member,
             memberProgram: repos.memberProgram,
-            productOffer: repos.productOffer,
             ticket: repos.ticket
         });
         // objectに必要な情報をそろえる

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.d.ts

@@ -5,7 +5,6 @@ import type { EventOfferRepo } from '../../../repo/eventOffer';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
-import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { TicketRepo } from '../../../repo/ticket';
 declare function validateStartRequest(params: {
     object: factory.assetTransaction.reserve.IObjectWithoutDetail;
@@ -29,7 +28,6 @@ declare function validateStartRequest(params: {
     issuer: IssuerRepo;
     member: MemberRepo;
     memberProgram: MemberProgramRepo;
-    productOffer: ProductOfferRepo;
     ticket: TicketRepo;
 }) => Promise<void>;
 /**
@@ -58,6 +56,5 @@ declare function validEventOfferByApplicationExists(params: {
     issuer: IssuerRepo;
     member: MemberRepo;
     memberProgram: MemberProgramRepo;
-    productOffer: ProductOfferRepo;
 }) => Promise<void>;
 export { validateStartRequest, validEventOfferByApplicationExists };

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -9,7 +9,6 @@ const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../factory");
 const fixExtendedEventOffer_1 = require("./validateStartRequest/fixExtendedEventOffer");
 const validateIssuedOfferIfExists_1 = require("./validateStartRequest/validateIssuedOfferIfExists");
-const validateMemberTierIfExists_1 = require("./validateStartRequest/validateMemberTierIfExists");
 const verifyTicketTokenAsNeeded_1 = require("./validateStartRequest/verifyTicketTokenAsNeeded");
 function validateStartRequest(params) {
     return async (repos) => {
@@ -59,8 +58,6 @@ function validEventOfferByApplicationExists(params) {
         }
         const validFrom = makesOfferOnApplication.validFrom;
         const validThrough = makesOfferOnApplication.validThrough;
-        // const validFrom = eventOffers?.validFrom;
-        // const validThrough = eventOffers?.validThrough;
         if (validFrom !== undefined && validFrom !== null) {
             if (acceptedDate.isBefore((0, moment_1.default)(validFrom))) {
                 throw new factory_1.factory.errors.Argument('reservationFor.id', `Offer of ${params.event.id} is valid from ${validFrom}`);
@@ -84,14 +81,7 @@ function validEventOfferByApplicationExists(params) {
             })(repos);
         }
         else {
-            // 拡張可能なオファーに場合に、有効メンバープログラムティア設定は存在しない前提
-            // 有効メンバープログラムティアが存在する場合
-            await (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
-                event,
-                now: params.now,
-                makesOfferOnApplication,
-                acceptedEventOffer
-            })(repos);
+            // 拡張イベントオファーを利用しない場合は、これ以上検証なし
         }
     };
 }

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/notification/triggerWebhook.js

@@ -155,7 +155,6 @@ function signRequest(params) {
 function processInformAction(params, options) {
     return async (repos) => {
         const timeout = options?.triggerWebhook?.timeout;
-        const useFetchAPI = options?.triggerWebhook?.useFetchAPI === true;
         const secretKey = options?.triggerWebhook?.secretKey;
         const headerIdentifier = options?.triggerWebhook?.headerIdentifier;
         const { identifier } = params;
@@ -180,63 +179,59 @@ function processInformAction(params, options) {
                     && typeof headerIdentifier === 'string' && headerIdentifier !== '') {
                     signature = signRequest({ requestBody, timestamp, secretKey });
                 }
-                if (useFetchAPI) {
-                    const headers = new Headers({ 'Content-Type': 'application/json' });
-                    if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
-                        headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
-                        if (typeof signature === 'string') {
-                            headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
-                        }
-                    }
-                    const res = await fetch(urlTemplate, {
-                        method: 'POST',
-                        headers,
-                        body: requestBody, // body data type must match "Content-Type" header
-                        ...(typeof timeout === 'number')
-                            ? { signal: AbortSignal.timeout(timeout) }
-                            : undefined
-                    });
-                    let body;
-                    try {
-                        body = await res.text();
+                const headers = new Headers({ 'Content-Type': 'application/json' });
+                if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
+                    headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
+                    if (typeof signature === 'string') {
+                        headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
                     }
-                    catch (_error) {
-                        // no op
+                }
+                const res = await fetch(urlTemplate, {
+                    method: 'POST',
+                    headers,
+                    body: requestBody, // body data type must match "Content-Type" header
+                    ...(typeof timeout === 'number')
+                        ? { signal: AbortSignal.timeout(timeout) }
+                        : undefined
+                });
+                let body;
+                try {
+                    body = await res.text();
+                }
+                catch (_error) {
+                    // no op
+                }
+                switch (res.status) {
+                    case http_status_1.status.OK:
+                    case http_status_1.status.CREATED:
+                    case http_status_1.status.ACCEPTED:
+                    case http_status_1.status.NO_CONTENT: {
+                        result = {
+                            statusCode: res.status,
+                            useFetchAPI: true
+                        };
+                        break;
                     }
-                    switch (res.status) {
-                        case http_status_1.status.OK:
-                        case http_status_1.status.CREATED:
-                        case http_status_1.status.ACCEPTED:
-                        case http_status_1.status.NO_CONTENT:
-                            result = {
-                                statusCode: res.status,
-                                useFetchAPI
-                            };
-                            break;
-                        default:
+                    default: {
+                        // プロジェクト固有の特別対応
+                        const ignoreUnexpectedResponse = res.status === http_status_1.status.INTERNAL_SERVER_ERROR
+                            && typeof body === 'string'
+                            && body.includes(USERNAME_ARGUMENT_REQUIRED_MESSAGE);
+                        if (!ignoreUnexpectedResponse) {
                             throw new factory_1.factory.errors.Internal(`statusCode: ${res.status} body: ${body}`);
+                        }
                     }
                 }
-                else {
-                    throw new factory_1.factory.errors.NotImplemented('only useFetchAPI implemented');
-                }
             }
         }
         catch (error) {
-            let throwsError = true;
-            // プロジェクト固有の特別対応
-            if (error.statusCode === http_status_1.status.INTERNAL_SERVER_ERROR && error.body?.message === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
-                throwsError = false;
+            try {
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
-            if (throwsError) {
-                try {
-                    await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
-                }
-                catch (__) {
-                    // 失敗したら仕方ない
-                }
-                throw error;
+            catch (__) {
+                // 失敗したら仕方ない
             }
+            throw error;
         }
         await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
     };

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts

@@ -16,7 +16,6 @@ import type { PaymentServiceRepo } from '../../../../repo/paymentService';
 import type { SeatRepo } from '../../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../../repo/product';
-import type { ProductOfferRepo } from '../../../../repo/productOffer';
 import type { ProjectRepo } from '../../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../../repo/setting';
@@ -65,7 +64,6 @@ declare function processStartReserve4chevre(params: {
     offerRateLimit: OfferRateLimitRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -19,7 +19,6 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { SeatRepo } from '../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
-import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
@@ -50,7 +49,6 @@ interface IAuthorizeRepos {
     paymentService: PaymentServiceRepo;
     priceSpecification: PriceSpecificationRepo;
     product: ProductRepo;
-    productOffer: ProductOfferRepo;
     project: ProjectRepo;
     seat: SeatRepo;
     setting: SettingRepo;

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/event/issueEventOfferTicket.d.ts

@@ -6,7 +6,6 @@ import type { EventOfferRepo } from '../../../repo/eventOffer';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
-import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { TicketRepo } from '../../../repo/ticket';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IIssueEventOfferTicketRepos {
@@ -18,7 +17,6 @@ interface IIssueEventOfferTicketRepos {
     issuer: IssuerRepo;
     member: MemberRepo;
     memberProgram: MemberProgramRepo;
-    productOffer: ProductOfferRepo;
     ticket: TicketRepo;
     placeOrder: PlaceOrderRepo;
 }
@@ -33,7 +31,7 @@ declare function issueEventOfferTicket(params: {
      * 拡張イベントオファーID
      */
     eventOfferId?: string;
-    ticketedOffer?: Pick<factory.authorization.IOfferAsObject, 'token' | 'validForMemberTier'>;
+    ticketedOffer?: Pick<factory.authorization.IOfferAsObject, 'token'>;
     author: Pick<factory.authorization.IAuthor, 'id' | 'typeOf'>;
     project: {
         id: string;

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

@@ -66,8 +66,6 @@ function issueEventOfferTicket(params) {
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: factory_1.factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
         // イベントは存在するか
         const event = await repos.event.projectEventFieldsById({ id: eventId }, ['project', 'offers', 'identifier']);
-        // 取引番号発行
-        // const { transactionNumber } = await transactionNumberRepo.publishByTimestamp({ startDate: now });
         const { seller } = transaction;
         // 承認作成
         const issuedBy = {
@@ -75,8 +73,8 @@ function issueEventOfferTicket(params) {
             typeOf: seller.typeOf,
             ...(typeof seller.name.ja === 'string') ? { name: seller.name.ja } : undefined
         };
-        const validForMemberTierToken = ticketedOffer?.validForMemberTier?.token;
-        const validForMemberProgramIdentifier = ticketedOffer?.validForMemberTier?.isTierOf.identifier;
+        // const validForMemberTierToken = ticketedOffer?.validForMemberTier?.token;
+        // const validForMemberProgramIdentifier = ticketedOffer?.validForMemberTier?.isTierOf.identifier;
         const authorizationObject = {
             typeOf: factory_1.factory.offerType.Offer,
             itemOffered: {
@@ -90,15 +88,15 @@ function issueEventOfferTicket(params) {
             ...(typeof ticketedOffer?.token === 'string' && ticketedOffer.token !== '')
                 ? { token: ticketedOffer.token }
                 : undefined,
-            ...(typeof validForMemberTierToken === 'string' && validForMemberTierToken !== ''
-                && typeof validForMemberProgramIdentifier === 'string' && validForMemberProgramIdentifier !== '')
-                ? {
-                    validForMemberTier: {
-                        token: validForMemberTierToken,
-                        isTierOf: { identifier: validForMemberProgramIdentifier }
-                    }
-                }
-                : undefined
+            // ...(typeof validForMemberTierToken === 'string' && validForMemberTierToken !== ''
+            //     && typeof validForMemberProgramIdentifier === 'string' && validForMemberProgramIdentifier !== '')
+            //     ? {
+            //         validForMemberTier: {
+            //             token: validForMemberTierToken,
+            //             isTierOf: { identifier: validForMemberProgramIdentifier }
+            //         }
+            //     }
+            //     : undefined
         };
         // validations(eventId,eventOfferIdentifier,offerToken...)
         await (0, validateStartRequest_1.validEventOfferByApplicationExists)({

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 });