@chevre/domain 21.20.0-alpha.9 → 21.20.1

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPotentialActions = void 0;
+exports.createPotentialActions = exports.createPayActions = void 0;
 const factory = require("../../../factory");
-// import { createMaskedCustomer } from '../../../factory/order';
+const createPayObjectServiceOutput_1 = require("./potentialActions/createPayObjectServiceOutput");
 function createPayActions(params) {
     var _a;
     const payActions = [];
@@ -28,6 +28,7 @@ function createPayActions(params) {
     }
     return payActions;
 }
+exports.createPayActions = createPayActions;
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPayObject(params) {
     var _a;
@@ -41,7 +42,7 @@ function createPayObject(params) {
     const paymentMethodAmountValue = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) === 'number')
         ? paymentMethod.amount
         : paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount.value;
-    const paymentServiceOutput = createPayObjectServiceOutput(params);
+    const paymentServiceOutput = (0, createPayObjectServiceOutput_1.createPayObjectServiceOutput)(params);
     let payObject;
     switch (transaction.object.typeOf) {
         case factory.service.paymentService.PaymentServiceType.FaceToFace:
@@ -111,168 +112,6 @@ function createPayObject(params) {
     }
     return payObject;
 }
-function createPayObjectServiceOutput(params) {
-    const transaction = params.transaction;
-    const paymentMethod = transaction.object.paymentMethod;
-    const order = params.order;
-    let paymentServiceOutput;
-    switch (transaction.object.typeOf) {
-        case factory.service.paymentService.PaymentServiceType.FaceToFace:
-        case factory.service.paymentService.PaymentServiceType.PaymentCard:
-            break;
-        case factory.service.paymentService.PaymentServiceType.CreditCard:
-            // CreditCardIFのカード通貨区分を追加(2023-08-07~)
-            // const creditCardAsPaymentServiceOutput: factory.order.IOrderPaymentMethodIssuedThroughServiceOutput | undefined =
-            //     (typeof transaction.object.paymentMethod?.amount !== 'number'
-            //         && typeof transaction.object.paymentMethod?.amount?.currency === 'string')
-            //         ? {
-            //             paymentMethod: {
-            //                 amount: {
-            //                     currency: transaction.object.paymentMethod.amount.currency,
-            //                     value: transaction.object.paymentMethod.amount.value
-            //                 }
-            //             }
-            //         }
-            //         : undefined;
-            // if (creditCardAsPaymentServiceOutput !== undefined) {
-            //     paymentServiceOutput = creditCardAsPaymentServiceOutput;
-            // }
-            break;
-        case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier;
-            const movieTickets = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets;
-            if (Array.isArray(movieTickets)) {
-                paymentServiceOutput = movieTickets.map((movieTicket) => {
-                    var _a;
-                    const amount = movieTicket2amount(transaction, movieTicket);
-                    const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType));
-                    return Object.assign(Object.assign({ identifier: movieTicket.identifier }, (typeof (amount === null || amount === void 0 ? void 0 : amount.value) === 'number') ? { amount } : undefined), (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                        ? { serviceOutput: reservation4invoice }
-                        : undefined);
-                });
-            }
-            break;
-        default:
-            throw new factory.errors.NotImplemented(`Payment service "${transaction.object.typeOf}" not implemented.`);
-    }
-    return paymentServiceOutput;
-}
-function movieTicket2amount(transaction, movieTicket) {
-    var _a;
-    let amount;
-    const accountsReceivables = transaction.object.accountsReceivablesByServiceType;
-    if (Array.isArray(accountsReceivables)) {
-        const accountsReceivable = (_a = accountsReceivables.find((a) => a.serviceType === movieTicket.serviceType)) === null || _a === void 0 ? void 0 : _a.accountsReceivable;
-        if (typeof accountsReceivable === 'number') {
-            amount = {
-                typeOf: 'MonetaryAmount',
-                value: accountsReceivable
-            };
-        }
-    }
-    return amount;
-}
-function reservationPriceComponent2invoicePriceComponent(component) {
-    var _a;
-    const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')
-        ? { accountsReceivable: component.accounting.accountsReceivable }
-        : undefined;
-    let minimizedUnitPriceSpec;
-    let minimizedMovieTicketTypeChargeSpec;
-    let minimizedCategoryCodeChargeSpec;
-    if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
-        const appliesToAddOn = (Array.isArray(component.appliesToAddOn))
-            ? component.appliesToAddOn.map((addOn) => {
-                return { typeOf: addOn.typeOf };
-            })
-            : undefined;
-        minimizedUnitPriceSpec = Object.assign(Object.assign({ typeOf: component.typeOf, price: component.price, referenceQuantity: component.referenceQuantity }, (Array.isArray(appliesToAddOn)) ? { appliesToAddOn } : undefined), (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
-    }
-    else if (component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification) {
-        minimizedMovieTicketTypeChargeSpec = Object.assign({ typeOf: component.typeOf, price: component.price, 
-            // 適用決済方法区分を追加(2023-03-29~)
-            appliesToMovieTicket: {
-                serviceOutput: {
-                    typeOf: component.appliesToMovieTicket.serviceOutput.typeOf
-                }
-            } }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
-    }
-    else {
-        minimizedCategoryCodeChargeSpec = Object.assign({ typeOf: component.typeOf, price: component.price }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
-    }
-    if (minimizedUnitPriceSpec !== undefined) {
-        return minimizedUnitPriceSpec;
-    }
-    else if (minimizedMovieTicketTypeChargeSpec !== undefined) {
-        return minimizedMovieTicketTypeChargeSpec;
-    }
-    else if (minimizedCategoryCodeChargeSpec !== undefined) {
-        return minimizedCategoryCodeChargeSpec;
-    }
-    else {
-        throw new factory.errors.NotImplemented(`unexpected priceComponent: ${component.typeOf}`);
-    }
-}
-function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
-    var _a;
-    let ticketToken;
-    let reservationNumber = '';
-    let priceComponents4invoice = [];
-    // Orderから対象予約を取得
-    const reservationOffer = order.acceptedOffers.find((o) => {
-        var _a, _b, _c, _d;
-        let mvtkUnitPriceSpec;
-        // MovieTicket適用単価オファーからidentifierを取り出す
-        if (((_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.priceSpecificationType.CompoundPriceSpecification) {
-            // 適用購入管理番号が一致、かつ、決済方法区分が一致、の単価仕様を検索
-            mvtkUnitPriceSpec = (_c = (_b = o.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent) === null || _c === void 0 ? void 0 : _c.find((p) => {
-                if (p.typeOf !== factory.priceSpecificationType.UnitPriceSpecification) {
-                    return false;
-                }
-                // 複数決済カード対応(2022-07-11~)
-                if (Array.isArray(p.appliesToMovieTicket)) {
-                    return p.appliesToMovieTicket.length > 0
-                        && p.appliesToMovieTicket.some((appliesToMovieTicket) => {
-                            return appliesToMovieTicket.identifier === movieTicket.identifier
-                                && appliesToMovieTicket.serviceOutput.typeOf === paymentMethodType;
-                        });
-                }
-                else {
-                    return false;
-                }
-            });
-        }
-        return (o.itemOffered.typeOf === factory.reservationType.EventReservation
-            || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-            && mvtkUnitPriceSpec !== undefined
-            && o.itemOffered.reservationFor.id === movieTicket.serviceOutput.reservationFor.id
-            && ((_d = o.itemOffered.reservedTicket.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber) === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber
-            && o.itemOffered.reservedTicket.ticketedSeat.seatSection === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatSection;
-    });
-    if (reservationOffer !== undefined) {
-        if (reservationOffer.itemOffered.typeOf !== factory.reservationType.EventReservation
-            && reservationOffer.itemOffered.typeOf !== factory.reservationType.BusReservation) {
-            throw new factory.errors.NotImplemented(`itemOffered.typeOf: ${reservationOffer.itemOffered.typeOf} not implemented`);
-        }
-        const ticketTokenByReservationOffer = reservationOffer.itemOffered.reservedTicket.ticketToken;
-        if (typeof ticketTokenByReservationOffer === 'string' && ticketTokenByReservationOffer.length > 0) {
-            ticketToken = ticketTokenByReservationOffer;
-        }
-        reservationNumber = reservationOffer.itemOffered.reservationNumber;
-        const priceComponent = (_a = reservationOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
-        if (Array.isArray(priceComponent)) {
-            priceComponents4invoice = priceComponent.map(reservationPriceComponent2invoicePriceComponent);
-        }
-    }
-    return Object.assign({ priceSpecification: {
-            typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
-            priceComponent: priceComponents4invoice
-        }, 
-        // add reservationNumber(2023-03-20~)
-        reservationNumber }, (typeof ticketToken === 'string')
-        ? { reservedTicket: { ticketToken } }
-        : undefined);
-}
 function createInformPaymentActions(params) {
     var _a;
     const transaction = params.transaction;

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -11,12 +11,12 @@ import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
-import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import * as CreditCardPayment from '../payment/creditCard';
 import * as MovieTicketPayment from '../payment/movieTicket';
+import { IAcceptedOfferMovieTicketUsed } from './pay/potentialActions';
 export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
@@ -24,7 +24,6 @@ export interface IStartOperationRepos {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
     product: ProductRepo;
     assetTransaction: AssetTransactionRepo;
     task: TaskRepo;
@@ -59,7 +58,6 @@ export type IPublishPaymentUrlOperation<T> = (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
 }) => Promise<T>;
 export type IInvalidatePaymentUrlOperation<T> = (repos: {
     accountingReport: AccountingReportRepo;
@@ -102,7 +100,26 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
 /**
  * 取引確定
  */
-export declare function confirm(params: factory.assetTransaction.pay.IConfirmParams): IConfirmOperation<void>;
+export declare function confirm(params: factory.assetTransaction.pay.IConfirmParams & {
+    options: {
+        minimizePotentialActions: boolean;
+    };
+}): IConfirmOperation<void>;
+export declare function fixOrderAsPurpose(params: {
+    potentialActions: {
+        pay: {
+            purpose: {
+                confirmationNumber: string;
+                orderNumber: string;
+            };
+        };
+    };
+}, transaction: factory.assetTransaction.pay.ITransaction): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    order: OrderRepo;
+}) => Promise<Pick<factory.order.IOrder, "typeOf" | "confirmationNumber" | "orderNumber"> & {
+    acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
+}>;
 /**
  * 取引中止
  */

package/lib/chevre/service/assetTransaction/pay.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
+exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.fixOrderAsPurpose = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
+const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../../factory");
 const CreditCardPayment = require("../payment/creditCard");
@@ -18,6 +19,7 @@ const PaymentCardPayment = require("../payment/paymentCard");
 const validation_1 = require("./pay/account/validation");
 const factory_1 = require("./pay/factory");
 const potentialActions_1 = require("./pay/potentialActions");
+const debug = createDebug('chevre-domain:service:assetTransaction');
 /**
  * 外部決済ロケーション発行
  */
@@ -340,7 +342,7 @@ function saveAuthorizeResult(params) {
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -364,15 +366,41 @@ function confirm(params) {
             if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
                 overwritingPaymentMethodIdentifier = specifiedPaymentMethodIdentifire;
                 transaction.object.paymentMethod.identifier = overwritingPaymentMethodIdentifier;
-                // transaction.object.paymentMethod.typeOf = overwritingPaymentMethodIdentifier;
             }
         }
-        const order = yield fixOrderAsPurpose(params, transaction)(repos);
-        const potentialActions = (0, potentialActions_1.createPotentialActions)({
-            transaction: transaction,
-            potentialActions: params.potentialActions,
-            order
-        });
+        const confirmationNumber = (_e = (_d = (_c = params.potentialActions) === null || _c === void 0 ? void 0 : _c.pay) === null || _d === void 0 ? void 0 : _d.purpose) === null || _e === void 0 ? void 0 : _e.confirmationNumber;
+        const orderNumber = (_h = (_g = (_f = params.potentialActions) === null || _f === void 0 ? void 0 : _f.pay) === null || _g === void 0 ? void 0 : _g.purpose) === null || _h === void 0 ? void 0 : _h.orderNumber;
+        if (typeof confirmationNumber !== 'string' || confirmationNumber.length === 0
+            || typeof orderNumber !== 'string' || orderNumber.length === 0) {
+            throw new factory.errors.ArgumentNull('potentialActions.pay.purpose');
+        }
+        let potentialActions;
+        if (params.options.minimizePotentialActions) {
+            // 注文検証
+            const existingOrders = yield repos.order.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: transaction.project.id } },
+                confirmationNumbers: [confirmationNumber],
+                orderNumbers: [orderNumber]
+            }, { orderNumber: 1 });
+            if (existingOrders.length === 0) {
+                throw new factory.errors.NotFound(factory.order.OrderType.Order);
+            }
+            const payActionData4order = {
+                object: { paymentMethod: { paymentMethodId: transaction.transactionNumber } },
+                purpose: { confirmationNumber, orderNumber, typeOf: factory.order.OrderType.Order }
+            };
+            potentialActions = { pay: [payActionData4order] };
+        }
+        else {
+            const order = yield fixOrderAsPurpose({ potentialActions: { pay: { purpose: { confirmationNumber, orderNumber } } } }, transaction)(repos);
+            potentialActions = (0, potentialActions_1.createPotentialActions)({
+                transaction: transaction,
+                potentialActions: params.potentialActions,
+                order
+            });
+        }
         yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Pay, id: transaction.id, result: {}, potentialActions: potentialActions }, (typeof overwritingPaymentMethodIdentifier === 'string')
             ? { object: { paymentMethod: { identifier: overwritingPaymentMethodIdentifier } } }
             : undefined));
@@ -381,13 +409,9 @@ function confirm(params) {
 exports.confirm = confirm;
 function fixOrderAsPurpose(params, transaction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        const payPurposeConfirmationNumber = (_c = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.pay) === null || _b === void 0 ? void 0 : _b.purpose) === null || _c === void 0 ? void 0 : _c.confirmationNumber;
-        const payPurposeOrderNumber = (_f = (_e = (_d = params.potentialActions) === null || _d === void 0 ? void 0 : _d.pay) === null || _e === void 0 ? void 0 : _e.purpose) === null || _f === void 0 ? void 0 : _f.orderNumber;
-        if (typeof payPurposeConfirmationNumber !== 'string' || payPurposeConfirmationNumber.length === 0
-            || typeof payPurposeOrderNumber !== 'string' || payPurposeOrderNumber.length === 0) {
-            throw new factory.errors.ArgumentNull('potentialActions.pay.purpose');
-        }
+        var _a;
+        const payPurposeConfirmationNumber = params.potentialActions.pay.purpose.confirmationNumber;
+        const payPurposeOrderNumber = (_a = params.potentialActions.pay.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
         const ordersWithoutAcceptedOffers = yield repos.order.search({
             limit: 1,
             page: 1,
@@ -399,14 +423,31 @@ function fixOrderAsPurpose(params, transaction) {
         if (orderWithoutAcceptedOffers === undefined) {
             throw new factory.errors.NotFound('Order as purpose');
         }
-        // 全acceptedOffersを検索(2023-12-06~)
-        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-            orderNumber: { $eq: orderWithoutAcceptedOffers.orderNumber },
-            project: { id: { $eq: transaction.project.id } }
-        });
-        return Object.assign(Object.assign({}, orderWithoutAcceptedOffers), { acceptedOffers });
+        // 必要なオファー検索のみ実行する(2024-01-18~)
+        let acceptedOffersMovieTicketUsed = [];
+        const movieTickets = transaction.object.paymentMethod.movieTickets;
+        if (Array.isArray(movieTickets) && movieTickets.length > 0) {
+            const reservationForId = movieTickets[0].serviceOutput.reservationFor.id; // イベントIDは決済取引ごとにひとつのみ許可なので、これで問題ない
+            const seatNumbers = movieTickets.map(({ serviceOutput }) => serviceOutput.reservedTicket.ticketedSeat.seatNumber);
+            debug('fixOrderAsPurpose at confirming payTransaction: searching acceptedOffersMovieTicketUsed...', reservationForId, seatNumbers);
+            acceptedOffersMovieTicketUsed = (yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                orderNumber: { $eq: orderWithoutAcceptedOffers.orderNumber },
+                project: { id: { $eq: transaction.project.id } },
+                acceptedOffers: {
+                    itemOffered: {
+                        typeOf: { $in: [factory.reservationType.EventReservation] },
+                        // movieTicketsに結合されたイベントID,座席コードで絞る
+                        reservationFor: { id: { $in: [reservationForId] } },
+                        reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }
+                    }
+                }
+            }, ['itemOffered', 'priceSpecification']));
+            debug('fixOrderAsPurpose at confirming payTransaction:', acceptedOffersMovieTicketUsed.length, 'acceptedOffersMovieTicketUsed found', acceptedOffersMovieTicketUsed);
+        }
+        return Object.assign(Object.assign({}, orderWithoutAcceptedOffers), { acceptedOffersMovieTicketUsed });
     });
 }
+exports.fixOrderAsPurpose = fixOrderAsPurpose;
 /**
  * 取引中止
  */
@@ -471,7 +512,7 @@ function exportTasksById(params) {
             purpose: {
                 confirmationNumber: '',
                 orderNumber: '',
-                typeOf: 'Order'
+                typeOf: factory.order.OrderType.Order
             },
             useOnOrderStatusChanged: true
         };

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

@@ -331,9 +331,7 @@ function createAdditionalTicketText(params) {
     return (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.additionalTicketText;
 }
 exports.createAdditionalTicketText = createAdditionalTicketText;
-function createReservationFor(
-// params: factory.event.screeningEvent.IEvent | factory.event.event.IEvent
-params) {
+function createReservationFor(params) {
     var _a, _b;
     if (params.typeOf === factory.eventType.ScreeningEvent) {
         return Object.assign({ endDate: params.endDate, id: params.id, location: params.location, name: params.name, startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params), typeOf: params.typeOf }, (params.doorTime instanceof Date)
@@ -349,18 +347,13 @@ params) {
     }
 }
 exports.createReservationFor = createReservationFor;
-function optimizeReservationSuperEvent(
-// params: factory.event.screeningEvent.IEvent
-params) {
+function optimizeReservationSuperEvent(params) {
     const superEvent = params.superEvent;
-    return Object.assign(Object.assign({ additionalProperty: (Array.isArray(superEvent.additionalProperty))
+    return Object.assign({ additionalProperty: (Array.isArray(superEvent.additionalProperty))
             ? superEvent.additionalProperty
-            : [], id: superEvent.id, kanaName: superEvent.kanaName, location: superEvent.location, name: superEvent.name, 
-        // 不要なので廃止(2022-12-19~)
-        // project: superEvent.project,
-        soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.description !== undefined)
-        ? { description: superEvent.description }
-        : undefined), (superEvent.headline !== undefined)
+            : [], id: superEvent.id, 
+        // kanaName: superEvent.kanaName, // 廃止(2024-01-26~)
+        location: superEvent.location, name: superEvent.name, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.headline !== undefined)
         ? { headline: superEvent.headline }
         : undefined);
 }
@@ -503,7 +496,11 @@ function createPotentialActions(params) {
             }));
         });
         reservationPackage = {
-            reservationFor,
+            reservationFor: {
+                id: String(reservationFor.id),
+                typeOf: reservationFor.typeOf,
+                optimized: true
+            },
             reservationNumber: transaction.object.reservationNumber,
             reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
                 ? params.transaction.object.reservationStatus

package/lib/chevre/service/assetTransaction/reserveCOA.d.ts

@@ -0,0 +1,19 @@
+/**
+ * COA予約取引サービス
+ */
+import * as COA from '@motionpicture/coa-service';
+import * as factory from '../../factory';
+interface IConfirmRepo {
+}
+type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
+/**
+ * 取引確定
+ */
+declare function confirm(params: {
+    project: {
+        id: string;
+    };
+    object: factory.action.interact.confirm.reservation.IObject4COA;
+    purpose: factory.action.interact.confirm.reservation.IPurpose;
+}): IConfirmOperation<COA.factory.reserve.IUpdReserveResult | undefined>;
+export { confirm };

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

@@ -0,0 +1,46 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.confirm = void 0;
+/**
+ * COA予約取引サービス
+ */
+const COA = require("@motionpicture/coa-service");
+const credentials_1 = require("../../credentials");
+const coaAuthClient = new COA.auth.RefreshToken({
+    endpoint: credentials_1.credentials.coa.endpoint,
+    refreshToken: credentials_1.credentials.coa.refreshToken,
+    useFetch: credentials_1.credentials.coa.useFetch
+});
+/**
+ * 取引確定
+ */
+function confirm(params) {
+    return (__) => __awaiter(this, void 0, void 0, function* () {
+        // 未本予約であれば実行(COA本予約は一度成功すると成功できない)
+        // リトライ可能な前提でつくる必要があるので、要注意
+        // すでに本予約済みかどうか確認
+        const reserveService = new COA.service.Reserve({
+            endpoint: credentials_1.credentials.coa.endpoint,
+            auth: coaAuthClient
+        }, { timeout: credentials_1.credentials.coa.timeout });
+        const stateReserveResult = yield reserveService.stateReserve({
+            theaterCode: params.object.theaterCode,
+            reserveNum: params.object.tmpReserveNum,
+            telNum: params.object.telNum
+        });
+        if (stateReserveResult === null) {
+            return reserveService.updReserve(params.object);
+        }
+        return;
+    });
+}
+exports.confirm = confirm;

package/lib/chevre/service/code.js

@@ -103,7 +103,7 @@ function verifyToken(params) {
             throw error;
         }
         if (repos.action !== undefined && action !== undefined) {
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         }
         return result;
     });

package/lib/chevre/service/delivery.js

@@ -63,7 +63,7 @@ function givePointAward(params) {
         }
         // アクション完了
         const actionResult = {};
-        yield repos.action.complete({ typeOf: params.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: params.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.givePointAward = givePointAward;
@@ -140,7 +140,7 @@ function returnPointAward(params) {
         const actionResult = {
             moneyTransferTransaction: moneyTransferTransactions
         };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.returnPointAward = returnPointAward;

package/lib/chevre/service/event/createEvent.js

@@ -80,7 +80,7 @@ function createEvent(params) {
             }
             throw error;
         }
-        yield repos.action.complete({
+        yield repos.action.completeWithVoid({
             typeOf: action.typeOf,
             id: action.id,
             result: (Array.isArray(eventIds))

package/lib/chevre/service/event.js

@@ -27,7 +27,8 @@ const offer_1 = require("./offer");
 const debug = createDebug('chevre-domain:service:event');
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken
+    refreshToken: credentials_1.credentials.coa.refreshToken,
+    useFetch: credentials_1.credentials.coa.useFetch
 });
 /**
  * Googleで作品画像を検索する
@@ -166,10 +167,11 @@ function importFromCOA(params) {
             }
             catch (error) {
                 let throwsError = true;
-                // "name": "COAServiceError",
-                // "code": 500,
-                // "status": "",
-                // "message": "ESOCKETTIMEDOUT",
+                if (error.name === 'AbortError') {
+                    // tslint:disable-next-line:no-console
+                    console.error('saveScreeningEvents throwed an error', error.name, error.message);
+                    throwsError = false;
+                }
                 if (error.name === 'COAServiceError') {
                     if (error.message === 'ESOCKETTIMEDOUT') {
                         // tslint:disable-next-line:no-console
@@ -193,7 +195,7 @@ function importFromCOA(params) {
         }
         // アクション完了
         const actionResult = { savedScreeningEventsCount, savedScreeningEventSeriesCount };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.importFromCOA = importFromCOA;
@@ -581,6 +583,12 @@ function createScreeningEventSeriesFromCOA(params) {
         const unavailablePaymentMethodTypes = params.availablePaymentMethodTypes.filter((categoryCode) => { var _a, _b; return ((_b = (_a = categoryCode.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((property) => property.name === 'flgMvtkUse')) === null || _b === void 0 ? void 0 : _b.value) === '1'; });
         unacceptedPaymentMethod.push(...unavailablePaymentMethodTypes.map((c) => c.codeValue));
     }
+    const workPerformed = Object.assign({ id: `${params.movieTheater.branchCode}-${params.filmFromCOA.titleCode}`, identifier: params.filmFromCOA.titleCode, name: {
+            ja: params.filmFromCOA.titleNameOrig
+        }, duration: moment.duration(params.filmFromCOA.showTime, 'm')
+            .toISOString(), contentRating: params.eirinKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEirin)[0], typeOf: factory.creativeWorkType.Movie }, (typeof params.filmFromCOA.titleBranchNum === 'string' && params.filmFromCOA.titleBranchNum.length > 0)
+        ? { version: params.filmFromCOA.titleBranchNum } // add version(2024-01-31~)
+        : undefined);
     return {
         project: { typeOf: params.project.typeOf, id: params.project.id },
         typeOf: factory.eventType.ScreeningEventSeries,
@@ -594,8 +602,6 @@ function createScreeningEventSeriesFromCOA(params) {
         kanaName: params.filmFromCOA.titleNameKana,
         alternativeHeadline: params.filmFromCOA.titleNameShort,
         location: {
-            // 不要なので廃止(2022-12-19~)
-            // project: { typeOf: params.project.typeOf, id: params.project.id },
             id: (params.movieTheater.id !== undefined) ? params.movieTheater.id : '',
             branchCode: params.movieTheater.branchCode,
             name: params.movieTheater.name,
@@ -606,21 +612,7 @@ function createScreeningEventSeriesFromCOA(params) {
         organizer: { id: params.seller.id },
         videoFormat: params.eizouKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEizou)[0],
         soundFormat: [],
-        workPerformed: {
-            // 不要なので廃止(2022-12-19~)
-            // project: { typeOf: params.project.typeOf, id: params.project.id },
-            id: `${params.movieTheater.branchCode}-${params.filmFromCOA.titleCode}`,
-            identifier: params.filmFromCOA.titleCode,
-            // 多言語化(2022-07-26~)
-            // name: params.filmFromCOA.titleNameOrig,
-            name: {
-                ja: params.filmFromCOA.titleNameOrig
-            },
-            duration: moment.duration(params.filmFromCOA.showTime, 'm')
-                .toISOString(),
-            contentRating: params.eirinKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEirin)[0],
-            typeOf: factory.creativeWorkType.Movie
-        },
+        workPerformed,
         duration: moment.duration(params.filmFromCOA.showTime, 'm')
             .toISOString(),
         endDate: endDate,
@@ -807,7 +799,7 @@ function updateEvent4ttts(params) {
             throw error;
         }
         // アクション完了
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
         yield (0, offer_1.onEventChanged)({
             id: [event.id],
             project: { id: event.project.id },

package/lib/chevre/service/moneyTransfer.js

@@ -439,7 +439,7 @@ function moneyTransfer(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.moneyTransfer = moneyTransfer;