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

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -1,23 +1,27 @@
 import { factory } from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
-import type { ActionRepo } from '../../repo/action';
+import type { UpdateActionRepo } from '../../repo/action/update';
+import type { AdminActionRepo } from '../../repo/adminAction';
+import type { AdminTransactionRepo } from '../../repo/adminTransaction';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { NoteRepo } from '../../repo/note';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
-import type { TransactionRepo } from '../../repo/transaction';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 interface IDeleteTransactionRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
-    action: ActionRepo;
+    actions: {
+        update: UpdateActionRepo;
+    };
+    adminAction: AdminActionRepo;
+    adminTransaction: AdminTransactionRepo;
     assetTransaction: AssetTransactionRepo;
     note: NoteRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
-    transaction: TransactionRepo;
     placeOrder: PlaceOrderRepo;
     returnOrder: ReturnOrderRepo;
 }

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

@@ -71,13 +71,13 @@ function deleteTransactionById(params) {
         let deletedReservationNumbers = [];
         let deleteActionResult;
         let deleteOrderResult;
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.update.startUpdateAction(actionAttributes);
         try {
             const transactionTypeOf = transaction.typeOf;
             switch (transactionTypeOf) {
                 case factory_1.factory.transactionType.PlaceOrder: {
                     // 取引に対する全ての承認アクションを検索
-                    const authorizeActions = await repos.action.searchByPurpose({
+                    const authorizeActions = await repos.adminAction.searchByPurpose({
                         typeOf: factory_1.factory.actionType.AuthorizeAction,
                         purpose: {
                             typeOf: transactionTypeOf,
@@ -111,7 +111,7 @@ function deleteTransactionById(params) {
                         deleteReservationsByPlaceOrderResult.deleteCancelReservationTransactionResult;
                     deletedReservationNumbers = deleteReservationsByPlaceOrderResult.reserveTransactionNumbers;
                     // アクション削除(2023-05-19~)
-                    deleteActionResult = await repos.action.deleteActionsByTransactionId({
+                    deleteActionResult = await repos.adminAction.deleteActionsByTransactionId({
                         project: { id: transaction.project.id },
                         transaction: { id: transaction.id, typeOf: transactionTypeOf },
                         typeOf: {
@@ -132,13 +132,13 @@ function deleteTransactionById(params) {
                     // })(repos);
                     // deleteMessagessResult = deleteMessagesByPlaceOrderResult.deleteResult;
                     // 取引削除
-                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    await repos.adminTransaction.findByIdAndDelete({ id: transaction.id });
                     break;
                 }
                 // implemented(2022-06-09~)
                 case factory_1.factory.transactionType.ReturnOrder:
                     // 取引削除
-                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    await repos.adminTransaction.findByIdAndDelete({ id: transaction.id });
                     break;
                 default:
                     throw new factory_1.factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
@@ -146,7 +146,7 @@ function deleteTransactionById(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.update.giveUpUpdateAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -166,6 +166,6 @@ function deleteTransactionById(params) {
             deleteOrderResult // 2026-07-10~
             // ...(deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.update.completeUpdateAction({ typeOf: action.typeOf, id: action.id, result: actionResult });
     };
 }

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -128,7 +128,7 @@ function confirm(params, options) {
         const payTransactionNumbers = authorizePaymentActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
         // const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
         if (payTransactionNumbers.length > 0) {
-            payTransactions = await repos.assetTransaction.search({
+            payTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Pay,
                 transactionNumber: { $in: payTransactionNumbers }
             }, ['object']);

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts

@@ -1,11 +1,15 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
-type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.deleteTransaction.IAttributes | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.voidReserveTransaction.IAttributes;
+type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | Omit<factory.task.voidReserveTransaction.IAttributes, 'expires'>;
 /**
  * 取引のタスクを作成する
+ * 取引削除タスクを分離(2026-08-02~)
  */
-export declare function createTasks(params: {
+export declare function createImmediateTasks(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
-    runsAt: Date;
-}, setting: Pick<ISetting, 'storage'> | null): IPlaceOrderPotentialTask[];
+    taskRunsAt: Date;
+}): IPlaceOrderPotentialTask[];
+export declare function createScheduledTasks(params: {
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'status' | 'typeOf'>;
+}, setting: Pick<ISetting, 'storage'> | null): factory.task.deleteTransaction.IAttributes;
 export {};

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

@@ -3,114 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTasks = createTasks;
+exports.createImmediateTasks = createImmediateTasks;
+exports.createScheduledTasks = createScheduledTasks;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../../factory");
 /**
  * 取引のタスクを作成する
+ * 取引削除タスクを分離(2026-08-02~)
  */
-function createTasks(params, setting) {
+function createImmediateTasks(params) {
     const taskAttributes = [];
     const transaction = params.transaction;
-    const taskRunsAt = params.runsAt;
+    const taskRunsAt = params.taskRunsAt;
     // 取引通知は廃止(2026-06-29~)
-    // const informTransaction = setting?.onTransactionStatusChanged?.informTransaction;
-    // const transactionWebhookUrls = (Array.isArray(informTransaction)) ? informTransaction : [];
-    // const triggerWebhookTaskAttributes: factory.task.IAttributes<factory.taskName.TriggerWebhook>[] = [];
-    // transactionWebhookUrls.forEach(({ recipient }) => {
-    //     if (typeof recipient?.url === 'string') {
-    //         const informObject: factory.notification.transaction.IPlaceOrderAsNotification = {
-    //             id: transaction.id,
-    //             typeOf: transaction.typeOf,
-    //             project: transaction.project,
-    //             seller: transaction.seller,
-    //             startDate: transaction.startDate,
-    //             status: transaction.status,
-    //             ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
-    //         };
-    //         const data: factory.task.triggerWebhook.IInformAnyResourceAction = {
-    //             object: informObject,
-    //             recipient: {
-    //                 id: (typeof recipient?.id === 'string') ? recipient.id : '',
-    //                 name: recipient?.name,
-    //                 typeOf: factory.creativeWorkType.WebApplication
-    //                 // url: recipient.url // discontinue(2025-02-13~)
-    //             },
-    //             target: {
-    //                 httpMethod: 'POST',
-    //                 encodingType: factory.encodingFormat.Application.json,
-    //                 typeOf: 'EntryPoint',
-    //                 urlTemplate: recipient.url
-    //             }
-    //         };
-    //         triggerWebhookTaskAttributes.push({
-    //             project: transaction.project,
-    //             name: factory.taskName.TriggerWebhook,
-    //             status: factory.taskStatus.Ready,
-    //             runsAt: taskRunsAt,
-    //             remainingNumberOfTries: 3,
-    //             numberOfTried: 0,
-    //             executionResults: [],
-    //             data
-    //         });
-    //     }
-    // });
-    const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
-    const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
-    if (typeof confirmedStoragePeriodInDays !== 'number') {
-        throw new factory_1.factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
-    }
-    if (typeof canceledStoragePeriodInDays !== 'number') {
-        throw new factory_1.factory.errors.NotFound('setting.storage.canceledStoragePeriodInDays');
-    }
-    // 取引削除タスクを作成(取引ステータスによってrunsAtを調整)
-    // let deleteAt = moment(transaction.endDate)
-    //     .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
-    //     .toDate();
-    let deleteAt = (0, moment_1.default)(transaction.endDate)
-        .add(confirmedStoragePeriodInDays, 'days')
-        .toDate();
-    switch (transaction.status) {
-        case factory_1.factory.transactionStatusType.Confirmed:
-            break;
-        case factory_1.factory.transactionStatusType.Canceled:
-        case factory_1.factory.transactionStatusType.Expired:
-            // deleteAt = moment(transaction.endDate)
-            //     .add(settings.transaction.canceledStoragePeriodInDays, 'days')
-            //     .toDate();
-            deleteAt = (0, moment_1.default)(transaction.endDate)
-                .add(canceledStoragePeriodInDays, 'days')
-                .toDate();
-            break;
-        default:
-    }
-    const deleteTransactionTask = {
-        project: transaction.project,
-        name: factory_1.factory.taskName.DeleteTransaction,
-        status: factory_1.factory.taskStatus.Ready,
-        runsAt: deleteAt,
-        remainingNumberOfTries: 3,
-        numberOfTried: 0,
-        executionResults: [],
-        data: {
-            object: {
-                specifyingMethod: factory_1.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
-            }
-        }
-    };
     // 確定取引にも興行オファー承認中止タスクを追加(2023-05-09~)
     const voidReserveTaskAttributes = {
         project: transaction.project,
@@ -121,7 +26,6 @@ function createTasks(params, setting) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            // project: transaction.project, // discontinue(2025-03-12~)
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         }
     };
@@ -135,11 +39,9 @@ function createTasks(params, setting) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            // project: transaction.project, // discontinue(2025-03-12~)
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         }
     };
-    taskAttributes.push(deleteTransactionTask);
     switch (transaction.status) {
         case factory_1.factory.transactionStatusType.Confirmed: {
             taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
@@ -188,3 +90,53 @@ function createTasks(params, setting) {
     }
     return taskAttributes;
 }
+function createScheduledTasks(params, setting) {
+    const transaction = params.transaction;
+    const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
+    const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
+    if (typeof confirmedStoragePeriodInDays !== 'number') {
+        throw new factory_1.factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
+    }
+    if (typeof canceledStoragePeriodInDays !== 'number') {
+        throw new factory_1.factory.errors.NotFound('setting.storage.canceledStoragePeriodInDays');
+    }
+    // 取引削除タスクを作成(取引ステータスによってrunsAtを調整)
+    let deleteAt = (0, moment_1.default)(transaction.endDate)
+        .add(confirmedStoragePeriodInDays, 'days')
+        .toDate();
+    switch (transaction.status) {
+        case factory_1.factory.transactionStatusType.Confirmed:
+            break;
+        case factory_1.factory.transactionStatusType.Canceled:
+        case factory_1.factory.transactionStatusType.Expired:
+            deleteAt = (0, moment_1.default)(transaction.endDate)
+                .add(canceledStoragePeriodInDays, 'days')
+                .toDate();
+            break;
+        default:
+    }
+    return {
+        project: transaction.project,
+        name: factory_1.factory.taskName.DeleteTransaction,
+        status: factory_1.factory.taskStatus.Ready,
+        runsAt: deleteAt,
+        remainingNumberOfTries: 3,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            object: {
+                specifyingMethod: factory_1.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
+                },
+                typeOf: transaction.typeOf,
+            }
+        }
+    };
+}

package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts

@@ -1,8 +1,10 @@
 import type { SettingRepo } from '../../../repo/setting';
+import type { ScheduledTaskRepo } from '../../../repo/scheduledTask';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IExportTasksByIdRepos {
     setting: SettingRepo;
+    scheduledTask: ScheduledTaskRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
 }

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -11,9 +11,7 @@ const factory_2 = require("./exportTasks/factory");
  * 取引のタスクを出力します
  */
 function exportTasksById(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         const transaction = await repos.placeOrder.findPlaceOrderById({
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.id
@@ -27,12 +25,18 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        const taskAttributes = (0, factory_2.createTasks)({
-            transaction,
-            runsAt: taskRunsAt
-        }, setting
-        // settings
-        );
-        await repos.task.saveMany(taskAttributes);
+        const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
+        if (typeof deleteTransactionTaskExpiresInDays !== 'number') {
+            throw new factory_1.factory.errors.Internal('settings.storage.deleteTransactionTaskExpiresInDays required');
+        }
+        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
+        // support scheduledTask(2026-08-02~)
+        await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
+        await repos.scheduledTask.addScheduledTasks([{
+                ...deleteTask,
+                expires: (0, moment_1.default)(deleteTask.runsAt)
+                    .add(deleteTransactionTaskExpiresInDays, 'days')
+                    .toDate()
+            }]);
     };
 }

package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.d.ts

@@ -1,9 +1,19 @@
 import type { ISetting } from '../../../../repo/setting';
 import { factory } from '../../../../factory';
+type IReturnOrderPotentialTask = factory.task.IAttributes<factory.taskName.ReturnOrder>;
 /**
  * 取引のタスクを作成する
+ * 取引削除タスクを分離(2026-08-02~)
  */
-export declare function createTasks(params: {
+export declare function createImmediateTasks(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.ReturnOrder>, 'endDate' | 'status' | 'id' | 'project' | 'typeOf' | 'startDate' | 'object' | 'potentialActions'>;
-    runsAt: Date;
-}, setting: Pick<ISetting, 'storage'> | null): factory.task.IAttributes<factory.taskName>[];
+    taskRunsAt: Date;
+}): IReturnOrderPotentialTask[];
+/**
+ * 取引のタスクを作成する
+ * 取引削除タスクを分離(2026-08-02~)
+ */
+export declare function createScheduledTasks(params: {
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.ReturnOrder>, 'endDate' | 'status' | 'id' | 'project' | 'typeOf' | 'object'>;
+}, setting: Pick<ISetting, 'storage'> | null): factory.task.deleteTransaction.IAttributes;
+export {};

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

@@ -3,18 +3,60 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTasks = createTasks;
+exports.createImmediateTasks = createImmediateTasks;
+exports.createScheduledTasks = createScheduledTasks;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../../factory");
 /**
  * 取引のタスクを作成する
+ * 取引削除タスクを分離(2026-08-02~)
  */
-function createTasks(params, setting
-// settings: Settings
-) {
+function createImmediateTasks(params) {
     const taskAttributes = [];
     const transaction = params.transaction;
-    const taskRunsAt = params.runsAt;
+    const taskRunsAt = params.taskRunsAt;
+    switch (transaction.status) {
+        case factory_1.factory.transactionStatusType.Confirmed: {
+            const returnOrderPotentialActions = transaction.potentialActions?.returnOrder;
+            if (Array.isArray(returnOrderPotentialActions)) {
+                // 返品タスク
+                const returnOrderTask = returnOrderPotentialActions.map((r) => {
+                    // data最適化(2023-08-22~)
+                    const returnOrderTaskData = {
+                        agent: r.agent,
+                        object: r.object,
+                        project: transaction.project,
+                        typeOf: r.typeOf
+                    };
+                    return {
+                        project: transaction.project,
+                        name: factory_1.factory.taskName.ReturnOrder,
+                        status: factory_1.factory.taskStatus.Ready,
+                        runsAt: taskRunsAt,
+                        remainingNumberOfTries: 10,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: returnOrderTaskData
+                    };
+                });
+                taskAttributes.push(...returnOrderTask);
+            }
+            break;
+        }
+        case factory_1.factory.transactionStatusType.Expired:
+            // 特にタスクなし
+            break;
+        default:
+            throw new factory_1.factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
+    }
+    return taskAttributes;
+}
+/**
+ * 取引のタスクを作成する
+ * 取引削除タスクを分離(2026-08-02~)
+ */
+function createScheduledTasks(params, setting) {
+    const transaction = params.transaction;
     const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
     const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
     if (typeof confirmedStoragePeriodInDays !== 'number') {
@@ -24,9 +66,6 @@ function createTasks(params, setting
         throw new factory_1.factory.errors.NotFound('setting.storage.canceledStoragePeriodInDays');
     }
     // 取引削除タスクを作成(取引ステータスによってrunsAtを調整)
-    // let deleteAt = moment(transaction.endDate)
-    //     .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
-    //     .toDate();
     let deleteAt = (0, moment_1.default)(transaction.endDate)
         .add(confirmedStoragePeriodInDays, 'days')
         .toDate();
@@ -35,16 +74,13 @@ function createTasks(params, setting
             break;
         case factory_1.factory.transactionStatusType.Canceled:
         case factory_1.factory.transactionStatusType.Expired:
-            // deleteAt = moment(transaction.endDate)
-            //     .add(settings.transaction.canceledStoragePeriodInDays, 'days')
-            //     .toDate();
             deleteAt = (0, moment_1.default)(transaction.endDate)
                 .add(canceledStoragePeriodInDays, 'days')
                 .toDate();
             break;
         default:
     }
-    const deleteTransactionTask = {
+    return {
         project: transaction.project,
         name: factory_1.factory.taskName.DeleteTransaction,
         status: factory_1.factory.taskStatus.Ready,
@@ -59,47 +95,8 @@ function createTasks(params, setting
                 object: {
                     order: transaction.object.order
                 },
-                // project: transaction.project,
-                // startDate: transaction.startDate,
                 typeOf: transaction.typeOf,
-                // ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
             }
         }
     };
-    taskAttributes.push(deleteTransactionTask);
-    switch (transaction.status) {
-        case factory_1.factory.transactionStatusType.Confirmed: {
-            const returnOrderPotentialActions = transaction.potentialActions?.returnOrder;
-            if (Array.isArray(returnOrderPotentialActions)) {
-                // 返品タスク
-                const returnOrderTask = returnOrderPotentialActions.map((r) => {
-                    // data最適化(2023-08-22~)
-                    const returnOrderTaskData = {
-                        agent: r.agent,
-                        object: r.object,
-                        project: transaction.project,
-                        typeOf: r.typeOf
-                    };
-                    return {
-                        project: transaction.project,
-                        name: factory_1.factory.taskName.ReturnOrder,
-                        status: factory_1.factory.taskStatus.Ready,
-                        runsAt: taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: returnOrderTaskData
-                    };
-                });
-                taskAttributes.push(...returnOrderTask);
-            }
-            break;
-        }
-        case factory_1.factory.transactionStatusType.Expired:
-            // 特にタスクなし
-            break;
-        default:
-            throw new factory_1.factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
-    }
-    return taskAttributes;
 }

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -11,6 +11,7 @@ import type { ReservationRepo } from '../../repo/reservation';
 import type { SellerRepo } from '../../repo/seller';
 import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
 import type { SettingRepo } from '../../repo/setting';
+import type { ScheduledTaskRepo } from '../../repo/scheduledTask';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 import { preStart } from './returnOrder/preStart';
@@ -30,6 +31,7 @@ interface IStartOperationRepos {
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 interface IExportTasksByIdRepos {
     setting: SettingRepo;
+    scheduledTask: ScheduledTaskRepo;
     task: TaskRepo;
     returnOrder: ReturnOrderRepo;
 }

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

@@ -79,9 +79,7 @@ function saveMessagesIfNeeded(params) {
  * 取引確定
  */
 function confirm(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         const transaction = await repos.returnOrder.findReturnOrderById({ typeOf: factory_1.factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
         if (transaction.status === factory_1.factory.transactionStatusType.Confirmed) {
             // すでに確定済の場合
@@ -158,9 +156,7 @@ function confirm(params) {
  * この関数では、取引のタスクエクスポートステータスは見ません
  */
 function exportTasksById(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         const transaction = await repos.returnOrder.findReturnOrderById({ typeOf: factory_1.factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
@@ -171,12 +167,18 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        const taskAttributes = (0, factory_2.createTasks)({
-            transaction,
-            runsAt: taskRunsAt
-        }, setting
-        // settings
-        );
-        await repos.task.saveMany(taskAttributes);
+        const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
+        if (typeof deleteTransactionTaskExpiresInDays !== 'number') {
+            throw new factory_1.factory.errors.Internal('settings.storage.deleteTransactionTaskExpiresInDays required');
+        }
+        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
+        // support scheduledTask(2026-08-02~)
+        await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
+        await repos.scheduledTask.addScheduledTasks([{
+                ...deleteTask,
+                expires: (0, moment_timezone_1.default)(deleteTask.runsAt)
+                    .add(deleteTransactionTaskExpiresInDays, 'days')
+                    .toDate()
+            }]);
     };
 }

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

@@ -3,6 +3,7 @@
  */
 import { factory } from '../factory';
 import type { SettingRepo } from '../repo/setting';
+import type { ScheduledTaskRepo } from '../repo/scheduledTask';
 import type { TaskRepo } from '../repo/task';
 import type { TransactionRepo } from '../repo/transaction';
 import type { PlaceOrderRepo } from '../repo/transaction/placeOrder';
@@ -18,6 +19,7 @@ export import returnOrder = ReturnOrderTransactionService;
 export { deleteTransaction };
 export type IExportTasksOperation<T> = (repos: {
     setting: SettingRepo;
+    scheduledTask: ScheduledTaskRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
     returnOrder: ReturnOrderRepo;

package/lib/chevre/service/transaction.js

@@ -52,7 +52,6 @@ function exportOneTransactionTasksIfExists(params) {
                 agent: { name: params.tasksExportAction.agent.name }
             },
             endDate: { $lt: params.endDate.$lt },
-            // ...(params.typeOf !== undefined) ? { typeOf: params.typeOf } : undefined,
             ...(typeof params.id === 'string') ? { id: params.id } : undefined,
             ...(typeof params.status?.$eq === 'string') ? { status: params.status } : undefined,
             ...(params.sort !== undefined) ? { sort: params.sort } : undefined
@@ -65,7 +64,6 @@ function exportOneTransactionTasksIfExists(params) {
             case factory_1.factory.transactionType.PlaceOrder:
                 await PlaceOrderTransactionService.exportTasksById({
                     id: transaction.id,
-                    // optimizeRedundantTasks: params.optimizeRedundantTasks === true,
                     ...(typeof params.runsTasksAfterInSeconds === 'number')
                         ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
                         : undefined

package/lib/chevre/service/validation/validateOrder.d.ts

@@ -1,8 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { OrderRepo } from '../../repo/order';
-import type { SettingRepo } from '../../repo/setting';
-import type { TaskRepo } from '../../repo/task';
 export declare function validateOrder(params: {
     orderNumber: string;
     project: {
@@ -12,6 +10,4 @@ export declare function validateOrder(params: {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
-    setting: SettingRepo;
-    task: TaskRepo;
 }) => Promise<void>;