@chevre/domain 21.2.0-alpha.9 → 21.2.0-alpha.91

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

@@ -10,58 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useReservation = void 0;
-/**
- * 予約サービス
- */
+const createDebug = require("debug");
 const factory = require("../../factory");
-const code_1 = require("../code");
-// import { maskUnderName } from './factory';
+const confirmReservation_1 = require("./confirmReservation");
 const onReservationUsed_1 = require("./potentialActions/onReservationUsed");
-function verifyToken4reservation(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const payload = yield (0, code_1.verifyToken)({
-            project: params.project,
-            agent: params.agent,
-            token: params.token
-        })({});
-        switch (payload.typeOf) {
-            case factory.order.OrderType.Order:
-                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
-                const order = yield repos.order.findByOrderNumberAndReservationId({
-                    orderNumber: payload.orderNumber,
-                    reservationId: params.reservationId
-                });
-                // 注文検索
-                // const order: Pick<factory.order.IOrder, 'orderStatus' | 'acceptedOffers'> =
-                //     await repos.order.findByOrderNumber({
-                //         orderNumber: payload.orderNumber,
-                //         inclusion: ['orderStatus', 'acceptedOffers'],
-                //         exclusion: []
-                //     });
-                // ステータス検証
-                switch (order.orderStatus) {
-                    case factory.orderStatus.OrderDelivered:
-                        break;
-                    default:
-                        throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
-                }
-                // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                // const reservationExistsInOrder = acceptedOffers.some((offer) => {
-                //     return (
-                //         offer.itemOffered.typeOf === factory.reservationType.EventReservation
-                //         || offer.itemOffered.typeOf === factory.reservationType.BusReservation
-                //     )
-                //         && offer.itemOffered.id === params.reservationId;
-                // });
-                // if (!reservationExistsInOrder) {
-                //     throw new factory.errors.NotFound('AcceptedOffer');
-                // }
-                break;
-            default:
-                throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
-        }
-    });
-}
+const verifyToken4reservation_1 = require("./verifyToken4reservation");
+const debug = createDebug('chevre-domain:service:reserve:useReservation');
 /**
  * 予約使用
  */
@@ -71,22 +25,29 @@ function useReservation(params) {
         var _a, _b;
         const now = new Date();
         const reservationId = params.object.id;
+        const token = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.token;
+        if (params.verifyToken === true) {
+            // instrument?.tokenを検証
+            if (typeof token === 'string') {
+                yield (0, verifyToken4reservation_1.verifyToken4reservation)({
+                    project: { id: params.project.id },
+                    agent: params.agent,
+                    reservationId,
+                    token
+                })({ order: repos.order });
+            }
+        }
+        // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
+        debug('reserveIfNotYet?', params.reserveIfNotYet, 'id:', params.object.id);
+        if (params.reserveIfNotYet === true) {
+            yield reserveIfNotYet({ object: params.object })(repos);
+        }
         // 予約検索
         // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
             id: reservationId,
-            inclusion: ['id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+            inclusion: ['_id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
-        // instrument?.tokenを検証
-        const token = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.token;
-        if (typeof token === 'string') {
-            yield verifyToken4reservation({
-                project: { id: reservation.project.id },
-                agent: params.agent,
-                reservationId,
-                token
-            })({ order: repos.order });
-        }
         // UseActionを作成する
         const reservationAsObject = {
             id: reservation.id,
@@ -99,8 +60,6 @@ function useReservation(params) {
         const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), 
             // object最適化(2023-01-30~)
             // どの予約を
-            // mask
-            // object: [maskUnderName(reservation)],
             object: [reservationAsObject] }, (typeof ((_b = params.location) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? {
                 location: {
@@ -118,14 +77,6 @@ function useReservation(params) {
         try {
             // 使用日時と同時更新(2023-01-30~)
             attendedReservation = (yield repos.reservation.attendIfNotAttended({ id: reservationId, now }));
-            // attendedReservation = <IEventReservation>await repos.reservation.attend({ id: reservationId, now });
-            // // 使用日時がなければ追加
-            // if (attendedReservation.reservedTicket?.dateUsed === undefined) {
-            //     attendedReservation = await repos.reservation.updatePartiallyById({
-            //         id: attendedReservation.id,
-            //         update: { 'reservedTicket.dateUsed': now }
-            //     });
-            // }
         }
         catch (error) {
             // actionにエラー結果を追加
@@ -145,3 +96,42 @@ function useReservation(params) {
     });
 }
 exports.useReservation = useReservation;
+function reserveIfNotYet(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let reserveTransactions = [];
+        if (typeof params.object.id === 'string' && params.object.id.length > 0) {
+            reserveTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Reserve,
+                object: {
+                    reservations: { id: { $in: [params.object.id] } }
+                },
+                statuses: [factory.transactionStatusType.Confirmed]
+            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. id:', params.object.id);
+        }
+        yield Promise.all(reserveTransactions.map((reserveTransaction) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (typeof ((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                yield (0, confirmReservation_1.confirmReservation)({
+                    actionAttributesList: [{
+                            project: reserveTransaction.project,
+                            typeOf: factory.actionType.ReserveAction,
+                            object: {
+                                typeOf: reserveTransaction.object.typeOf,
+                                reservationNumber: reserveTransaction.object.reservationNumber,
+                                reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
+                                    ? reserveTransaction.object.reservationStatus
+                                    : factory.reservationStatusType.ReservationPending,
+                                reservationFor: reserveTransaction.object.reservationFor
+                            },
+                            agent: reserveTransaction.project,
+                            purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }
+                        }],
+                    useOnReservationConfirmed: false,
+                    byTask: false
+                })(repos);
+                debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.object.reservationNumber);
+            }
+        })));
+    });
+}

package/lib/chevre/service/reserve/verifyToken4reservation.d.ts

@@ -0,0 +1,15 @@
+import * as factory from '../../factory';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+/**
+ * 予約使用のためのチケットトークンを検証する
+ */
+export declare function verifyToken4reservation(params: {
+    project: {
+        id: string;
+    };
+    agent: factory.action.check.token.IAgent;
+    reservationId: string;
+    token: string;
+}): (repos: {
+    order: OrderRepo;
+}) => Promise<void>;

package/lib/chevre/service/reserve/verifyToken4reservation.js

@@ -0,0 +1,56 @@
+"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.verifyToken4reservation = void 0;
+const factory = require("../../factory");
+const code_1 = require("../code");
+/**
+ * 予約使用のためのチケットトークンを検証する
+ */
+function verifyToken4reservation(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const payload = yield (0, code_1.verifyToken)({
+            project: params.project,
+            agent: params.agent,
+            token: params.token
+        })({});
+        switch (payload.typeOf) {
+            case factory.order.OrderType.Order:
+                // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
+                const order = yield repos.order.findByOrderNumberAndReservationId({
+                    orderNumber: payload.orderNumber,
+                    reservationId: params.reservationId
+                });
+                // ステータス検証
+                switch (order.orderStatus) {
+                    case factory.orderStatus.OrderDelivered:
+                        break;
+                    default:
+                        throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
+                }
+                // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+                // const reservationExistsInOrder = acceptedOffers.some((offer) => {
+                //     return (
+                //         offer.itemOffered.typeOf === factory.reservationType.EventReservation
+                //         || offer.itemOffered.typeOf === factory.reservationType.BusReservation
+                //     )
+                //         && offer.itemOffered.id === params.reservationId;
+                // });
+                // if (!reservationExistsInOrder) {
+                //     throw new factory.errors.NotFound('AcceptedOffer');
+                // }
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
+        }
+    });
+}
+exports.verifyToken4reservation = verifyToken4reservation;

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

@@ -3,7 +3,8 @@
  */
 import { maskUnderName } from './reserve/factory';
 import { cancelPendingReservation, cancelReservation } from './reserve/cancelReservation';
-import { checkInRerservation } from './reserve/checkInReservation';
+import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { useReservation } from './reserve/useReservation';
-export { maskUnderName, cancelPendingReservation, cancelReservation, checkInRerservation, confirmReservation, useReservation };
+import { verifyToken4reservation } from './reserve/verifyToken4reservation';
+export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, useReservation, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useReservation = exports.confirmReservation = exports.checkInRerservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
+exports.verifyToken4reservation = exports.useReservation = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
 /**
  * 予約サービス
  */
@@ -10,8 +10,10 @@ const cancelReservation_1 = require("./reserve/cancelReservation");
 Object.defineProperty(exports, "cancelPendingReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelPendingReservation; } });
 Object.defineProperty(exports, "cancelReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelReservation; } });
 const checkInReservation_1 = require("./reserve/checkInReservation");
-Object.defineProperty(exports, "checkInRerservation", { enumerable: true, get: function () { return checkInReservation_1.checkInRerservation; } });
+Object.defineProperty(exports, "checkInReservation", { enumerable: true, get: function () { return checkInReservation_1.checkInReservation; } });
 const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const useReservation_1 = require("./reserve/useReservation");
 Object.defineProperty(exports, "useReservation", { enumerable: true, get: function () { return useReservation_1.useReservation; } });
+const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");
+Object.defineProperty(exports, "verifyToken4reservation", { enumerable: true, get: function () { return verifyToken4reservation_1.verifyToken4reservation; } });

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

@@ -95,7 +95,7 @@ function onRegistered(actionAttributes) {
             taskAttributes.push(...orderProgramMembershipTasks);
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onRegistered = onRegistered;

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

@@ -10,8 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const order_1 = require("../../repo/order");
+const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
 const transaction_1 = require("../../repo/transaction");
 const TransactionService = require("../transaction");
@@ -20,15 +23,14 @@ const TransactionService = require("../transaction");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         yield TransactionService.deleteTransaction(data)({
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo,
-            reservation: reservationRepo,
-            transaction: transactionRepo
+            accountingReport: new accountingReport_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),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -35,6 +35,10 @@ function call(data) {
             offer: offerRepo,
             masterService
         });
+        yield OfferService.event.importCategoryCodesFromCOA(data)({
+            categoryCode: categoryCodeRepo,
+            masterService
+        });
     });
 }
 exports.call = call;

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

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.onAuthorizationCreated.IData): IOperation<void>;

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

@@ -0,0 +1,108 @@
+"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 action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
+const code_1 = require("../../repo/code");
+const order_1 = require("../../repo/order");
+const ownershipInfo_1 = require("../../repo/ownershipInfo");
+const reservation_1 = require("../../repo/reservation");
+const task_1 = require("../../repo/task");
+const reserve_1 = require("../reserve");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        yield onAuthorizationCreated(data)({
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            code: new code_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;
+function onAuthorizationCreated(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 発券対象予約ID
+        let reservationIds = [];
+        // 発券対象予約番号
+        let reservationNumbers = [];
+        // 発券対象イベントID
+        let reservationForIds = [];
+        const authorizationObject = yield repos.code.findOne({
+            code: params.code,
+            project: { id: params.project.id, typeOf: factory.organizationType.Project }
+        });
+        switch (authorizationObject.typeOf) {
+            case factory.order.OrderType.Order:
+                // 注文検索
+                const orderNumber = authorizationObject.orderNumber;
+                if (typeof orderNumber === 'string' && orderNumber.length > 0) {
+                    // 最適化(2023-01-28~)
+                    const order = yield repos.order.findByOrderNumber({
+                        orderNumber,
+                        inclusion: ['acceptedOffers'],
+                        exclusion: []
+                    });
+                    const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+                    reservationNumbers = acceptedOffers
+                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
+                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                        .map((o) => o.itemOffered.reservationNumber);
+                    reservationNumbers = [...new Set(reservationNumbers)];
+                    reservationForIds = acceptedOffers
+                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
+                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                        .map((o) => String(o.itemOffered.reservationFor.id));
+                    reservationForIds = [...new Set(reservationForIds)];
+                }
+                break;
+            case 'OwnershipInfo':
+                // 所有権検索
+                const ownershipInfoId = authorizationObject.id;
+                if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
+                    const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
+                    // 座席予約に対する所有権であれば発券
+                    if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
+                        || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {
+                        const reservationId = String(ownershipInfo.typeOfGood.id);
+                        reservationIds = [reservationId];
+                        const reservation = yield repos.reservation.findById({ id: reservationId });
+                        reservationForIds = [String(reservation.reservationFor.id)];
+                    }
+                }
+                break;
+            default:
+            // no op
+        }
+        yield (0, reserve_1.checkInReservation)({
+            project: { id: params.project.id },
+            object: {
+                ids: reservationIds,
+                reservationNumbers: reservationNumbers,
+                reservationFor: { ids: reservationForIds }
+            },
+            reserveIfNotYet: params.reserveIfNotYet
+        })({
+            action: repos.action,
+            assetTransaction: repos.assetTransaction,
+            reservation: repos.reservation,
+            task: repos.task
+        });
+    });
+}

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

@@ -32,7 +32,7 @@ function call(data) {
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
-        yield OrderService.placeOrder(data)({
+        yield OrderService.placeOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             accountingReport: accountingReportRepo,
             action: actionRepo,
             order: orderRepo,

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
 const reservation_1 = require("../../repo/reservation");
 const task_1 = require("../../repo/task");
 const ReserveService = require("../reserve");
@@ -19,13 +20,15 @@ const ReserveService = require("../reserve");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        yield ReserveService.confirmReservation(data.actionAttributes)({
-            action: actionRepo,
-            reservation: reservationRepo,
-            task: taskRepo
+        yield ReserveService.confirmReservation({
+            actionAttributesList: data.actionAttributes,
+            useOnReservationConfirmed: true,
+            byTask: true
+        })({
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -32,7 +32,7 @@ function call(data) {
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
-        yield OrderService.returnOrder(data)({
+        yield OrderService.returnOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             action: actionRepo,
             order: orderRepo,
             ownershipInfo: ownershipInfoRepo,

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

@@ -134,13 +134,7 @@ function refundTransactionAlreadyExists(params) {
             typeOf: factory.assetTransactionType.Refund,
             statuses: [factory.transactionStatusType.Confirmed],
             object: { paymentMethodId: { $eq: params.object.paymentMethodId } }
-        }, {
-            agent: 0,
-            object: 0,
-            potentialActions: 0,
-            recipient: 0,
-            result: 0
-        });
+        }, ['_id'], []);
         return refundTransactions.length > 0;
     });
 }
@@ -219,10 +213,6 @@ function onRefund(refundActionAttributes) {
             });
         }
         // タスク保管
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     return repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

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

@@ -32,7 +32,7 @@ function call(data) {
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
-        yield OrderService.sendOrder(data)({
+        yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             action: actionRepo,
             order: orderRepo,
             ownershipInfo: ownershipInfoRepo,

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

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.useReservation.IData): IOperation<void>;

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

@@ -0,0 +1,36 @@
+"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 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 reserve_1 = require("../reserve");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        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))({
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

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

@@ -17,6 +17,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
 const EventOfferService = require("../offer/event");
 /**
  * タスク実行関数
@@ -38,7 +39,8 @@ function call(data) {
             stockHolder: stockHolderRepo,
             offerRateLimit: offerRateLimitRepo,
             reservation: reservationRepo,
-            task: taskRepo
+            task: taskRepo,
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -16,11 +16,20 @@ export type TaskOperation<T> = (repos: {
     task: TaskRepo;
 }) => Promise<T>;
 export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+export declare function executeById(params: {
+    id: string;
+    executor?: {
+        name: string;
+    };
+}): IOperation<void>;
 /**
  * タスク名でタスクをひとつ実行する
  */
 export declare function executeByName<T extends factory.taskName>(params: {
     name: T;
+    executor?: {
+        name: string;
+    };
 }): IOperation<void>;
 /**
  * タスクを実行する