@chevre/domain 26.0.0-alpha.11 → 26.0.0-alpha.13

package/lib/chevre/repo/adminTask.d.ts

@@ -1,7 +1,7 @@
 import type { AnyKeys, Connection, FilterQuery, ProjectionType } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/task';
-type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
+type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
 /**
  * タスク管理リポジトリ
  */
@@ -17,13 +17,13 @@ export declare class AdminTaskRepo {
      */
     findTasks(params: factory.task.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.task.ITask<factory.taskName>[]>;
     getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "id"> & {
-        expires?: Date;
+        expires?: never;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "id"> & {
-        expires?: Date;
+        expires?: never;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

package/lib/chevre/repo/adminTask.js

@@ -4,6 +4,7 @@ exports.AdminTaskRepo = void 0;
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const task_1 = require("./mongoose/schemas/task");
+// | 'expires'; // 非同期アクションは移行につきexpires廃止(2026-08-05~)
 const AVAILABLE_PROJECT_FIELDS = [
     'alternateName',
     'identifier',
@@ -19,7 +20,7 @@ const AVAILABLE_PROJECT_FIELDS = [
     'executor',
     'data',
     'dateAborted',
-    'expires'
+    // 'expires' // 非同期アクションは移行につきexpires廃止(2026-08-05~)
 ];
 /**
  * タスク管理リポジトリ

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -32,8 +32,7 @@ interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];
 }
 export interface IStorageSettings {
-    useScheduledDeleteTransactionTask?: boolean;
-    deleteTransactionTaskExpiresInDays?: number;
+    deleteTransactionTaskExpiresInDays: number;
     /**
      * 取引保管期間(Confirmed)
      * default:365

package/lib/chevre/repo/mongoose/schemas/task.d.ts

@@ -2,10 +2,7 @@ import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from '
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
 type IDocType = Omit<factory.task.ITask<factory.taskName>, 'id'> & {
-    /**
-     * 非同期アクション移行前のタスクには残っている(2026-07-29時点)
-     */
-    expires?: Date;
+    expires?: never;
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -22,7 +22,7 @@ const schemaDefinition = {
     executor: mongoose_1.SchemaTypes.Mixed,
     data: mongoose_1.SchemaTypes.Mixed,
     dateAborted: Date,
-    expires: Date // add(2024-04-23~)
+    // expires: Date // add(2024-04-23~) // 非同期アクションは移行につきexpires廃止(2026-08-05~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -93,15 +93,16 @@ const indexes = [
             }
         }
     ],
-    [
-        { expires: 1, runsAt: -1 },
-        {
-            name: 'expires',
-            partialFilterExpression: {
-                expires: { $exists: true }
-            }
-        }
-    ],
+    // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+    // [
+    //     { expires: 1, runsAt: -1 },
+    //     {
+    //         name: 'expires',
+    //         partialFilterExpression: {
+    //             expires: { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { remainingNumberOfTries: 1, runsAt: -1 },
         { name: 'searchByRemainingNumberOfTries-v2' }
@@ -195,15 +196,16 @@ const indexes = [
             }
         }
     ],
-    [
-        { status: 1, expires: 1 },
-        {
-            name: 'makeExpiredMany',
-            partialFilterExpression: {
-                expires: { $exists: true }
-            }
-        }
-    ],
+    // 非同期アクションは移行につきexpires廃止(2026-08-05~)
+    // [
+    //     { status: 1, expires: 1 },
+    //     {
+    //         name: 'makeExpiredMany',
+    //         partialFilterExpression: {
+    //             expires: { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         // add unique index(2025-03-28~)
         { alternateName: 1 },

package/lib/chevre/repo/scheduledTaskMigration.d.ts

@@ -18,4 +18,10 @@ export declare class ScheduledTaskMigrationRepo {
             validationErrors: import("mongoose").Error[];
         } | undefined;
     }) | undefined>;
+    deleteLagacyTasks(params: {
+        limit: number;
+    }): Promise<import("mongodb").DeleteResult | undefined>;
+    deleteLagacyAsyncActions(params: {
+        limit: number;
+    }): Promise<import("mongodb").DeleteResult | undefined>;
 }

package/lib/chevre/repo/scheduledTaskMigration.js

@@ -66,5 +66,56 @@ class ScheduledTaskMigrationRepo {
         }
         return result;
     }
+    async deleteLagacyTasks(params) {
+        const { limit } = params;
+        const deletingTasks = await this.taskModel.find({
+            name: {
+                $in: [
+                    factory_1.factory.taskName.DeleteTransaction,
+                    factory_1.factory.taskName.ImportEventsFromCOA,
+                    factory_1.factory.taskName.ImportEventCapacitiesFromCOA
+                ]
+            }
+        }, { _id: 1 })
+            .limit(limit)
+            .lean()
+            .exec();
+        // console.log(deletingTasks);
+        if (deletingTasks.length === 0) {
+            return;
+        }
+        ;
+        return this.taskModel.deleteMany({
+            _id: { $in: deletingTasks.map((doc) => doc._id) }
+        })
+            .exec();
+    }
+    async deleteLagacyAsyncActions(params) {
+        const { limit } = params;
+        const deletingTasks = await this.taskModel.find({
+            name: {
+                $in: [
+                    factory_1.factory.taskName.AcceptCOAOffer,
+                    factory_1.factory.taskName.AuthorizePayment,
+                    factory_1.factory.taskName.CheckMovieTicket,
+                    factory_1.factory.taskName.PublishPaymentUrl,
+                    factory_1.factory.taskName.VoidReserveTransaction
+                ]
+            },
+            expires: { $exists: true, $lte: new Date() }
+        }, { _id: 1 })
+            .limit(limit)
+            .lean()
+            .exec();
+        // console.log(deletingTasks);
+        if (deletingTasks.length === 0) {
+            return;
+        }
+        ;
+        return this.taskModel.deleteMany({
+            _id: { $in: deletingTasks.map((doc) => doc._id) }
+        })
+            .exec();
+    }
 }
 exports.ScheduledTaskMigrationRepo = ScheduledTaskMigrationRepo;

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

@@ -1,19 +1,19 @@
 import type { Connection, UpdateWriteOpResult } from 'mongoose';
 import { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
-import { IModel } from './mongoose/schemas/task';
+import { IDocType } from './mongoose/schemas/task';
 import type { IExecutableTask } from '../taskSettings';
 /**
  * リトライ可能なタスク作成属性
  */
 type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'identifier' | 'description'> & {
-    expires?: Date;
+    expires?: never;
 };
 /**
  * タスクリポジトリ
  */
 export declare class TaskRepo {
-    readonly taskModel: IModel;
+    private readonly taskModel;
     constructor(connection: Connection);
     saveMany(taskAttributes: ICreatingTask[]): Promise<{
         id: string;
@@ -31,6 +31,23 @@ export declare class TaskRepo {
         id: string;
         status: factory.taskStatus;
     } | undefined>;
+    /**
+     * イベント予約集計タスクの冗長な作成を避けるためのメソッド
+     */
+    findReadyAggregateEventTask(params: {
+        project: {
+            id: string;
+        };
+        reservationFor: {
+            id: string;
+        };
+    }): Promise<(import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask, "id"> & {
+        expires?: never;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    } & {
+        __v: number;
+    }) | null>;
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)
@@ -52,7 +69,7 @@ export declare class TaskRepo {
         executor: {
             name: string;
         };
-        expires?: Date;
+        expires?: never;
     }): Promise<IExecutableTask<factory.taskName> | null>;
     /**
      * 潜在的に実行されるべきタスクをカウントする

package/lib/chevre/repo/task.js

@@ -21,7 +21,7 @@ const executableTaskProjection = {
     project: 1,
     remainingNumberOfTries: 1,
     runsAt: 1,
-    expires: 1
+    // expires: 1 // 非同期アクションは移行につきexpires廃止(2026-08-05~)
 };
 /**
  * タスクリポジトリ
@@ -87,6 +87,18 @@ class TaskRepo {
         const { id, status } = doc;
         return { id, status };
     }
+    /**
+     * イベント予約集計タスクの冗長な作成を避けるためのメソッド
+     */
+    async findReadyAggregateEventTask(params) {
+        return this.taskModel.findOne({
+            'project.id': { $eq: params.project.id },
+            name: { $eq: factory_1.factory.taskName.AggregateScreeningEvent },
+            status: { $eq: factory_1.factory.taskStatus.Ready },
+            'data.id': { $exists: true, $eq: params.reservationFor.id }
+        }, { _id: 1 })
+            .exec();
+    }
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)
@@ -217,7 +229,7 @@ class TaskRepo {
                 _id: { $eq: params.id },
                 status: { $eq: params.status },
                 runsAt: { $lt: now },
-                ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined
+                // ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
             }, executableTaskProjection)
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean()
@@ -228,7 +240,7 @@ class TaskRepo {
                 _id: { $eq: params.id },
                 status: { $eq: params.status },
                 runsAt: { $lt: now },
-                ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined
+                // ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
             }, {
                 $set: {
                     status: factory_1.factory.taskStatus.Running, // 実行中に変更

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

@@ -7,7 +7,7 @@ type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 /**
  * タスク変更イベントを受けて実行する
  */
-declare function executeById(params: (IReadyTask | IRunningTask) & {
+declare function executeTaskById(params: (Pick<IReadyTask, 'id' | 'status'> | Pick<IRunningTask, 'id' | 'status'>) & {
     executor: {
         /**
          * タスク実行者名称
@@ -15,4 +15,4 @@ declare function executeById(params: (IReadyTask | IRunningTask) & {
         name: string;
     };
 }, next?: INextFunction): IOperation<void>;
-export { executeById, };
+export { executeTaskById, };

package/lib/chevre/service/task.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeById = executeById;
+exports.executeTaskById = executeTaskById;
 /**
  * タスクサービス
  */
@@ -13,10 +13,10 @@ const debug = (0, debug_1.default)('chevre-domain:service:task');
 /**
  * タスク変更イベントを受けて実行する
  */
-function executeById(params, next) {
+function executeTaskById(params, next) {
     return async (settings) => {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
-        const { id, status, executor, expires } = params;
+        const { id, status, executor } = params;
         let task = null;
         try {
             // support status: Running(2025-03-05~)
@@ -24,12 +24,12 @@ function executeById(params, next) {
                 id,
                 status,
                 executor: { name: executor.name },
-                ...(expires instanceof Date) ? { expires } : undefined
+                // ...(expires instanceof Date) ? { expires } : undefined // 非同期アクションは移行につきexpires廃止(2026-08-05~)
             });
         }
         catch (error) {
             /* istanbul ignore next */
-            debug('service.task.executeById error:', error);
+            debug('service.task.executeTaskById error:', error);
         }
         // タスクがなければ終了
         if (task !== null) {

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

@@ -1,6 +1,6 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
-type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | 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~)

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

@@ -25,24 +25,18 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        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
-            ]);
+        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.js

@@ -167,24 +167,18 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        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
-            ]);
+        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/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.11"
+  "version": "26.0.0-alpha.13"
 }