@chevre/domain 21.20.0-alpha.8 → 21.20.0

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

@@ -10,25 +10,30 @@ 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 createDebug = require("debug");
+const google_libphonenumber_1 = require("google-libphonenumber");
+const util_1 = require("util");
 const factory = require("../../factory");
+// import { USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK_VERIFY } from '../../settings';
+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");
+const debug = createDebug('chevre-domain:service:task');
 /**
  * タスク実行関数
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield confirmReserveTransaction(data)({
+        yield confirmReserveTransaction(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),
@@ -38,39 +43,145 @@ function call(data) {
     });
 }
 exports.call = call;
+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 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 });
+    });
+}
 /**
  * 予約を確定する
  */
-function confirmReserveTransaction(params) {
+function confirmReserveTransaction(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let confirmActionObject;
+        switch (params.instrument.identifier) {
+            case factory.service.webAPI.Identifier.COA:
+                // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
+                const order = yield fixOrderAsPurpose({
+                    project: { id: params.project.id },
+                    purpose: params.purpose
+                })(repos);
+                const updReserveArgs = createConfirmObject4COAByOrder({ order, reservationNumber: params.object.transactionNumber });
+                debug('confirming coa reserve transaction...', order, updReserveArgs);
+                const object4coa = Object.assign(Object.assign({}, updReserveArgs), { transactionNumber: params.object.transactionNumber, typeOf: 'COAReserveTransaction' });
+                // if (USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK_VERIFY) {
+                //     const isValidObject = JSON.stringify(object4coa) === JSON.stringify(params.object);
+                //     debug('confirmActionObject === params.object?', isValidObject);
+                //     if (!isValidObject) {
+                //         throw new factory.errors.Argument('object', 'object4coa !== params.object');
+                //     }
+                // }
+                // 上書き
+                confirmActionObject = object4coa;
+                // if (USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK) {
+                //     // 上書き
+                //     confirmActionObject = object4coa;
+                // } else {
+                //     confirmActionObject = <factory.action.interact.confirm.reservation.IObject4COA>params.object;
+                // }
+                break;
+            default:
+                confirmActionObject = params.object;
+        }
         // アクション開始
-        const confirmActionAttributes = params;
+        const confirmActionAttributes = Object.assign(Object.assign({}, params), { object: confirmActionObject });
         const action = yield repos.action.start(confirmActionAttributes);
+        let updReserveResult;
         try {
-            let object = confirmActionAttributes.object;
+            const object = confirmActionAttributes.object;
             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);
-                    }
+                    updReserveResult = yield COAReserveService.confirm({
+                        project: { id: confirmActionAttributes.project.id },
+                        object: object,
+                        purpose: confirmActionAttributes.purpose
+                    })({});
                     break;
                 default:
                     // 予約取引確定
-                    object = object;
                     yield ReserveTransactionService.confirm({
                         transactionNumber: object.transactionNumber,
                         potentialActions: object.potentialActions
@@ -87,8 +198,44 @@ function confirmReserveTransaction(params) {
             throw error;
         }
         // アクション完了
-        const result = {};
-        yield repos.action.complete({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        const result = { updReserveResult };
+        yield repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        // sendOrder連携(2024-01-11~)
+        yield onConfirmed(confirmActionAttributes, options)({
+            task: repos.task
+        });
     });
 }
 exports.confirmReserveTransaction = confirmReserveTransaction;
+function onConfirmed(params, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (options.sendOrder === true) {
+            // タスク冪等作成
+            const onAssetTransactionStatusChangedTaskData = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: {
+                    typeOf: params.object.typeOf,
+                    transactionNumber: params.object.transactionNumber,
+                    status: factory.transactionStatusType.Confirmed
+                },
+                purpose: {
+                    confirmationNumber: '',
+                    orderNumber: params.purpose.orderNumber,
+                    typeOf: factory.order.OrderType.Order
+                },
+                useOnOrderStatusChanged: options.useOnOrderStatusChanged === true
+            };
+            const onAssetTransactionStatusChangedTask = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                name: factory.taskName.OnAssetTransactionStatusChanged,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: onAssetTransactionStatusChangedTaskData
+            };
+            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+        }
+    });
+}

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

@@ -0,0 +1,6 @@
+import { IOperation } from '../task';
+import * as factory from '../../factory';
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.IData<factory.taskName.CreateAccountingReport>): IOperation<void>;

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

@@ -0,0 +1,80 @@
+"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.call = void 0;
+const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
+const accountingReport_1 = require("../../repo/accountingReport");
+const action_1 = require("../../repo/action");
+const order_1 = require("../../repo/order");
+const createAccountingReportIfNotExist_1 = require("../order/createAccountingReportIfNotExist");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
+        yield createAccountingReport(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(connection),
+            accountingReport: new accountingReport_1.MongoRepository(connection),
+            action: new action_1.MongoRepository(connection),
+            order: new order_1.MongoRepository(connection)
+        });
+    });
+}
+exports.call = call;
+function createAccountingReport(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const order = yield repos.order.findByOrderNumber({
+            orderNumber: params.object.mainEntity.orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: []
+        });
+        const simpleOrder = {
+            typeOf: order.typeOf,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
+            customer: { typeOf: order.customer.typeOf, id: order.customer.id },
+            orderNumber: order.orderNumber,
+            price: order.price,
+            priceCurrency: order.priceCurrency,
+            orderDate: order.orderDate
+        };
+        const actionAttributes = {
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.CreateAction,
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            object: Object.assign(Object.assign({}, params), { typeOf: 'Report' }),
+            purpose: simpleOrder
+        };
+        const action = yield repos.action.start(actionAttributes);
+        try {
+            const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                orderNumber: { $eq: params.object.mainEntity.orderNumber },
+                project: { id: { $eq: params.project.id } }
+            });
+            yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(Object.assign(Object.assign({}, order), { acceptedOffers }))(repos);
+        }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+    });
+}

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

@@ -18,7 +18,8 @@ const credentials_1 = require("../../credentials");
 const OfferService = require("../offer");
 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
 });
 /**
  * タスク実行関数

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

@@ -91,7 +91,6 @@ function onAuthorizationCreated(params) {
                 reservationNumbers: reservationNumbers,
                 reservationFor: { ids: reservationForIds }
             },
-            reserveIfNotYet: params.reserveIfNotYet,
             purpose: { code: params.code }
         })({
             action: repos.action,

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -128,7 +128,7 @@ function deleteResourcesByScreeningEventSeries(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -162,7 +162,7 @@ function deleteResourcesByScreeningRoom(params) {
             }
             throw error;
         }
-        yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
     });
 }
 function deleteResourcesByMovieTheater(params) {
@@ -206,7 +206,7 @@ function deleteResourcesByMovieTheater(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -269,7 +269,7 @@ function deleteResourcesBySeller(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -309,7 +309,7 @@ function deleteResourcesByAggregateOffer(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -369,7 +369,7 @@ function deleteResourcesByOfferCatalog(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }
@@ -411,7 +411,7 @@ function deleteResourcesByProduct(params) {
                 }
                 throw error;
             }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+            yield repos.action.completeWithVoid({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
         }
     });
 }

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

@@ -10,9 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
+const order_1 = require("../../repo/order");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -26,9 +29,12 @@ const PaymentService = require("../payment");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield PaymentService.pay(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
             paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
             paymentService: new paymentService_1.MongoRepository(settings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),

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

@@ -14,6 +14,7 @@ const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const OrderService = require("../order");
@@ -21,17 +22,15 @@ const OrderService = require("../order");
  * タスク実行関数
  */
 function call(data) {
-    return (settings) => __awaiter(this, void 0, void 0, function* () {
-        // if (settings.redisClient === undefined) {
-        //     throw new factory.errors.Argument('settings', 'redisClient required');
-        // }
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
         yield OrderService.placeOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
-            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
-            action: new action_1.MongoRepository(settings.connection),
-            order: new order_1.MongoRepository(settings.connection),
-            task: new task_1.MongoRepository(settings.connection),
-            transaction: new transaction_1.MongoRepository(settings.connection)
+            acceptedOffer: new acceptedOffer_1.MongoRepository(connection),
+            accountingReport: new accountingReport_1.MongoRepository(connection),
+            action: new action_1.MongoRepository(connection),
+            order: new order_1.MongoRepository(connection),
+            orderInTransaction: new orderInTransaction_1.MongoRepository(connection),
+            task: new task_1.MongoRepository(connection),
+            transaction: new transaction_1.MongoRepository(connection)
         });
     });
 }

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

@@ -22,9 +22,6 @@ const returnOrder_1 = require("../order/returnOrder");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        // if (settings.redisClient === undefined) {
-        //     throw new factory.errors.Argument('settings', 'redisClient required');
-        // }
         yield (0, returnOrder_1.returnOrder)(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),

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

@@ -111,7 +111,7 @@ function returnPayTransaction(params) {
             throw error;
         }
         const result = { refundTransaction };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         // 潜在アクション
         yield onRefund(refundActionAttributes)({ task: repos.task });
     });

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

@@ -22,7 +22,8 @@ const CancelReservationTransactionService = require("../assetTransaction/cancelR
 const credentials_1 = require("../../credentials");
 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
 });
 /**
  * タスク実行関数
@@ -68,7 +69,7 @@ function cancelReservation(params) {
             }
             throw error;
         }
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
     });
 }
 function processCancelReservation4coa(params) {

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const factory = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
@@ -22,10 +23,13 @@ const OrderService = require("../order");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        // if (settings.redisClient === undefined) {
-        //     throw new factory.errors.Argument('settings', 'redisClient required');
-        // }
-        yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
+        var _a;
+        yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { object: Object.assign(Object.assign({}, data.object), { previousOrderStatus: (typeof data.object.previousOrderStatus === 'string')
+                    ? data.object.previousOrderStatus
+                    : factory.orderStatus.OrderInTransit, acceptedOffers: (typeof ((_a = data.object.acceptedOffers) === null || _a === void 0 ? void 0 : _a.limit) === 'number')
+                    ? data.object.acceptedOffers
+                    : { limit: 50, page: 1 } // 互換性維持対応として指定がない場合に対応
+             }), useOnOrderStatusChanged: true }))({
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),

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

@@ -24,7 +24,7 @@ function call(data) {
         var _a, _b;
         yield (0, reserve_1.useReservation)(Object.assign(Object.assign({ project: data.project, agent: data.agent, object: data.object, 
             // タスク作成前に検証済なので検証不要
-            verifyToken: false, reserveIfNotYet: data.reserveIfNotYet }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
+            verifyToken: false }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
@@ -27,19 +28,14 @@ function call(data) {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection);
-        const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
-        const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
         yield EventOfferService.voidTransaction(data)({
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo,
-            stockHolder: stockHolderRepo,
-            offerRateLimit: offerRateLimitRepo,
-            reservation: reservationRepo,
-            task: taskRepo,
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
+            offerRateLimit: new offer_1.RedisRepository(settings.redisClient),
+            orderInTransaction: new orderInTransaction_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });

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

@@ -261,7 +261,7 @@ function deleteTransactionById(params) {
             deletedReservationNumbers,
             deleteActionResult
         };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 function deleteReservationsByPlaceOrder(params) {

package/lib/chevre/service/transaction/moneyTransfer/potentialActions.js

@@ -20,33 +20,17 @@ function createMoneyTransferActions(params) {
         var _a;
         const actionResult = a.result;
         const pendingTransaction = (_a = a.object.itemOffered.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction;
-        // const fromLocation = params.transaction.object.fromLocation;
         if (actionResult !== undefined && pendingTransaction !== undefined) {
             moneyTransferActions.push({
                 project: params.transaction.project,
                 typeOf: factory.actionType.ConfirmAction,
                 object: {
-                    pendingTransaction: { id: actionResult.responseBody.id },
+                    // pendingTransaction: { id: actionResult.responseBody.id },
                     transactionNumber: pendingTransaction.transactionNumber,
                     typeOf: factory.assetTransactionType.MoneyTransfer
                 },
-                // agent: Projectに統一(2022-05-16~)
                 agent: params.transaction.project,
-                // agent: params.transaction.agent,
-                // ↓recipient廃止(2022-05-16~)
-                // recipient: a.recipient,
-                // amount: {
-                //     typeOf: 'MonetaryAmount',
-                //     value: a.object.itemOffered.amount.value,
-                //     currency: a.object.itemOffered.amount.currency
-                // },
-                // fromLocation: fromLocation,
-                // toLocation: params.transaction.object.toLocation,
-                purpose: {
-                    typeOf: params.transaction.typeOf,
-                    id: params.transaction.id
-                }
-                // ...(typeof a.object.description === 'string') ? { description: a.object.description } : {}
+                purpose: { typeOf: params.transaction.typeOf, id: params.transaction.id }
             });
         }
     });