@chevre/domain 21.20.0-alpha.41 → 21.20.0-alpha.43

package/lib/chevre/repo/acceptedOffer.d.ts

@@ -80,6 +80,18 @@ export declare class MongoRepository {
             };
         };
     }): Promise<ISearchSlicedAcceptedOffersResult>;
+    countByOrderNumber(filter: {
+        orderNumber: {
+            $eq: string;
+        };
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+    }): Promise<{
+        numAcceptedOffers: number;
+    }>;
     /**
      * 特定のフィールド値リストを検索する
      */

package/lib/chevre/repo/acceptedOffer.js

@@ -182,6 +182,28 @@ class MongoRepository {
             return result;
         });
     }
+    countByOrderNumber(filter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aggregate = this.orderModel.aggregate([
+                { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
+                { $match: { 'project.id': { $eq: filter.project.id.$eq } } },
+                { $match: { typeOf: { $eq: factory.order.OrderType.Order } } },
+                {
+                    $project: {
+                        _id: 0,
+                        numAcceptedOffers: { $size: '$acceptedOffers' }
+                    }
+                }
+            ]);
+            const result = (yield aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()).shift();
+            if (result === undefined) {
+                throw new factory.errors.NotFound(factory.order.OrderType.Order);
+            }
+            return result;
+        });
+    }
     /**
      * 特定のフィールド値リストを検索する
      */

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

@@ -0,0 +1,19 @@
+import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { MongoRepository as OrderRepo } from '../../repo/order';
+interface IConfirmRepo {
+    acceptedOffer: AcceptedOfferRepo;
+    order: OrderRepo;
+}
+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<void>;
+export { confirm };

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

@@ -0,0 +1,140 @@
+"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 createDebug = require("debug");
+const google_libphonenumber_1 = require("google-libphonenumber");
+const util_1 = require("util");
+const credentials_1 = require("../../credentials");
+const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:assetTransaction');
+const coaAuthClient = new COA.auth.RefreshToken({
+    endpoint: credentials_1.credentials.coa.endpoint,
+    refreshToken: credentials_1.credentials.coa.refreshToken
+});
+function createConfirmObject4COAByOrder(params) {
+    // COA予約のみ
+    const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
+        var _a;
+        return o.itemOffered.typeOf === factory.reservationType.EventReservation
+            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
+    });
+    const customer = params.order.customer;
+    // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
+    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
+    const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
+    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
+    // COAでは数字のみ受け付けるので数字以外を除去
+    telNum = telNum.replace(/[^\d]/g, '');
+    const mailAddr = customer.email;
+    if (mailAddr === undefined) {
+        throw new factory.errors.Argument('order', 'order.customer.email undefined');
+    }
+    const coaReservations = coaReservationOffers
+        .filter((o) => o.itemOffered.reservationNumber === params.reservationNumber)
+        .map((o) => {
+        return o.itemOffered;
+    });
+    const coaReservation = coaReservations[0];
+    const reservationForCOAInfo = coaReservation.reservationFor.coaInfo;
+    if (reservationForCOAInfo === undefined) {
+        throw new factory.errors.NotFound('reservationFor.coaInfo');
+    }
+    const totalPrice = coaReservation.reservedTicket.coaReserveAmount;
+    if (totalPrice === undefined) {
+        throw new factory.errors.NotFound('reservedTicket.coaReserveAmount');
+    }
+    const listTicket = coaReservations.map((r) => {
+        var _a;
+        if (typeof ((_a = r.reservedTicket.coaTicketInfo) === null || _a === void 0 ? void 0 : _a.ticketCode) !== 'string') {
+            throw new factory.errors.NotFound('reservedTicket.coaTicketInfo');
+        }
+        // 冗長な属性を排除(2023-03-20~)
+        const { ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2, disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn, seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken, mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk } = r.reservedTicket.coaTicketInfo;
+        return {
+            ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2,
+            disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn,
+            seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken,
+            mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk
+        };
+    });
+    return {
+        theaterCode: reservationForCOAInfo.theaterCode,
+        dateJouei: reservationForCOAInfo.dateJouei,
+        titleCode: reservationForCOAInfo.titleCode,
+        titleBranchNum: reservationForCOAInfo.titleBranchNum,
+        timeBegin: reservationForCOAInfo.timeBegin,
+        tmpReserveNum: params.reservationNumber,
+        // tslint:disable-next-line:no-irregular-whitespace
+        reserveName: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
+        // tslint:disable-next-line:no-irregular-whitespace
+        reserveNameJkana: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
+        telNum: telNum,
+        mailAddr: mailAddr,
+        reserveAmount: totalPrice,
+        listTicket
+        // transactionNumber: reservationNumber,
+        // typeOf: 'COAReserveTransaction'
+    };
+}
+/**
+ * 取引確定
+ */
+function confirm(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // ここでIObject4COAを注文から生成する(2024-01-24~)
+        const order = yield fixOrderAsPurpose(params)(repos);
+        const updReserveArgs = createConfirmObject4COAByOrder({ order, reservationNumber: params.object.transactionNumber });
+        debug('confirming coa reserve transaction...', order, updReserveArgs);
+        // 未本予約であれば実行(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) {
+            yield reserveService.updReserve(params.object);
+        }
+    });
+}
+exports.confirm = confirm;
+function fixOrderAsPurpose(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let order;
+        const purposeOrderNumber = params.purpose.orderNumber;
+        const orders = yield repos.order.search({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: params.project.id } },
+            // confirmationNumbers: [payPurposeConfirmationNumber],
+            orderNumbers: [purposeOrderNumber]
+        }, { customer: 1, orderNumber: 1, typeOf: 1 });
+        order = orders.shift();
+        if (order === undefined) {
+            throw new factory.errors.NotFound('Order as purpose');
+        }
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: order.orderNumber },
+            project: { id: { $eq: params.project.id } }
+        }, ['itemOffered', 'offeredThrough']);
+        return Object.assign(Object.assign({}, order), { acceptedOffers });
+    });
+}

package/lib/chevre/service/order/onAssetTransactionStatusChanged.js

@@ -10,9 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processing2inTransit = exports.paymentDue2Processing = exports.onAssetTransactionStatusChanged = void 0;
+const createDebug = require("debug");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:order');
 // tslint:disable-next-line:max-func-body-length
 function onAssetTransactionStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -200,9 +202,15 @@ function paymentDue2Processing(params) {
             const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
                 orderNumber: { $eq: order.orderNumber },
                 project: { id: { $eq: params.project.id } }
+            }, ['itemOffered', 'offeredThrough']);
+            const { numAcceptedOffers } = yield repos.acceptedOffer.countByOrderNumber({
+                orderNumber: { $eq: order.orderNumber },
+                project: { id: { $eq: params.project.id } }
             });
+            debug('onAssetTransactionStatusChanged paymentDue2Processing: calling onOrderProcessing...', numAcceptedOffers, acceptedOffers);
             yield (0, onOrderStatusChanged_1.onOrderProcessing)({
-                order: Object.assign(Object.assign({}, order), { acceptedOffers, orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
+                order: Object.assign(Object.assign({}, order), { acceptedOffers,
+                    numAcceptedOffers, orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
                  }),
                 placeOrderTransaction
             })({

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts

@@ -1,17 +1,18 @@
 import * as factory from '../../../../factory';
+type IAcceptedOffer = Pick<factory.order.IAcceptedOffer<factory.order.IItemOffered>, 'itemOffered' | 'offeredThrough'>;
 type IProcessingOrder = factory.order.IOrder & {
-    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    numAcceptedOffers: number;
     orderStatus: factory.orderStatus.OrderProcessing;
 };
 declare function createInformTasks(order: IProcessingOrder): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createConfirmReservationActionObject4ChevreByOrder(params: {
     order: factory.order.IOrder & {
-        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+        acceptedOffers: IAcceptedOffer[];
     };
 }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];
 declare function createConfirmReservationActionObject4COAByOrder(params: {
     order: factory.order.IOrder & {
-        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+        acceptedOffers: IAcceptedOffer[];
     };
 }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA>[];
 declare function createConfirmRegisterServiceActionObjectByOrder(params: {
@@ -20,4 +21,4 @@ declare function createConfirmRegisterServiceActionObjectByOrder(params: {
     };
 }): factory.action.interact.confirm.registerService.IObject[];
 type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-export { IExternalOrder, createInformTasks, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder, createConfirmRegisterServiceActionObjectByOrder };
+export { IAcceptedOffer, IExternalOrder, createInformTasks, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder, createConfirmRegisterServiceActionObjectByOrder };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js

@@ -49,7 +49,9 @@ exports.createInformTasks = createInformTasks;
 function creteOrder4inform(order) {
     return Object.assign({ 
         // whitelistで作成する(2022-07-19~)
-        project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: (settings_1.USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING) ? order.acceptedOffers : [], numAcceptedOffers: order.acceptedOffers.length, orderStatus: order.orderStatus, orderDate: order.orderDate, 
+        project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: [], 
+        // numAcceptedOffers: order.acceptedOffers.length,
+        numAcceptedOffers: order.numAcceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
         // mask
         customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order, { noProfile: false })), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
             // identifierは必要

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.d.ts

@@ -1,11 +1,12 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-import { IExternalOrder } from './onOrderProcessing/factory';
+import { IAcceptedOffer, IExternalOrder } from './onOrderProcessing/factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderProcessing(params: {
     order: Omit<factory.order.IOrder, 'orderStatus'> & {
         orderStatus: factory.orderStatus.OrderProcessing;
-        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+        acceptedOffers: IAcceptedOffer[];
+        numAcceptedOffers: number;
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -21,7 +21,6 @@ const settings_1 = require("../../../settings");
 const createSendEmailMessageTaskIfNotExist_1 = require("./onOrderProcessing/createSendEmailMessageTaskIfNotExist");
 const factory_1 = require("./onOrderProcessing/factory");
 const debug = createDebug('chevre-domain:service:order');
-const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
 function onOrderProcessing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -45,8 +44,8 @@ function onOrderProcessing(params) {
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
                 tasks = [
-                    ...(0, factory_1.createInformTasks)(params.order),
-                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
+                    ...(0, factory_1.createInformTasks)(params.order)
+                    // ...await createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos) // ひとまず保留
                 ];
                 break;
             default:
@@ -108,58 +107,67 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
         })));
     });
 }
-function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = new Date();
-        if (USE_CONFIRM_REGISTER_SERVICE_TRANSACTION) {
-            const confirmObjects = (0, factory_1.createConfirmRegisterServiceActionObjectByOrder)({ order });
-            const tasks = [];
-            yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
-                // 冗長なタスク作成を回避
-                const existingTasks = yield repos.task.search({
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: order.project.id } },
-                    name: factory.taskName.ConfirmReserveTransaction,
-                    data: {
-                        object: { transactionNumber: { $eq: confirmObject.transactionNumber } },
-                        purpose: { orderNumber: { $eq: order.orderNumber } }
-                    }
-                }, {
-                    data: 0, executionResults: 0, name: 0, numberOfTried: 0,
-                    remainingNumberOfTries: 0, runsAt: 0, status: 0
-                });
-                if (existingTasks.length === 0) {
-                    const data = {
-                        project: order.project,
-                        typeOf: factory.actionType.ConfirmAction,
-                        object: confirmObject,
-                        agent: order.project,
-                        purpose: simpleOrder,
-                        instrument: {
-                            typeOf: 'WebAPI',
-                            identifier: factory.service.webAPI.Identifier.Chevre
-                        }
-                    };
-                    tasks.push({
-                        project: order.project,
-                        name: factory.taskName.ConfirmRegisterServiceTransaction,
-                        status: factory.taskStatus.Ready,
-                        runsAt: taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data
-                    });
-                }
-            })));
-            return tasks;
-        }
-        else {
-            return [];
-        }
-    });
-}
+// function createConfirmRegisterServiceTransactionTasks(
+//     order: factory.order.IOrder & {
+//         acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+//     },
+//     simpleOrder: factory.order.ISimpleOrder
+// ) {
+//     return async (repos: {
+//         task: TaskRepo;
+//     }): Promise<factory.task.IAttributes<factory.taskName.ConfirmRegisterServiceTransaction>[]> => {
+//         const taskRunsAt = new Date();
+//         if (USE_CONFIRM_REGISTER_SERVICE_TRANSACTION) {
+//             const confirmObjects = createConfirmRegisterServiceActionObjectByOrder({ order });
+//             const tasks: factory.task.IAttributes<factory.taskName.ConfirmRegisterServiceTransaction>[] = [];
+//             await Promise.all(confirmObjects.map(async (confirmObject) => {
+//                 // 冗長なタスク作成を回避
+//                 const existingTasks = await repos.task.search(
+//                     {
+//                         limit: 1,
+//                         page: 1,
+//                         project: { id: { $eq: order.project.id } },
+//                         name: factory.taskName.ConfirmReserveTransaction,
+//                         data: {
+//                             object: { transactionNumber: { $eq: confirmObject.transactionNumber } },
+//                             purpose: { orderNumber: { $eq: order.orderNumber } }
+//                         }
+//                     },
+//                     {
+//                         data: 0, executionResults: 0, name: 0, numberOfTried: 0,
+//                         remainingNumberOfTries: 0, runsAt: 0, status: 0
+//                     }
+//                 );
+//                 if (existingTasks.length === 0) {
+//                     const data: factory.task.IData<factory.taskName.ConfirmRegisterServiceTransaction> = {
+//                         project: order.project,
+//                         typeOf: factory.actionType.ConfirmAction,
+//                         object: confirmObject,
+//                         agent: order.project,
+//                         purpose: simpleOrder,
+//                         instrument: {
+//                             typeOf: 'WebAPI',
+//                             identifier: factory.service.webAPI.Identifier.Chevre
+//                         }
+//                     };
+//                     tasks.push({
+//                         project: order.project,
+//                         name: factory.taskName.ConfirmRegisterServiceTransaction,
+//                         status: factory.taskStatus.Ready,
+//                         runsAt: taskRunsAt,
+//                         remainingNumberOfTries: 10,
+//                         numberOfTried: 0,
+//                         executionResults: [],
+//                         data
+//                     });
+//                 }
+//             }));
+//             return tasks;
+//         } else {
+//             return [];
+//         }
+//     };
+// }
 function createGivePointAwardTaskIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;

package/lib/chevre/service/task/confirmReserveTransaction.d.ts

@@ -1,5 +1,6 @@
 import { IOperation } from '../task';
 import * as factory from '../../factory';
+import { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -16,6 +17,7 @@ export declare function confirmReserveTransaction(params: factory.action.interac
     sendOrder: boolean;
     useOnOrderStatusChanged: boolean;
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;

package/lib/chevre/service/task/confirmReserveTransaction.js

@@ -10,19 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReserveTransaction = exports.call = void 0;
-const COA = require("@motionpicture/coa-service");
 const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const reservation_1 = require("../../repo/reservation");
 const task_1 = require("../../repo/task");
 const ReserveTransactionService = require("../assetTransaction/reserve");
-const credentials_1 = require("../../credentials");
-const coaAuthClient = new COA.auth.RefreshToken({
-    endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken
-});
+const COAReserveService = require("../assetTransaction/reserveCOA");
 /**
  * タスク実行関数
  */
@@ -32,6 +28,7 @@ function call(data) {
             sendOrder: true,
             useOnOrderStatusChanged: true
         })({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
@@ -54,22 +51,12 @@ function confirmReserveTransaction(params, options) {
             switch (params.instrument.identifier) {
                 case factory.service.webAPI.Identifier.COA:
                     // COA本予約
-                    // 未本予約であれば実行(COA本予約は一度成功すると成功できない)
                     object = object;
-                    // リトライ可能な前提でつくる必要があるので、要注意
-                    // すでに本予約済みかどうか確認
-                    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: object.theaterCode,
-                        reserveNum: object.tmpReserveNum,
-                        telNum: object.telNum
-                    });
-                    if (stateReserveResult === null) {
-                        yield reserveService.updReserve(object);
-                    }
+                    yield COAReserveService.confirm({
+                        project: { id: confirmActionAttributes.project.id },
+                        object,
+                        purpose: confirmActionAttributes.purpose
+                    })(repos);
                     break;
                 default:
                     // 予約取引確定

package/lib/chevre/settings.d.ts

@@ -39,7 +39,6 @@ export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const USE_OPTIMIZE_TICKET_OFFER: boolean;
 export declare const USE_FETCH_API: boolean;
 export declare const USE_INFORM_ORDER_IN_TRANSIT: boolean;
-export declare const USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING: boolean;
 export declare const USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING: boolean;
 export declare const USE_VERIFY_ACCEPTED_OFFERS: boolean;
 export declare const USE_MINIMIZED_PAY_TASK: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_VERIFY_ACCEPTED_OFFERS = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_KANA_NAME_IN_ACCEPTED_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_VERIFY_ACCEPTED_OFFERS = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -63,7 +63,6 @@ exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1
 exports.USE_OPTIMIZE_TICKET_OFFER = process.env.USE_OPTIMIZE_TICKET_OFFER === '1';
 exports.USE_FETCH_API = process.env.USE_FETCH_API === '1';
 exports.USE_INFORM_ORDER_IN_TRANSIT = process.env.USE_INFORM_ORDER_IN_TRANSIT === '1';
-exports.USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING = process.env.USE_INFORM_ACCEPTED_OFFERS_ON_ORDER_PROCESSING === '1';
 exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = process.env.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING === '1';
 exports.USE_VERIFY_ACCEPTED_OFFERS = process.env.USE_VERIFY_ACCEPTED_OFFERS === '1';
 exports.USE_MINIMIZED_PAY_TASK = process.env.USE_MINIMIZED_PAY_TASK === '1';

package/package.json

@@ -12,7 +12,7 @@
     "@aws-sdk/credential-providers": "3.433.0",
     "@chevre/factory": "4.352.0-alpha.4",
     "@cinerino/sdk": "5.9.0-alpha.1",
-    "@motionpicture/coa-service": "9.2.0",
+    "@motionpicture/coa-service": "9.3.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0-alpha.0",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.2.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.41"
+  "version": "21.20.0-alpha.43"
 }