@chevre/domain 26.0.0-alpha.3 → 26.0.0-alpha.30

package/lib/chevre/repo/task.js

@@ -1,45 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRepo = void 0;
-const moment_1 = __importDefault(require("moment"));
 const errorHandler_1 = require("../errorHandler");
 const task_1 = require("../eventEmitter/task");
 const factory_1 = require("../factory");
-const settings_1 = require("../settings");
 const task_2 = require("./mongoose/schemas/task");
-const executableTaskProjection = {
-    _id: 0,
-    id: { $toString: '$_id' },
-    // 必要最低限にprojection(2024-04-23~)
-    data: 1,
-    name: 1,
-    status: 1,
-    numberOfTried: 1,
-    project: 1,
-    remainingNumberOfTries: 1,
-    runsAt: 1,
-    expires: 1
-};
-const AVAILABLE_PROJECT_FIELDS = [
-    'alternateName',
-    'identifier',
-    'description',
-    'project',
-    'name',
-    'status',
-    'runsAt',
-    'remainingNumberOfTries',
-    'lastTriedAt',
-    'numberOfTried',
-    'executionResults',
-    'executor',
-    'data',
-    'dateAborted',
-    'expires'
-];
 /**
  * タスクリポジトリ
  */
@@ -48,34 +13,8 @@ class TaskRepo {
     constructor(connection) {
         this.taskModel = connection.model(task_2.modelName, (0, task_2.createSchema)());
     }
-    async runImmediately(params, 
-    // support customr function(2025-05-25~)
-    next) {
-        const { expires } = params;
-        if (!(expires instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('expires', 'must be Date');
-        }
-        const savingTask = {
-            ...params,
-            status: factory_1.factory.taskStatus.Ready,
-            numberOfTried: 0,
-            executionResults: []
-        };
-        const result = await this.taskModel.insertMany(savingTask, { rawResult: true });
-        const id = result.insertedIds?.[0]?.toHexString();
-        if (typeof id !== 'string') {
-            throw new factory_1.factory.errors.Internal('task not saved');
-        }
-        task_1.taskEventEmitter.emitTaskStatusChanged({
-            id,
-            status: factory_1.factory.taskStatus.Ready,
-            expires // emit expires(2025-03-31~)
-        }, next);
-        return { id };
-    }
     async saveMany(taskAttributes) {
         const emitImmediately = true; // always true(2026-07-30~)
-        // const emitImmediately = options?.emitImmediately === true;
         if (taskAttributes.length > 0) {
             const creatingTasks = taskAttributes.map(({ identifier, ...creatingTask }) => creatingTask); // eslint-disable-line @typescript-eslint/no-unused-vars
             const result = await this.taskModel.insertMany(creatingTasks, { ordered: false, rawResult: true });
@@ -93,14 +32,7 @@ class TaskRepo {
                         status: factory_1.factory.taskStatus.Ready
                     });
                 });
-                // taskAttributes.forEach((savedTask) => {
-                //     taskEventEmitter.emitTaskStatusChanged({
-                //         name: savedTask.name,
-                //         status: factory.taskStatus.Ready
-                //     });
-                // });
             }
-            // return result.ops;
             return savedTasks;
         }
         else {
@@ -129,20 +61,34 @@ 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 })
+            .lean()
+            .exec();
+    }
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)
+     * reimplement runTaskByIdentifier(2026-08-03~)
      */
-    async createIfNotExistByAlternateName(params) {
+    async runTaskByIdentifier(params) {
         const emitImmediately = true; // always true(2026-07-30~)
-        if (typeof params.alternateName !== 'string' || params.alternateName.length === 0) {
-            throw new factory_1.factory.errors.ArgumentNull('alternateName');
+        if (typeof params.identifier !== 'string' || params.identifier.length === 0) {
+            throw new factory_1.factory.errors.ArgumentNull('identifier');
         }
         let createdTask;
         const filterQuery = {
             'project.id': { $eq: params.project.id },
             name: { $eq: params.name },
-            alternateName: { $exists: true, $eq: params.alternateName }
+            identifier: { $exists: true, $eq: params.identifier }
         };
         const projection = {
             _id: 0,
@@ -160,7 +106,7 @@ class TaskRepo {
         catch (error) {
             let throwsError = true;
             if (await (0, errorHandler_1.isMongoDuplicateError)(error)) {
-                // すでにalternateNameが存在する場合ok
+                // すでにidentifierが存在する場合ok
                 throwsError = false;
                 createdTask = await this.taskModel.findOne(filterQuery, projection)
                     .lean()
@@ -180,297 +126,8 @@ class TaskRepo {
             }
         }
         else {
-            throw new factory_1.factory.errors.Internal(`falied in creating a task unexpectedly. ${params.alternateName}`);
-        }
-    }
-    // /**
-    //  * 取引削除タスク冪等作成
-    //  */
-    // public async createDeleteTransactionTaskIfNotExist(
-    //     // resolve uniqueness of identifier(2025-03-27~)
-    //     params: Pick<
-    //         factory.task.IAttributes<factory.taskName.DeleteTransaction>,
-    //         'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'
-    //     >,
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     if (params.data.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
-    //         throw new factory.errors.NotImplemented(`only ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id} implemented`);
-    //     }
-    //     const createdTask = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             name: { $eq: params.name },
-    //             'data.object.id': { $exists: true, $eq: params.data.object.id }
-    //         },
-    //         { $setOnInsert: params },
-    //         { new: true, upsert: true }
-    //     )
-    //         .select({ _id: 1 })
-    //         .exec();
-    //     if (options.emitImmediately) {
-    //         taskEventEmitter.emitTaskStatusChanged({
-    //             id: createdTask.id,
-    //             name: params.name,
-    //             status: factory.taskStatus.Ready
-    //         });
-    //     }
-    // }
-    async createOnAssetTransactionStatusChangedTaskIfNotExist(params) {
-        const emitImmediately = true; // always true(2026-07-30~)
-        const createdTask = await this.taskModel.findOneAndUpdate({
-            'project.id': { $eq: params.project.id },
-            name: { $eq: params.name },
-            'data.object.transactionNumber': {
-                $exists: true,
-                $eq: String(params.data.object.transactionNumber)
-            },
-            'data.purpose.orderNumber': {
-                $exists: true,
-                $eq: String(params.data.purpose.orderNumber)
-            }
-        }, { $setOnInsert: params }, { new: true, upsert: true })
-            .select({ _id: 1 })
-            .exec();
-        if (emitImmediately) {
-            task_1.taskEventEmitter.emitTaskStatusChanged({
-                id: createdTask.id,
-                name: params.name,
-                status: factory_1.factory.taskStatus.Ready
-            });
-        }
-    }
-    /**
-     * Ready -> remainingNumberOfTriesが1減る
-     * Running -> findOneするだけ
-     */
-    async executeOneById(params) {
-        const now = new Date();
-        let doc;
-        if (params.status === factory_1.factory.taskStatus.Running) {
-            doc = await this.taskModel.findOne({
-                _id: { $eq: params.id },
-                status: { $eq: params.status },
-                runsAt: { $lt: now },
-                ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined
-            }, executableTaskProjection)
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
-                .exec();
-        }
-        else {
-            doc = await this.taskModel.findOneAndUpdate({
-                _id: { $eq: params.id },
-                status: { $eq: params.status },
-                runsAt: { $lt: now },
-                ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined
-            }, {
-                $set: {
-                    status: factory_1.factory.taskStatus.Running, // 実行中に変更
-                    lastTriedAt: now,
-                    executor: params.executor
-                },
-                $inc: {
-                    remainingNumberOfTries: -1, // 残りトライ可能回数減らす
-                    numberOfTried: 1 // トライ回数増やす
-                }
-            }, { new: true, projection: executableTaskProjection })
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean() // lean(2024-09-26~)
-                .exec();
+            throw new factory_1.factory.errors.Internal(`falied in creating a task unexpectedly. ${params.identifier}`);
         }
-        if (doc === null) {
-            return null;
-        }
-        return doc;
-    }
-    /**
-     * Readyのタスクをname指定でひとつRunningに変更する
-     */
-    async executeOneIfExists(params) {
-        if (!(params.runsAt.$lt instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
-        }
-        const nameEq = params.name?.$eq;
-        // const nameNin = params.name?.$nin;
-        const doc = await this.taskModel.findOneAndUpdate({
-            status: { $eq: factory_1.factory.taskStatus.Ready },
-            runsAt: { $lt: params.runsAt.$lt },
-            ...(typeof nameEq === 'string')
-                ? {
-                    name: {
-                        ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined
-                        // ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined
-                    }
-                }
-                : undefined
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Running, // 実行中に変更
-                lastTriedAt: new Date(),
-                executor: params.executor
-            },
-            $inc: {
-                remainingNumberOfTries: -1, // 残りトライ可能回数減らす
-                numberOfTried: 1 // トライ回数増やす
-            }
-        }, {
-            new: true,
-            projection: executableTaskProjection,
-            ...(typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
-                ? { sort: params.sort }
-                : undefined
-        })
-            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean() // lean(2024-09-26~)
-            .exec();
-        if (doc === null) {
-            return null;
-        }
-        return doc;
-    }
-    /**
-     * add(2025-03-16~)
-     */
-    async countPotentiallyRunning(params) {
-        const { runsAt, limit, name } = params;
-        const nameEq = name?.$eq;
-        // const nameNin = name?.$nin;
-        const nameIn = name?.$in;
-        if (!(runsAt.$lt instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
-        }
-        const query = this.taskModel.countDocuments({
-            status: { $eq: factory_1.factory.taskStatus.Ready },
-            runsAt: { $lt: params.runsAt.$lt },
-            ...(typeof nameEq === 'string' || Array.isArray(nameIn))
-                ? {
-                    name: {
-                        ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined,
-                        // ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined,
-                        ...(Array.isArray(nameIn)) ? { $in: nameIn } : undefined
-                    }
-                }
-                : undefined
-        });
-        if (typeof limit === 'number' && limit >= 0) {
-            query.limit(limit);
-        }
-        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec();
-        return { count };
-    }
-    /**
-     * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
-     */
-    async emitRunningIfExists(params) {
-        if (!(params.runsAt.$lt instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
-        }
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            name: 1
-        };
-        const nameEq = params.name?.$eq;
-        // const nameNin = params.name?.$nin;
-        // const nameIn = params.name?.$in;
-        const { nameFilterBeforeRunsAt } = params;
-        const filter = {
-            status: { $eq: factory_1.factory.taskStatus.Ready },
-            ...(nameFilterBeforeRunsAt) ? { name: params.name } : undefined,
-            runsAt: { $lt: params.runsAt.$lt },
-            ...(!nameFilterBeforeRunsAt) ? { name: params.name } : undefined
-        };
-        const doc = await this.taskModel.findOneAndUpdate(filter, {
-            $set: {
-                status: factory_1.factory.taskStatus.Running, // 実行中に変更
-                lastTriedAt: new Date(),
-                executor: params.executor
-            },
-            $inc: {
-                remainingNumberOfTries: -1, // 残りトライ可能回数減らす
-                numberOfTried: 1 // トライ回数増やす
-            }
-        }, {
-            new: true,
-            projection,
-            ...(typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
-                ? { sort: params.sort }
-                : undefined
-        })
-            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean()
-            .exec();
-        if (doc === null) {
-            return null;
-        }
-        let changedTask;
-        if (typeof nameEq === 'string') {
-            changedTask = {
-                id: doc.id,
-                status: factory_1.factory.taskStatus.Running,
-                name: nameEq
-            };
-        }
-        else {
-            changedTask = {
-                id: doc.id,
-                status: factory_1.factory.taskStatus.Running
-            };
-        }
-        task_1.taskEventEmitter.emitTaskStatusChanged(changedTask);
-        return doc;
-    }
-    /**
-     * Readyのままで期限切れのタスクをExpiredに変更する
-     */
-    async makeExpiredMany(params) {
-        const { expiresLt } = params;
-        if (!(expiresLt instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('expiresLt', 'must be Date');
-        }
-        return this.taskModel.updateMany({
-            status: { $eq: factory_1.factory.taskStatus.Ready },
-            expires: { $exists: true, $lt: expiresLt }
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Expired
-            }
-        })
-            .exec();
-    }
-    /**
-     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
-     */
-    async retryMany(params) {
-        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
-            .add(-params.intervalInMinutes, 'minutes')
-            .toDate();
-        const remainingNumberOfTriesGte = params.remainingNumberOfTries.$gte;
-        const remainingNumberOfTriesLte = params.remainingNumberOfTries.$lte;
-        return this.taskModel.updateMany(
-        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
-        // @see schemas/task
-        {
-            status: { $eq: factory_1.factory.taskStatus.Running },
-            lastTriedAt: {
-                $type: 'date',
-                $lt: lastTriedAtShoudBeLessThan
-            },
-            ...(typeof remainingNumberOfTriesGte === 'number')
-                ? { remainingNumberOfTries: { $gte: remainingNumberOfTriesGte } }
-                : undefined,
-            ...(typeof remainingNumberOfTriesLte === 'number')
-                ? { remainingNumberOfTries: { $lte: remainingNumberOfTriesLte } }
-                : undefined,
-            ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Ready // 実行前に変更
-            }
-        })
-            .exec();
     }
     /**
      * 実行中止済タスクを強制的にリトライ
@@ -490,117 +147,5 @@ class TaskRepo {
         })
             .exec();
     }
-    async abortMany(params) {
-        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
-            .add(-params.intervalInMinutes, 'minutes')
-            .toDate();
-        return this.taskModel.updateMany({
-            status: { $eq: factory_1.factory.taskStatus.Running },
-            lastTriedAt: {
-                $type: 'date',
-                $lt: lastTriedAtShoudBeLessThan
-            },
-            remainingNumberOfTries: { $eq: 0 },
-            ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Aborted,
-                dateAborted: new Date()
-            }
-        })
-            .exec();
-    }
-    /**
-     * タスクIDから実行結果とステータスを保管する
-     * Abortedの場合、dateAbortedもセットする
-     */
-    async setExecutionResultAndStatus(params, update, 
-    // support customr function(2025-05-25~)
-    next) {
-        const { id, remainingNumberOfTries, name } = params;
-        const { status, executionResult } = update;
-        await this.taskModel.updateOne({ _id: { $eq: id } }, {
-            $set: {
-                status,
-                ...(status === factory_1.factory.taskStatus.Aborted) ? { dateAborted: executionResult.endDate } : undefined // 2025-08-04~
-            },
-            $push: { executionResults: executionResult }
-        })
-            .exec();
-        // emit event(2025-05-26~)
-        if (typeof next === 'function') {
-            const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
-            task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
-        }
-    }
-    /**
-     * タスクの状態を参照する
-     * 非同期アクション移行が完了したら廃止する(2026-07-29~)
-     */
-    async findTaskById(params, inclusion) {
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-        if (Array.isArray(inclusion) && inclusion.length > 0) {
-            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
-        }
-        else {
-            // no op
-        }
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
-        };
-        const query = this.taskModel.findOne({
-            _id: { $eq: params.id.$eq },
-            'project.id': { $eq: params.project.id.$eq },
-            name: { $eq: params.name }
-        }, projection);
-        const doc = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean()
-            .exec();
-        if (doc === null) {
-            return;
-        }
-        return doc;
-    }
-    async deleteByProject(params) {
-        await this.taskModel.deleteMany({
-            'project.id': { $eq: params.project.id }
-        })
-            .exec();
-    }
-    /**
-     * 不要なタスクを削除する
-     */
-    async deleteRunsAtPassedCertainPeriod(params) {
-        return this.taskModel.deleteMany({
-            runsAt: { $lt: params.runsAt.$lt },
-            status: {
-                $in: [
-                    factory_1.factory.taskStatus.Aborted,
-                    factory_1.factory.taskStatus.Executed,
-                    factory_1.factory.taskStatus.Expired
-                ]
-            }
-        })
-            .exec();
-    }
-    async countDelayedTasks(params) {
-        const { limit } = params;
-        const runsAtLt = (0, moment_1.default)()
-            .add(-params.delayInSeconds, 'seconds')
-            .toDate();
-        const query = this.taskModel.countDocuments({
-            status: { $eq: factory_1.factory.taskStatus.Ready },
-            runsAt: { $lt: runsAtLt },
-            ...(Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined
-        });
-        if (typeof limit === 'number' && limit >= 0) {
-            query.limit(limit);
-        }
-        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec();
-        return { count };
-    }
 }
 exports.TaskRepo = TaskRepo;

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

@@ -0,0 +1,74 @@
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import { factory } from '../factory';
+/**
+ * 遅延タスクリポジトリ
+ */
+export declare class TaskDelayedRepo {
+    private readonly taskModel;
+    constructor(connection: Connection);
+    /**
+     * 潜在的に実行されるべきタスクをカウントする
+     * add(2025-03-16~)
+     */
+    countPotentiallyRunning(params: {
+        name?: {
+            $eq?: factory.taskName;
+            $in?: factory.taskName[];
+        };
+        runsAt: {
+            $lt: Date;
+        };
+        limit: number;
+    }): Promise<{
+        count: number;
+    }>;
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更する
+     */
+    private runDelayedTask;
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
+     */
+    runDelayedTaskIfExistsByName(params: {
+        /**
+         * 必ずタスク名指定で実行する
+         */
+        name: {
+            $eq: factory.taskName;
+            $in?: never;
+        } | {
+            $eq?: never;
+            $in: factory.taskName[];
+        };
+        runsAt: {
+            $lt: Date;
+        };
+        executor: {
+            name: string;
+        };
+    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningステータスに変更した上で、Runningイベントを発生させる
+     * 2026-08-06~
+     */
+    runDelayedTaskIfExists(params: {
+        runsAt: {
+            $lt: Date;
+        };
+        executor: {
+            name: string;
+        };
+    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
+    /**
+     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
+     */
+    retryTasks(params: {
+        intervalInMinutes: number;
+    }): Promise<UpdateWriteOpResult>;
+    /**
+     * $lte:0をReadyにする -> Readyにすれば自動的にAbortedになる
+     */
+    retryAbortingTasks(params: {
+        intervalInMinutes: number;
+    }): Promise<UpdateWriteOpResult>;
+}