@chevre/domain 26.0.0-alpha.0 → 26.0.0-alpha.10

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,24 @@ 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 useScheduledDeleteTransactionTask = setting?.storage?.useScheduledDeleteTransactionTask === true;
+        const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
+        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
+        if (useScheduledDeleteTransactionTask && typeof deleteTransactionTaskExpiresInDays === 'number' && deleteTransactionTaskExpiresInDays > 0) {
+            // 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()
+                }]);
+        }
+        else {
+            await repos.task.saveMany([
+                ...(0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }),
+                deleteTask
+            ]);
+        }
     };
 }

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,24 @@ 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 useScheduledDeleteTransactionTask = setting?.storage?.useScheduledDeleteTransactionTask === true;
+        const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
+        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
+        if (useScheduledDeleteTransactionTask && typeof deleteTransactionTaskExpiresInDays === 'number' && deleteTransactionTaskExpiresInDays > 0) {
+            // 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()
+                }]);
+        }
+        else {
+            await repos.task.saveMany([
+                ...(0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }),
+                deleteTask
+            ]);
+        }
     };
 }

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/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.1.0-alpha.2",
+    "@chevre/factory": "10.1.0-alpha.5",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.0"
+  "version": "26.0.0-alpha.10"
 }