@chevre/domain 21.2.0-alpha.4 → 21.2.0-alpha.41

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

@@ -5,6 +5,7 @@ import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/o
 import { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
+import { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IVoidTransactionRepos {
     action: ActionRepo;
@@ -13,6 +14,7 @@ interface IVoidTransactionRepos {
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
+    transaction: TransactionRepo;
 }
 /**
  * イベントオファー承認取消(タスクから実行)

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

@@ -26,8 +26,13 @@ exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const transaction = yield repos.transaction.findById({
+            typeOf: params.purpose.typeOf,
+            id: params.purpose.id,
+            inclusion: ['_id', 'typeOf', 'status']
+        });
         // 座席仮予約アクション検索
-        const authorizeActions = yield repos.action.searchByPurpose({
+        let authorizeActions = yield repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -36,6 +41,17 @@ function voidTransaction(params) {
         })
             .then((actions) => actions
             .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation));
+        switch (transaction.status) {
+            case factory.transactionStatusType.InProgress:
+                throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
+            // 確定取引に対応(2023-05-07~)
+            case factory.transactionStatusType.Confirmed:
+                // アクションステータスを検証する
+                authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                break;
+            default:
+            // no op
+        }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
             switch (action.instrument.identifier) {

package/lib/chevre/service/offer.js

@@ -186,7 +186,7 @@ function createAggregateScreeningEventIfNotExist(params) {
             }
         }
         if (aggregateTasks.length > 0) {
-            yield repos.task.saveMany(aggregateTasks);
+            yield repos.task.saveMany(aggregateTasks, { emitImmediately: true });
         }
     });
 }

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

@@ -89,7 +89,7 @@ function onOrderStatusChanged(params) {
                 break;
             default:
         }
-        yield repos.task.saveMany(tasks);
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
     });
 }
 exports.onOrderStatusChanged = onOrderStatusChanged;

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

@@ -269,6 +269,6 @@ function onPlaceOrder(params) {
             }
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

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

@@ -204,10 +204,6 @@ function onReturn(returnActionAttributes) {
             }
         }
         // タスク保管
-        // 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/order/sendOrder.js

@@ -178,6 +178,6 @@ function onSend(params) {
             }
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/payment/any/onPaid.js

@@ -46,7 +46,7 @@ function onPaid(payAction) {
             }));
         }
         // タスク保管
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onPaid = onPaid;

package/lib/chevre/service/payment/any/onRefund.js

@@ -92,7 +92,7 @@ function onRefund(refundAction) {
             }));
         }
         // タスク保管
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onRefund = onRefund;

package/lib/chevre/service/payment/any.js

@@ -52,10 +52,18 @@ exports.voidPayTransaction = voidPayTransaction;
 function invalidatePaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.Argument('purpose.typeOf', `must be ${factory.transactionType.PlaceOrder}`);
+        }
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         });
+        // 確定取引に対応(2023-05-03~)
+        if (transaction.status === factory.transactionStatusType.Confirmed) {
+            // no op
+            return;
+        }
         const paymentMethodIdByPaymentUrl = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
         const paymentMethodType = (_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodIdByPaymentUrl === 'string' && paymentMethodIdByPaymentUrl.length > 0
@@ -70,12 +78,10 @@ function invalidatePaymentUrl(params) {
                         ? transaction.seller.name
                         : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
                     id: transaction.seller.id
-                    // project: transaction.seller.project
                 },
                 recipient: { typeOf: transaction.agent.typeOf, name: transaction.agent.name },
                 object: [{
                         typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
-                        // tslint:disable-next-line:max-line-length
                         id: (_e = (_d = transaction.object.paymentMethods) === null || _d === void 0 ? void 0 : _d.issuedThrough) === null || _e === void 0 ? void 0 : _e.id,
                         paymentMethod: {
                             additionalProperty: [],
@@ -103,10 +109,11 @@ function processVoidPayTransaction(params) {
             transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
         }
         else {
-            transaction = yield repos.transaction.findById({
+            transaction = (yield repos.transaction.findById({
                 typeOf: params.purpose.typeOf,
-                id: params.purpose.id
-            });
+                id: params.purpose.id,
+                inclusion: ['_id', 'typeOf', 'status']
+            }));
         }
         // 承認アクションを取得
         let authorizeActions;
@@ -122,7 +129,7 @@ function processVoidPayTransaction(params) {
             const authorizeActionsOnTransaction = yield repos.action.searchByPurpose({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
-                    typeOf: factory.transactionType.PlaceOrder,
+                    typeOf: transaction.typeOf,
                     id: transaction.id
                 }
             });
@@ -131,12 +138,20 @@ function processVoidPayTransaction(params) {
                 return ((_a = a.object) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
                     && ((_b = a.instrument) === null || _b === void 0 ? void 0 : _b.identifier) === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
             });
+            switch (transaction.status) {
+                case factory.transactionStatusType.InProgress:
+                    throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
+                // 確定取引に対応(2023-05-03~)
+                case factory.transactionStatusType.Confirmed:
+                    // アクションステータスを検証する
+                    authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                    break;
+                default:
+                // no op
+            }
         }
         const errors = [];
         for (const action of authorizeActions) {
-            // 直列にゆっくり処理する場合↓
-            // tslint:disable-next-line:no-magic-numbers
-            // await new Promise((resolve) => setTimeout(() => { resolve(); }, 1000));
             // 失敗するケースがあっても、残りが少なくとも処理されるようにエラーハンドリング
             try {
                 // 取引が存在すれば中止
@@ -194,7 +209,7 @@ function publishPaymentUrl(params) {
             paymentUrl: result.paymentUrl,
             issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' }
         };
-        yield repos.transaction.findByIdAndUpdate({
+        yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
         });

package/lib/chevre/service/product.js

@@ -77,10 +77,6 @@ function onRegistered(actionAttributes, __) {
             }
         }
         // タスク保管
-        // 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/reserve/cancelReservation.js

@@ -144,7 +144,6 @@ function cancelPendingReservation(actionAttributesList) {
                 // canceledReservationId: canceledReservation?.id
                 );
                 yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                // await onReservationCanceledByAction(actionAttributes)({ task: repos.task });
                 if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
                     // 最新のconfirmedReservationsを検索
                     canceledReservations = yield repos.reservation.search({
@@ -297,7 +296,6 @@ function cancelReservation(actionAttributesList) {
                 // canceledReservationId: canceledReservation?.id
                 );
                 yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                // await onReservationCanceledByAction(actionAttributes)({ task: repos.task });
                 let canceledReservations = [];
                 if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;

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

@@ -4,9 +4,6 @@ type IEventReservation = factory.reservation.IReservation<factory.reservationTyp
 /**
  * 予約取消後のアクション
  */
-export declare function onReservationCanceledByAction(actionAttributes: factory.action.cancel.reservation.IAttributes): (repos: {
-    task: TaskRepo;
-}) => Promise<void>;
 export declare function onReservationCanceled(canceledReservations: IEventReservation[], useInformReservation: boolean): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onReservationCanceled = exports.onReservationCanceledByAction = void 0;
+exports.onReservationCanceled = void 0;
 /**
  * 予約取消時アクション
  */
@@ -19,26 +19,26 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約取消後のアクション
  */
-function onReservationCanceledByAction(actionAttributes) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const potentialActions = actionAttributes.potentialActions;
-        const taskAttributes = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (potentialActions !== undefined) {
-            // no op
-        }
-        // タスク保管
-        if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes);
-        }
-    });
-}
-exports.onReservationCanceledByAction = onReservationCanceledByAction;
+// export function onReservationCanceledByAction(
+//     actionAttributes: factory.action.cancel.reservation.IAttributes
+// ) {
+//     return async (repos: {
+//         task: TaskRepo;
+//     }) => {
+//         const potentialActions = actionAttributes.potentialActions;
+//         const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
+//         if (potentialActions !== undefined) {
+//             // no op
+//         }
+//         // タスク保管
+//         if (taskAttributes.length > 0) {
+//             await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+//         }
+//     };
+// }
 function onReservationCanceled(canceledReservations, useInformReservation) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (Array.isArray(canceledReservations) && canceledReservations.length > 0) {
@@ -50,7 +50,7 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
                 if (Array.isArray(informReservations)) {
                     // やや遅延させる(確定通知が未達の可能性を考慮して)
                     const informTaskRunsAt = moment(now)
-                        .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                        .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                         .toDate();
                     const reservations4inform = canceledReservations.map((r) => {
                         return {
@@ -91,7 +91,7 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes);
+                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
             // 冗長な作成を避ける
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -19,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 // tslint:disable-next-line:max-func-body-length
 function onReservationCheckedIn(params) {
     // tslint:disable-next-line:max-func-body-length
@@ -31,7 +30,7 @@ function onReservationCheckedIn(params) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(params.now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             informReservations.forEach((informReservation) => {
                 var _a;
@@ -107,7 +106,7 @@ function onReservationCheckedIn(params) {
             });
         }
         if (tasks.length > 0) {
-            yield repos.task.saveMany(tasks);
+            yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
         const reservationForIds = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.ids;

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -57,38 +57,9 @@ function onReservationConfirmedByAction(actionAttributes
                 }));
             }
         }
-        // inform galobally
-        // if (Array.isArray(informReservations)) {
-        //     const reservation4inform: IReservation4informConfirmed = maskUnderName(confirmedReservation);
-        //     taskAttributes.push(...informReservations.map<ITriggerWebhookTaskAttributes>((informReservation) => {
-        //         const informUrl: string = String(informReservation.recipient?.url);
-        //         const informReservationAttributes: InformReservationActionattributes = {
-        //             agent: confirmedReservation.project,
-        //             object: [reservation4inform],
-        //             project: confirmedReservation.project,
-        //             recipient: {
-        //                 id: '',
-        //                 name: informUrl,
-        //                 typeOf: factory.creativeWorkType.WebApplication,
-        //                 url: informUrl
-        //             },
-        //             typeOf: factory.actionType.InformAction
-        //         };
-        //         return {
-        //             project: actionAttributes.project,
-        //             name: factory.taskName.TriggerWebhook,
-        //             status: factory.taskStatus.Ready,
-        //             runsAt: now,
-        //             remainingNumberOfTries: NUM_TRY_INFORM_RESERVATION,
-        //             numberOfTried: 0,
-        //             executionResults: [],
-        //             data: informReservationAttributes
-        //         };
-        //     }));
-        // }
         // タスク保管
         if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes);
+            yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
         }
     });
 }
@@ -142,7 +113,7 @@ function onReservationConfirmed(confirmedReservations) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes);
+                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
         }
     });

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -19,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約使用
  */
@@ -32,7 +31,7 @@ function onReservationUsed(action, attendedReservation) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             const reservation4inform = {
                 typeOf: attendedReservation.typeOf,
@@ -97,7 +96,7 @@ function onReservationUsed(action, attendedReservation) {
             }
         }
         if (tasks.length > 0) {
-            yield repos.task.saveMany(tasks);
+            yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
         yield (0, offer_1.createAggregateScreeningEventIfNotExist)({

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

@@ -31,13 +31,6 @@ function verifyToken4reservation(params) {
                     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:
@@ -75,7 +68,7 @@ function useReservation(params) {
         // 取得属性最適化(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;

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/returnPayTransaction.js

@@ -219,10 +219,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/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>;
 /**
  * タスクを実行する

package/lib/chevre/service/task.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notifyAbortedTasks = exports.abort = exports.retry = exports.execute = exports.executeByName = void 0;
+exports.notifyAbortedTasks = exports.abort = exports.retry = exports.execute = exports.executeByName = exports.executeById = void 0;
 /**
  * タスクサービス
  */
@@ -18,19 +18,54 @@ const factory = require("../factory");
 const task_1 = require("../repo/task");
 const NotificationService = require("./notification");
 const factory_1 = require("./notification/factory");
+const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:service:task');
+const DEFAULT_EXECUTOR_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
+function executeById(params) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const taskRepo = new task_1.MongoRepository(settings.connection);
+        // 未実行のタスクを取得
+        // tslint:disable-next-line:no-null-keyword
+        let task = null;
+        try {
+            task = yield taskRepo.executeById({
+                id: params.id,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
+        }
+        catch (error) {
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore next */
+            debug('service.task.executeById error:', error);
+        }
+        // タスクがなければ終了
+        if (task !== null) {
+            yield execute(task)(settings);
+        }
+    });
+}
+exports.executeById = executeById;
 /**
  * タスク名でタスクをひとつ実行する
  */
 function executeByName(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const taskRepo = new task_1.MongoRepository(settings.connection);
         // 未実行のタスクを取得
         // tslint:disable-next-line:no-null-keyword
         let task = null;
         try {
-            task = yield taskRepo.executeOneByName(params);
+            task = yield taskRepo.executeOneByName({
+                name: params.name,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment
@@ -106,7 +141,9 @@ function abort(params) {
             }
             // 開発者へ報告
             const message = (0, factory_1.task2lineNotify)({ task: abortedTask });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }
@@ -123,7 +160,9 @@ function notifyAbortedTasks(params) {
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }

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

@@ -576,9 +576,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;