@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/service/taskHandler/onOperationFailed.js

@@ -1,13 +1,4 @@
 "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.onOperationFailed = onOperationFailed;
 const factory = require("../../factory");
@@ -17,7 +8,7 @@ const USE_INFORM_TASK_RUNNING = process.env.USE_INFORM_TASK_RUNNING === '1';
  * タスク実行失敗時処理
  */
 function onOperationFailed(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let error = params.error;
         const { task, now, next } = params;
         if (typeof error !== 'object') {
@@ -29,15 +20,21 @@ function onOperationFailed(params) {
         if (isRetryable) {
             // 実験的に実行中タスク連携
             if (USE_INFORM_TASK_RUNNING) {
-                yield (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
+                await (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
             }
             const result = {
                 executedAt: now,
                 endDate,
-                error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
+                error: {
+                    ...error,
+                    code: error.code,
+                    message: error.message,
+                    name: error.name,
+                    stack: error.stack
+                }
             };
             // 失敗してもここではステータスを戻さない(Runningのまま待機)
-            yield repos.task.setExecutionResultAndStatus({
+            await repos.task.setExecutionResultAndStatus({
                 id: task.id,
                 remainingNumberOfTries: task.remainingNumberOfTries,
                 name: task.name
@@ -51,13 +48,19 @@ function onOperationFailed(params) {
             // 設定されたnameの場合連携する
             // もしここで連携タスク作成に失敗したとしても、再度Readyタスクとなりリトライされて、処理は冪等となる想定
             // 最終的に、連携タスクが作成され、実行中タスクがAbortedとなればよい
-            yield (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
+            await (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
             const result = {
                 executedAt: now,
                 endDate,
-                error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
+                error: {
+                    ...error,
+                    code: error.code,
+                    message: error.message,
+                    name: error.name,
+                    stack: error.stack
+                }
             };
-            yield repos.task.setExecutionResultAndStatus({
+            await repos.task.setExecutionResultAndStatus({
                 id: task.id,
                 remainingNumberOfTries: task.remainingNumberOfTries,
                 name: task.name
@@ -66,5 +69,5 @@ function onOperationFailed(params) {
                 executionResult: result
             }, (typeof next === 'function') ? next : undefined);
         }
-    });
+    };
 }

package/lib/chevre/service/taskHandler.js

@@ -1,13 +1,4 @@
 "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.executeTask = executeTask;
 const createDebug = require("debug");
@@ -22,9 +13,9 @@ const debug = createDebug('chevre-domain:service:taskHandler');
 function executeTask(task, next) {
     const now = new Date();
     debug('executing an executableTask...', task, now);
-    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
-        const settingRepo = new (yield Promise.resolve().then(() => require('../repo/setting'))).SettingRepo(settings.connection);
-        const taskRepo = new (yield Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
+    return async (settings, options) => {
+        const settingRepo = new (await Promise.resolve().then(() => require('../repo/setting'))).SettingRepo(settings.connection);
+        const taskRepo = new (await Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
         try {
             // 期限検証(2024-04-23~)
             if (task.expires instanceof Date) {
@@ -43,7 +34,7 @@ function executeTask(task, next) {
             }
             // タスク名の関数が定義されていなければ、TypeErrorとなる
             let callResult;
-            const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
+            const { call } = await Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
             switch (task.name) {
                 case factory.taskName.AcceptCOAOffer:
                 case factory.taskName.AggregateOnSystem:
@@ -72,19 +63,23 @@ function executeTask(task, next) {
                 case factory.taskName.SendEmailMessage:
                 case factory.taskName.SyncResourcesFromCOA:
                 case factory.taskName.TriggerWebhook:
-                    callResult = yield call(task)(settings, options);
+                    callResult = await call(task)(settings, options);
                     break;
                 default:
-                    yield call(task.data)(settings);
+                    await call(task.data)(settings);
             }
             const result = {
                 executedAt: now,
                 endDate: new Date(),
                 // enable overwriting task.executionResults.error on Executed(2024-05-29~)
-                error: ((callResult === null || callResult === void 0 ? void 0 : callResult.error) instanceof Error)
-                    ? Object.assign(Object.assign({}, callResult.error), { message: callResult.error.message }) : ''
+                error: (callResult?.error instanceof Error)
+                    ? {
+                        ...callResult.error,
+                        message: callResult.error.message
+                    }
+                    : ''
             };
-            yield taskRepo.setExecutionResultAndStatus({
+            await taskRepo.setExecutionResultAndStatus({
                 id: task.id,
                 remainingNumberOfTries,
                 name: task.name
@@ -94,8 +89,11 @@ function executeTask(task, next) {
             }, (typeof next === 'function') ? next : undefined);
         }
         catch (error) {
-            debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error === null || error === void 0 ? void 0 : error.name, error === null || error === void 0 ? void 0 : error.message);
-            yield (0, onOperationFailed_1.onOperationFailed)(Object.assign({ task, now, error }, (typeof next === 'function') ? { next } : undefined))({ setting: settingRepo, task: taskRepo });
+            debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error?.name, error?.message);
+            await (0, onOperationFailed_1.onOperationFailed)({
+                task, now, error,
+                ...(typeof next === 'function') ? { next } : undefined
+            })({ setting: settingRepo, task: taskRepo });
         }
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "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.deleteTransaction = deleteTransaction;
 const factory = require("../../factory");
@@ -18,19 +9,19 @@ const deleteOrder_1 = require("../order/deleteOrder");
  */
 function deleteTransaction(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (params.object.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
             // transaction.agent.id指定による取引削除に対応(2023-06-30~)
-            yield createDeleteTransactionTasksByAgentId(params)(repos);
+            await createDeleteTransactionTasksByAgentId(params)(repos);
         }
         else {
-            yield deleteTransactionById(params)(repos);
+            await deleteTransactionById(params)(repos);
         }
-    });
+    };
 }
 function createDeleteTransactionTasksByAgentId(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (params.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId) {
             throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.AgentId}`);
         }
@@ -38,7 +29,7 @@ function createDeleteTransactionTasksByAgentId(params) {
         // agentIdによる全取引についてDeleteTransactionタスクを作成する
         if (typeof agentIdSpecified === 'string' && agentIdSpecified.length > 0) {
             const transactionTypeOf = params.object.typeOf;
-            const transactions = yield repos.transaction.projectFields({
+            const transactions = await repos.transaction.projectFields({
                 project: { id: { $eq: params.object.project.id } },
                 agent: {
                     ids: [agentIdSpecified],
@@ -61,11 +52,22 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
-                                        ? { confirmationNumber: transaction.object.confirmationNumber }
-                                        : undefined), (typeof transaction.object.orderNumber === 'string')
-                                        ? { orderNumber: transaction.object.orderNumber }
-                                        : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
+                                object: {
+                                    specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
+                                    id: transaction.id,
+                                    object: {
+                                        ...(typeof transaction.object.confirmationNumber === 'string')
+                                            ? { confirmationNumber: transaction.object.confirmationNumber }
+                                            : undefined,
+                                        ...(typeof transaction.object.orderNumber === 'string')
+                                            ? { orderNumber: transaction.object.orderNumber }
+                                            : undefined
+                                    },
+                                    project: transaction.project,
+                                    startDate: transaction.startDate,
+                                    typeOf: transaction.typeOf,
+                                    ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
+                                }
                             }
                         };
                     });
@@ -81,9 +83,17 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: {
+                                object: {
+                                    specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
+                                    id: transaction.id,
+                                    object: {
                                         order: transaction.object.order
-                                    }, project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
+                                    },
+                                    project: transaction.project,
+                                    startDate: transaction.startDate,
+                                    typeOf: transaction.typeOf,
+                                    ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
+                                }
                             }
                         };
                     });
@@ -99,9 +109,19 @@ function createDeleteTransactionTasksByAgentId(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
-                                        ? { pendingTransaction: transaction.object.pendingTransaction }
-                                        : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
+                                object: {
+                                    specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
+                                    id: transaction.id,
+                                    object: {
+                                        ...(transaction.object.pendingTransaction !== undefined)
+                                            ? { pendingTransaction: transaction.object.pendingTransaction }
+                                            : undefined
+                                    },
+                                    project: transaction.project,
+                                    startDate: transaction.startDate,
+                                    typeOf: transaction.typeOf,
+                                    ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
+                                }
                             }
                         };
                     });
@@ -110,15 +130,14 @@ function createDeleteTransactionTasksByAgentId(params) {
                     throw new factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
             }
             if (deleteTransactionTasks.length > 0) {
-                yield repos.task.saveMany(deleteTransactionTasks, { emitImmediately: true });
+                await repos.task.saveMany(deleteTransactionTasks, { emitImmediately: true });
             }
         }
-    });
+    };
 }
 function deleteTransactionById(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         if (typeof params.object.specifyingMethod === 'string'
             && params.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
             throw new factory.errors.Argument('object.specifyingMethod', `must be ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id}`);
@@ -127,7 +146,7 @@ function deleteTransactionById(params) {
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
             throw new factory.errors.ArgumentNull('object.id');
         }
-        const transaction = (yield repos.transaction.projectFields({
+        const transaction = (await repos.transaction.projectFields({
             ids: [deletingTransactionId],
             typeOf: params.object.typeOf,
             inclusion: ['typeOf', 'project', 'status', 'result']
@@ -152,13 +171,13 @@ function deleteTransactionById(params) {
         let deletedReservationNumbers = [];
         let deleteActionResult;
         let deleteMessagessResult;
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         try {
             const transactionTypeOf = transaction.typeOf;
             switch (transactionTypeOf) {
                 case factory.transactionType.PlaceOrder:
                     // 取引に対する全ての承認アクションを検索
-                    const authorizeActions = yield repos.action.searchByPurpose({
+                    const authorizeActions = await repos.action.searchByPurpose({
                         typeOf: factory.actionType.AuthorizeAction,
                         purpose: {
                             typeOf: transactionTypeOf,
@@ -170,9 +189,9 @@ function deleteTransactionById(params) {
                         case factory.transactionStatusType.Expired:
                             break;
                         case factory.transactionStatusType.Confirmed:
-                            const deletingOrder = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order;
-                            if (typeof (deletingOrder === null || deletingOrder === void 0 ? void 0 : deletingOrder.orderNumber) === 'string') {
-                                yield (0, deleteOrder_1.deleteOrder)({
+                            const deletingOrder = transaction.result?.order;
+                            if (typeof deletingOrder?.orderNumber === 'string') {
+                                await (0, deleteOrder_1.deleteOrder)({
                                     object: deletingOrder
                                 })(repos);
                             }
@@ -183,19 +202,19 @@ function deleteTransactionById(params) {
                     // tslint:disable-next-line:no-suspicious-comment
                     // TODO サービス登録取引を削除
                     // 決済取引を削除
-                    const deletePayTransactionsByPlaceOrderResult = yield deletePayTransactionsByPlaceOrder({ authorizeActions, transaction })(repos);
+                    const deletePayTransactionsByPlaceOrderResult = await deletePayTransactionsByPlaceOrder({ authorizeActions, transaction })(repos);
                     deletePayTransactionResult = deletePayTransactionsByPlaceOrderResult.deletePayTransactionResult;
                     deleteRefundResult = deletePayTransactionsByPlaceOrderResult.deleteRefundResult;
                     payTransactionNumbers = deletePayTransactionsByPlaceOrderResult.payTransactionNumbers;
                     // 取引上での予約を削除
-                    const deleteReservationsByPlaceOrderResult = yield deleteReservationsByPlaceOrder({ authorizeActions, transaction })(repos);
+                    const deleteReservationsByPlaceOrderResult = await deleteReservationsByPlaceOrder({ authorizeActions, transaction })(repos);
                     deleteReservationsResult = deleteReservationsByPlaceOrderResult.deleteResult;
                     deleteReserveTransactionResult = deleteReservationsByPlaceOrderResult.deleteReserveTransactionResult;
                     deleteCancelReservationTransactionResult =
                         deleteReservationsByPlaceOrderResult.deleteCancelReservationTransactionResult;
                     deletedReservationNumbers = deleteReservationsByPlaceOrderResult.reserveTransactionNumbers;
                     // アクション削除(2023-05-19~)
-                    deleteActionResult = yield repos.action.deleteByPurpose({
+                    deleteActionResult = await repos.action.deleteByPurpose({
                         project: { id: transaction.project.id },
                         purpose: { id: transaction.id, typeOf: transactionTypeOf },
                         typeOf: {
@@ -208,22 +227,22 @@ function deleteTransactionById(params) {
                         }
                     });
                     // messages削除(2024-05-01~)
-                    const deleteMessagesByPlaceOrderResult = yield deleteMessagesByPlaceOrder({
+                    const deleteMessagesByPlaceOrderResult = await deleteMessagesByPlaceOrder({
                         transaction: params.object
                     })(repos);
                     deleteMessagessResult = deleteMessagesByPlaceOrderResult.deleteResult;
                     // 取引削除
-                    yield repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
                     break;
                 // implemented(2022-06-09~)
                 case factory.transactionType.ReturnOrder:
                     // 取引削除
-                    yield repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
                     break;
                 // implemented(2022-06-09~)
                 case factory.transactionType.MoneyTransfer:
                     // 取引削除
-                    yield repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
                     break;
                 default:
                     throw new factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
@@ -231,7 +250,7 @@ function deleteTransactionById(params) {
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -239,19 +258,22 @@ function deleteTransactionById(params) {
             throw error;
         }
         // アクション完了
-        const actionResult = Object.assign({ deletePayTransactionResult,
+        const actionResult = {
+            deletePayTransactionResult,
             deleteRefundResult,
             payTransactionNumbers,
             deleteReservationsResult,
             deleteReserveTransactionResult,
             deleteCancelReservationTransactionResult,
             deletedReservationNumbers,
-            deleteActionResult }, (deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined);
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-    });
+            deleteActionResult,
+            ...(deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined
+        };
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+    };
 }
 function deleteReservationsByPlaceOrder(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let deleteResult;
         let deleteReserveTransactionResult;
         let deleteCancelReservationTransactionResult;
@@ -259,69 +281,67 @@ function deleteReservationsByPlaceOrder(params) {
         // 予約取引番号を抽出
         const authorizeReservationOfferActions = authorizeActions
             .filter((a) => {
-            var _a;
-            const pendingTransactionNumber = (_a = a.instrument) === null || _a === void 0 ? void 0 : _a.transactionNumber;
+            const pendingTransactionNumber = a.instrument?.transactionNumber;
             return a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation
                 && typeof pendingTransactionNumber === 'string'
                 && pendingTransactionNumber.length > 0;
         });
         const reserveTransactionNumbers = authorizeReservationOfferActions
-            .map((a) => { var _a; return String((_a = a.instrument) === null || _a === void 0 ? void 0 : _a.transactionNumber); });
+            .map((a) => String(a.instrument?.transactionNumber));
         if (reserveTransactionNumbers.length > 0) {
             // 該当予約番号の予約を削除する(プロジェクトでも絞ること)
-            const deleteReservationsResult = yield repos.reservation.deleteByReservationNumbers({
+            const deleteReservationsResult = await repos.reservation.deleteByReservationNumbers({
                 project: { id: params.transaction.project.id },
                 reservationNumbers: reserveTransactionNumbers
             });
             deleteResult = {
-                n: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.n,
-                ok: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.ok,
-                deletedCount: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.deletedCount
+                n: deleteReservationsResult?.n,
+                ok: deleteReservationsResult?.ok,
+                deletedCount: deleteReservationsResult?.deletedCount
             };
             // 予約取引を削除(プロジェクトでも絞ること)(2022-06-07~)
-            const deleteAssetTransactionsResult = yield repos.assetTransaction.deleteByTransactionNumber({
+            const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
                 project: { id: params.transaction.project.id },
                 transactionNumbers: reserveTransactionNumbers,
                 typeOf: factory.assetTransactionType.Reserve
             });
             deleteReserveTransactionResult = {
-                n: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.n,
-                ok: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.ok,
-                deletedCount: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.deletedCount
+                n: deleteAssetTransactionsResult?.n,
+                ok: deleteAssetTransactionsResult?.ok,
+                deletedCount: deleteAssetTransactionsResult?.deletedCount
             };
             // 予約番号で予約取消取引を検索
-            const deletingCancelReservationTransactions = yield repos.assetTransaction.search({
+            const deletingCancelReservationTransactions = await repos.assetTransaction.search({
                 project: { id: { $eq: params.transaction.project.id } },
                 object: { reservationNumber: { $in: reserveTransactionNumbers } },
                 typeOf: factory.assetTransactionType.CancelReservation
             }, ['transactionNumber'], []);
             if (deletingCancelReservationTransactions.length > 0) {
                 // 予約取消取引も削除(2024-04-18~)
-                const deleteCancelReservationResult = yield repos.assetTransaction.deleteByTransactionNumber({
+                const deleteCancelReservationResult = await repos.assetTransaction.deleteByTransactionNumber({
                     project: { id: params.transaction.project.id },
                     transactionNumbers: deletingCancelReservationTransactions.map(({ transactionNumber }) => String(transactionNumber)),
                     typeOf: factory.assetTransactionType.CancelReservation
                 });
                 deleteCancelReservationTransactionResult = {
-                    n: deleteCancelReservationResult === null || deleteCancelReservationResult === void 0 ? void 0 : deleteCancelReservationResult.n,
-                    ok: deleteCancelReservationResult === null || deleteCancelReservationResult === void 0 ? void 0 : deleteCancelReservationResult.ok,
-                    deletedCount: deleteCancelReservationResult === null || deleteCancelReservationResult === void 0 ? void 0 : deleteCancelReservationResult.deletedCount
+                    n: deleteCancelReservationResult?.n,
+                    ok: deleteCancelReservationResult?.ok,
+                    deletedCount: deleteCancelReservationResult?.deletedCount
                 };
             }
         }
         return { deleteResult, deleteReserveTransactionResult, deleteCancelReservationTransactionResult, reserveTransactionNumbers };
-    });
+    };
 }
 function deletePayTransactionsByPlaceOrder(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let deletePayTransactionResult;
         let deleteRefundResult;
         const authorizeActions = params.authorizeActions;
         // 決済取引番号を抽出
         const authorizePaymentActions = authorizeActions
             .filter((a) => {
-            var _a;
-            const pendingTransactionNumber = (_a = a.object) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
+            const pendingTransactionNumber = a.object?.paymentMethodId;
             return a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment
                 && typeof pendingTransactionNumber === 'string'
                 && pendingTransactionNumber.length > 0;
@@ -329,55 +349,55 @@ function deletePayTransactionsByPlaceOrder(params) {
         const payTransactionNumbers = authorizePaymentActions.map((a) => String(a.object.paymentMethodId));
         if (payTransactionNumbers.length > 0) {
             // 決済取引を削除(プロジェクトでも絞ること)(2022-06-07~)
-            const deleteAssetTransactionsResult = yield repos.assetTransaction.deleteByTransactionNumber({
+            const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
                 project: { id: params.transaction.project.id },
                 transactionNumbers: payTransactionNumbers,
                 typeOf: factory.assetTransactionType.Pay
             });
             deletePayTransactionResult = {
-                n: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.n,
-                ok: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.ok,
-                deletedCount: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.deletedCount
+                n: deleteAssetTransactionsResult?.n,
+                ok: deleteAssetTransactionsResult?.ok,
+                deletedCount: deleteAssetTransactionsResult?.deletedCount
             };
             // 返金取引も削除(2023-05-19~)
-            const refundTransactions = yield repos.assetTransaction.search({
+            const refundTransactions = await repos.assetTransaction.search({
                 typeOf: factory.assetTransactionType.Refund,
                 object: { paymentMethodId: { $in: payTransactionNumbers } }
             }, ['transactionNumber'], []);
             if (refundTransactions.length > 0) {
-                const deleteRefundAssetTransactionsResult = yield repos.assetTransaction.deleteByTransactionNumber({
+                const deleteRefundAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
                     project: { id: params.transaction.project.id },
                     transactionNumbers: refundTransactions.map(({ transactionNumber }) => transactionNumber),
                     typeOf: factory.assetTransactionType.Refund
                 });
                 deleteRefundResult = {
-                    n: deleteRefundAssetTransactionsResult === null || deleteRefundAssetTransactionsResult === void 0 ? void 0 : deleteRefundAssetTransactionsResult.n,
-                    ok: deleteRefundAssetTransactionsResult === null || deleteRefundAssetTransactionsResult === void 0 ? void 0 : deleteRefundAssetTransactionsResult.ok,
-                    deletedCount: deleteRefundAssetTransactionsResult === null || deleteRefundAssetTransactionsResult === void 0 ? void 0 : deleteRefundAssetTransactionsResult.deletedCount
+                    n: deleteRefundAssetTransactionsResult?.n,
+                    ok: deleteRefundAssetTransactionsResult?.ok,
+                    deletedCount: deleteRefundAssetTransactionsResult?.deletedCount
                 };
             }
         }
         return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
-    });
+    };
 }
 function deleteMessagesByPlaceOrder(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let deleteResult;
         if (params.transaction.typeOf === factory.transactionType.PlaceOrder
             && params.transaction.specifyingMethod === factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
             const orderNumber = params.transaction.object.orderNumber;
             if (typeof orderNumber === 'string' && orderNumber.length > 0) {
-                const deleteReservationsResult = yield repos.message.deleteByMainEntityOrderNumber({
+                const deleteReservationsResult = await repos.message.deleteByMainEntityOrderNumber({
                     project: { id: params.transaction.project.id },
                     mainEntity: { orderNumber }
                 });
                 deleteResult = {
-                    n: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.n,
-                    ok: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.ok,
-                    deletedCount: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.deletedCount
+                    n: deleteReservationsResult?.n,
+                    ok: deleteReservationsResult?.ok,
+                    deletedCount: deleteReservationsResult?.deletedCount
                 };
             }
         }
         return { deleteResult };
-    });
+    };
 }

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

@@ -11,12 +11,11 @@ const factory = require("../../../../factory");
 function createTasks(params, setting
 // settings: Settings
 ) {
-    var _a, _b;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
-    const confirmedStoragePeriodInDays = (_a = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _a === void 0 ? void 0 : _a.transactionConfirmedInDays;
-    const canceledStoragePeriodInDays = (_b = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _b === void 0 ? void 0 : _b.transactionCanceledInDays;
+    const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
+    const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
     if (typeof confirmedStoragePeriodInDays !== 'number') {
         throw new factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
     }
@@ -53,9 +52,19 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
-                    ? { pendingTransaction: transaction.object.pendingTransaction }
-                    : undefined), project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
+            object: {
+                specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
+                id: transaction.id,
+                object: {
+                    ...(transaction.object.pendingTransaction !== undefined)
+                        ? { pendingTransaction: transaction.object.pendingTransaction }
+                        : undefined
+                },
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf,
+                ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
+            }
         }
     };
     taskAttributes.push(deleteTransactionTask);