@chevre/domain 25.2.0-alpha.8 → 26.0.0-alpha.0

package/lib/chevre/repo/task.js

@@ -10,13 +10,6 @@ const task_1 = require("../eventEmitter/task");
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const task_2 = require("./mongoose/schemas/task");
-/**
- * タスク実行時のソート条件
- */
-// const sortOrder4executionOfTasks: { [key in keyof factory.task.IAttributes<factory.taskName>]?: factory.sortType } = {
-//     numberOfTried: factory.sortType.Ascending, // トライ回数の少なさ優先
-//     runsAt: factory.sortType.Ascending // 実行予定日時の早さ優先
-// };
 const executableTaskProjection = {
     _id: 0,
     id: { $toString: '$_id' },
@@ -30,7 +23,6 @@ const executableTaskProjection = {
     runsAt: 1,
     expires: 1
 };
-// type IProjection = { [key in IKeyOfProjection]?: 0 | 1; };
 const AVAILABLE_PROJECT_FIELDS = [
     'alternateName',
     'identifier',
@@ -56,89 +48,7 @@ class TaskRepo {
     constructor(connection) {
         this.taskModel = connection.model(task_2.modelName, (0, task_2.createSchema)());
     }
-    static CREATE_MONGO_CONDITIONS(params) {
-        const andConditions = [];
-        const idEq = params.id?.$eq;
-        if (typeof idEq === 'string') {
-            andConditions.push({ _id: { $eq: idEq } });
-        }
-        const projectIdEq = params.project?.id?.$eq;
-        if (typeof projectIdEq === 'string') {
-            andConditions.push({ 'project.id': { $eq: projectIdEq } });
-        }
-        if (typeof params.name === 'string') {
-            andConditions.push({ name: { $eq: params.name } });
-        }
-        else {
-            const nameIn = params.name?.$in;
-            if (Array.isArray(nameIn)) {
-                andConditions.push({ name: { $in: nameIn } });
-            }
-            const nameNin = params.name?.$nin;
-            if (Array.isArray(nameNin)) {
-                andConditions.push({ name: { $nin: nameNin } });
-            }
-        }
-        const statusEq = params.status?.$eq;
-        if (typeof statusEq === 'string') {
-            andConditions.push({ status: { $eq: statusEq } });
-        }
-        if (Array.isArray(params.statuses)) {
-            andConditions.push({ status: { $in: params.statuses } });
-        }
-        if (params.runsFrom instanceof Date) {
-            andConditions.push({ runsAt: { $gte: params.runsFrom } });
-        }
-        if (params.runsThrough instanceof Date) {
-            andConditions.push({ runsAt: { $lte: params.runsThrough } });
-        }
-        if (params.lastTriedFrom instanceof Date) {
-            andConditions.push({ lastTriedAt: { $type: 'date', $gte: params.lastTriedFrom } });
-        }
-        if (params.lastTriedThrough instanceof Date) {
-            andConditions.push({ lastTriedAt: { $type: 'date', $lte: params.lastTriedThrough } });
-        }
-        const dateAbortedGte = params.dateAborted?.$gte;
-        if (dateAbortedGte instanceof Date) {
-            andConditions.push({ dateAborted: { $type: 'date', $gte: dateAbortedGte } });
-        }
-        const dateAbortedLte = params.dateAborted?.$lte;
-        if (dateAbortedLte instanceof Date) {
-            andConditions.push({ dateAborted: { $type: 'date', $lte: dateAbortedLte } });
-        }
-        const objectIdEq = params.data?.object?.id?.$eq;
-        if (typeof objectIdEq === 'string') {
-            andConditions.push({ 'data.object.id': { $exists: true, $eq: objectIdEq } });
-        }
-        const objectOrderNumberEq = params.data?.object?.orderNumber?.$eq;
-        if (typeof objectOrderNumberEq === 'string') {
-            andConditions.push({ 'data.object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
-        }
-        const objectTransactionNumberEq = params.data?.object?.transactionNumber?.$eq;
-        if (typeof objectTransactionNumberEq === 'string') {
-            andConditions.push({ 'data.object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
-        }
-        const objectPurposeIdEq = params.data?.purpose?.id?.$eq;
-        if (typeof objectPurposeIdEq === 'string') {
-            andConditions.push({ 'data.purpose.id': { $exists: true, $eq: objectPurposeIdEq } });
-        }
-        const objectPurposeOrderNumberEq = params.data?.purpose?.orderNumber?.$eq;
-        if (typeof objectPurposeOrderNumberEq === 'string') {
-            andConditions.push({ 'data.purpose.orderNumber': { $exists: true, $eq: objectPurposeOrderNumberEq } });
-        }
-        const alternateNameRegex = params.alternateName?.$regex;
-        if (typeof alternateNameRegex === 'string' && alternateNameRegex.length > 0) {
-            andConditions.push({ alternateName: { $exists: true, $regex: new RegExp(alternateNameRegex) } });
-        }
-        const identifierRegex = params.identifier?.$regex;
-        if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
-            andConditions.push({ identifier: { $exists: true, $regex: new RegExp(identifierRegex) } });
-        }
-        return andConditions;
-    }
-    async runImmediately(
-    // resolve uniqueness of identifier(2025-03-27~)
-    params, 
+    async runImmediately(params, 
     // support customr function(2025-05-25~)
     next) {
         const { expires } = params;
@@ -163,10 +73,10 @@ class TaskRepo {
         }, next);
         return { id };
     }
-    async saveMany(taskAttributes, options) {
-        const emitImmediately = options?.emitImmediately === true;
+    async saveMany(taskAttributes) {
+        const emitImmediately = true; // always true(2026-07-30~)
+        // const emitImmediately = options?.emitImmediately === true;
         if (taskAttributes.length > 0) {
-            // resolve uniqueness of identifier(2025-03-27~)
             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 });
             if (result.insertedCount !== taskAttributes.length) {
@@ -223,7 +133,8 @@ class TaskRepo {
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)
      */
-    async createIfNotExistByAlternateName(params, options) {
+    async createIfNotExistByAlternateName(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');
         }
@@ -260,7 +171,7 @@ class TaskRepo {
             }
         }
         if (typeof createdTask?.id === 'string') {
-            if (options.emitImmediately) {
+            if (emitImmediately) {
                 task_1.taskEventEmitter.emitTaskStatusChanged({
                     id: createdTask.id,
                     name: params.name,
@@ -272,33 +183,41 @@ class TaskRepo {
             throw new factory_1.factory.errors.Internal(`falied in creating a task unexpectedly. ${params.alternateName}`);
         }
     }
-    /**
-     * 取引削除タスク冪等作成
-     */
-    async createDeleteTransactionTaskIfNotExist(
-    // resolve uniqueness of identifier(2025-03-27~)
-    params, options) {
-        if (params.data.object.specifyingMethod !== factory_1.factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
-            throw new factory_1.factory.errors.NotImplemented(`only ${factory_1.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) {
-            task_1.taskEventEmitter.emitTaskStatusChanged({
-                id: createdTask.id,
-                name: params.name,
-                status: factory_1.factory.taskStatus.Ready
-            });
-        }
-    }
-    async createOnAssetTransactionStatusChangedTaskIfNotExist(
-    // resolve uniqueness of identifier(2025-03-27~)
-    params, options) {
+    // /**
+    //  * 取引削除タスク冪等作成
+    //  */
+    // 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 },
@@ -313,7 +232,7 @@ class TaskRepo {
         }, { $setOnInsert: params }, { new: true, upsert: true })
             .select({ _id: 1 })
             .exec();
-        if (options.emitImmediately) {
+        if (emitImmediately) {
             task_1.taskEventEmitter.emitTaskStatusChanged({
                 id: createdTask.id,
                 name: params.name,
@@ -444,8 +363,7 @@ class TaskRepo {
     /**
      * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
      */
-    async emitRunningIfExists(params, next // support next function(2025-08-02~)
-    ) {
+    async emitRunningIfExists(params) {
         if (!(params.runsAt.$lt instanceof Date)) {
             throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
         }
@@ -463,15 +381,6 @@ class TaskRepo {
             ...(nameFilterBeforeRunsAt) ? { name: params.name } : undefined,
             runsAt: { $lt: params.runsAt.$lt },
             ...(!nameFilterBeforeRunsAt) ? { name: params.name } : undefined
-            // ...(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
         };
         const doc = await this.taskModel.findOneAndUpdate(filter, {
             $set: {
@@ -510,7 +419,7 @@ class TaskRepo {
                 status: factory_1.factory.taskStatus.Running
             };
         }
-        task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, (typeof next === 'function') ? next : undefined);
+        task_1.taskEventEmitter.emitTaskStatusChanged(changedTask);
         return doc;
     }
     /**
@@ -581,42 +490,6 @@ class TaskRepo {
         })
             .exec();
     }
-    // public async abortOne(params: {
-    //     intervalInMinutes: number;
-    // }): Promise<factory.task.ITask<factory.taskName> | null> {
-    //     const lastTriedAtShoudBeLessThan = moment()
-    //         .add(-params.intervalInMinutes, 'minutes')
-    //         .toDate();
-    //     const projection: ProjectionType<factory.task.ITask<factory.taskName>> = {
-    //         _id: 0,
-    //         id: { $toString: '$_id' },
-    //         ...Object.fromEntries<1>(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1])))
-    //     };
-    //     const doc = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             status: { $eq: factory.taskStatus.Running },
-    //             lastTriedAt: {
-    //                 $type: 'date',
-    //                 $lt: lastTriedAtShoudBeLessThan
-    //             },
-    //             remainingNumberOfTries: { $eq: 0 }
-    //         },
-    //         {
-    //             $set: {
-    //                 status: factory.taskStatus.Aborted,
-    //                 dateAborted: new Date()
-    //             }
-    //         },
-    //         { new: true, projection }
-    //     )
-    //         .lean<factory.task.ITask<factory.taskName>>()  // lean(2024-09-26~)
-    //         .exec();
-    //     if (doc === null) {
-    //         // tslint:disable-next-line:no-null-keyword
-    //         return null;
-    //     }
-    //     return doc;
-    // }
     async abortMany(params) {
         const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
             .add(-params.intervalInMinutes, 'minutes')
@@ -660,28 +533,11 @@ class TaskRepo {
             task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
         }
     }
-    async count(params) {
-        const { limit } = params;
-        const conditions = TaskRepo.CREATE_MONGO_CONDITIONS(params);
-        const query = this.taskModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {});
-        if (typeof limit === 'number' && limit >= 0) {
-            query.limit(limit);
-        }
-        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec();
-        return { count };
-    }
     /**
-     * 検索する
+     * タスクの状態を参照する
+     * 非同期アクション移行が完了したら廃止する(2026-07-29~)
      */
-    async projectFields(params, 
-    // projection?: IProjection
-    inclusion) {
-        const conditions = TaskRepo.CREATE_MONGO_CONDITIONS(params);
-        // const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
-        //     ? Object.values(projection)
-        //         .some((value) => value !== 0)
-        //     : false;
+    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));
@@ -694,18 +550,18 @@ class TaskRepo {
             id: { $toString: '$_id' },
             ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
         };
-        const query = this.taskModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
-        if (typeof params.limit === 'number' && params.limit > 0) {
-            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            query.limit(params.limit)
-                .skip(params.limit * (page - 1));
-        }
-        if (params.sort?.runsAt !== undefined) {
-            query.sort({ runsAt: params.sort.runsAt });
-        }
-        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean() // lean(2024-09-26~)
+        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({
@@ -713,18 +569,6 @@ class TaskRepo {
         })
             .exec();
     }
-    async deleteByName(params) {
-        return this.taskModel.deleteMany({
-            name: { $eq: params.name },
-            ...(typeof params.status?.$eq === 'string') ? { status: { $eq: params.status.$eq } } : undefined,
-            ...(params.runsAt?.$gte instanceof Date)
-                ? {
-                    runsAt: { $gte: params.runsAt.$gte, $lte: params.runsAt.$lte }
-                }
-                : undefined
-        })
-            .exec();
-    }
     /**
      * 不要なタスクを削除する
      */
@@ -758,135 +602,5 @@ class TaskRepo {
             .exec();
         return { count };
     }
-    getCursor(conditions, projection) {
-        return this.taskModel.find(conditions, projection)
-            .sort({ runsAt: factory_1.factory.sortType.Ascending })
-            .cursor();
-    }
-    async unsetUnnecessaryFields(params) {
-        return this.taskModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-            .exec();
-    }
-    async aggregateTask(params) {
-        const statuses = await Promise.all([
-            factory_1.factory.taskStatus.Executed,
-            factory_1.factory.taskStatus.Aborted
-        ].map(async (taskStatus) => {
-            const matchConditions = {
-                runsAt: {
-                    $gte: params.runsFrom,
-                    $lte: params.runsThrough
-                },
-                status: { $eq: taskStatus },
-                ...(typeof params.project?.id?.$ne === 'string')
-                    ? { 'project.id': { $ne: params.project.id.$ne } }
-                    : undefined
-            };
-            return this.agggregateByStatus({ matchConditions, status: taskStatus });
-        }));
-        return { statuses };
-    }
-    async agggregateByStatus(params) {
-        const matchConditions = params.matchConditions;
-        const taskStatus = params.status;
-        const aggregate1 = this.taskModel.aggregate([
-            {
-                $match: matchConditions
-            },
-            {
-                $project: {
-                    latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
-                    status: '$status',
-                    runsAt: '$runsAt',
-                    lastTriedAt: '$lastTriedAt'
-                }
-            },
-            {
-                $group: {
-                    _id: '$status',
-                    taskCount: { $sum: 1 },
-                    maxLatency: { $max: '$latency' },
-                    minLatency: { $min: '$latency' },
-                    avgLatency: { $avg: '$latency' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    taskCount: '$taskCount',
-                    avgLatency: '$avgLatency',
-                    maxLatency: '$maxLatency',
-                    minLatency: '$minLatency'
-                }
-            }
-        ]);
-        // const explainResult = await aggregate1.explain();
-        // console.dir(explainResult, { depth: null });
-        // return;
-        const aggregations = await aggregate1.exec();
-        const percents = [50, 95, 99];
-        if (aggregations.length === 0) {
-            return {
-                status: taskStatus,
-                aggregation: {
-                    taskCount: 0,
-                    avgLatency: 0,
-                    maxLatency: 0,
-                    minLatency: 0,
-                    percentilesLatency: percents.map((percent) => {
-                        return {
-                            name: String(percent),
-                            value: 0
-                        };
-                    })
-                }
-            };
-        }
-        const ranks4percentile = percents.map((percentile) => {
-            return {
-                percentile,
-                rank: Math.floor(aggregations[0].taskCount * percentile / 100)
-            };
-        });
-        const aggregate2 = this.taskModel.aggregate([
-            {
-                $match: matchConditions
-            },
-            {
-                $project: {
-                    latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
-                    status: '$status',
-                    runsAt: '$runsAt',
-                    lastTriedAt: '$lastTriedAt'
-                }
-            },
-            { $sort: { latency: 1 } },
-            {
-                $group: {
-                    _id: '$status',
-                    latencies: { $push: '$latency' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    percentilesLatency: ranks4percentile.map((rank) => {
-                        return {
-                            name: String(rank.percentile),
-                            value: { $arrayElemAt: ['$latencies', rank.rank] }
-                        };
-                    })
-                }
-            }
-        ]);
-        const aggregations2 = await aggregate2.exec();
-        return {
-            status: taskStatus,
-            aggregation: {
-                ...aggregations[0],
-                ...aggregations2[0]
-            }
-        };
-    }
 }
 exports.TaskRepo = TaskRepo;

package/lib/chevre/repo/transaction/placeOrder.d.ts

@@ -37,21 +37,6 @@ export declare class PlaceOrderRepo {
     }): Promise<(Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IKeyOfProjection> & {
         id: string;
     })[]>;
-    /**
-     * 進行中取引に保管された採用済決済方法を検索する
-     */
-    findInProgressPaymentMethodId(params: {
-        id: string;
-    }): Promise<factory.transaction.placeOrder.IPaymentMethodByPaymentUrl | undefined>;
-    /**
-     * 取引の確認番号を検索する
-     */
-    findInProgressConfirmationNumberById(params: {
-        id: string;
-        status: {
-            $in: factory.transactionStatusType[];
-        };
-    }): Promise<string | undefined>;
     /**
      * 取引期限変更
      */
@@ -60,28 +45,6 @@ export declare class PlaceOrderRepo {
         id: string;
         expires: Date;
     }): Promise<void>;
-    /**
-     * 取引オブジェクトを更新
-     * 注文名称など
-     */
-    updateObject(params: {
-        typeOf: factory.transactionType.PlaceOrder;
-        id: string;
-        object?: {
-            name?: string;
-        };
-    }): Promise<void>;
-    /**
-     * 特定の進行中取引を更新する(汎用)
-     */
-    findByIdAndUpdateInProgress(params: {
-        id: string;
-        update: {
-            $set?: {
-                'object.paymentMethods'?: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
-            };
-        };
-    }): Promise<void>;
     /**
      * 進行中取引のobjectに注文番号を保管する
      */
@@ -91,13 +54,6 @@ export declare class PlaceOrderRepo {
     }): Promise<{
         modifiedCount: number;
     }>;
-    saveConfirmationNumberIfNotExist(params: {
-        id: string;
-        status: {
-            $in: factory.transactionStatusType[];
-        };
-        confirmationNumber: string;
-    }): Promise<void>;
     /**
      * 進行中の注文取引を取得する
      */
@@ -125,9 +81,10 @@ export declare class PlaceOrderRepo {
         object: {
             orderDate: Date;
             orderNumber: string;
+            confirmationNumber: string;
         };
         result: factory.transaction.IResult<factory.transactionType.PlaceOrder>;
-        potentialActions: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;
+        potentialActions?: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;
     }): Promise<void>;
     /**
      * 取引を中止する