@chevre/domain 25.2.0-alpha.54 → 25.2.0-alpha.55

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

@@ -0,0 +1,37 @@
+import type { AnyKeys, Connection, FilterQuery, ProjectionType } from 'mongoose';
+import { factory } from '../factory';
+import { IModel, IDocType } from './mongoose/schemas/task';
+type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
+/**
+ * タスク管理リポジトリ
+ */
+export declare class AdminTaskRepo {
+    readonly taskModel: IModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): FilterQuery<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>[];
+    countTasks(params: factory.task.ISearchConditions): Promise<{
+        count: number;
+    }>;
+    /**
+     * 検索する
+     */
+    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;
+    } & {
+        _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;
+    } & {
+        _id: import("mongoose").Types.ObjectId;
+    } & {
+        __v: number;
+    }) | null>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.task.ITask<factory.taskName>>;
+        $unset: AnyKeys<factory.task.ITask<factory.taskName>>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
+}
+export {};

package/lib/chevre/repo/adminTask.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminTaskRepo = void 0;
+const factory_1 = require("../factory");
+const settings_1 = require("../settings");
+const task_1 = require("./mongoose/schemas/task");
+const AVAILABLE_PROJECT_FIELDS = [
+    'alternateName',
+    'identifier',
+    'description',
+    'project',
+    'name',
+    'status',
+    'runsAt',
+    'remainingNumberOfTries',
+    'lastTriedAt',
+    'numberOfTried',
+    'executionResults',
+    'executor',
+    'data',
+    'dateAborted',
+    'expires'
+];
+/**
+ * タスク管理リポジトリ
+ */
+class AdminTaskRepo {
+    taskModel;
+    constructor(connection) {
+        this.taskModel = connection.model(task_1.modelName, (0, task_1.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 countTasks(params) {
+        const { limit } = params;
+        const conditions = AdminTaskRepo.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 };
+    }
+    /**
+     * 検索する
+     */
+    async findTasks(params, inclusion) {
+        const conditions = AdminTaskRepo.CREATE_MONGO_CONDITIONS(params);
+        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.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~)
+            .exec();
+    }
+    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();
+    }
+}
+exports.AdminTaskRepo = AdminTaskRepo;

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

@@ -0,0 +1,38 @@
+import type { Connection } from 'mongoose';
+import { factory } from '../factory';
+import { IModel } from './mongoose/schemas/task';
+interface IAggregationByStatus {
+    taskCount: number;
+    avgLatency: number;
+    maxLatency: number;
+    minLatency: number;
+    percentilesLatency: {
+        name: string;
+        value: number;
+    }[];
+}
+interface IStatus {
+    status: factory.taskStatus;
+    aggregation: IAggregationByStatus;
+}
+interface IAggregateTask {
+    statuses: IStatus[];
+}
+/**
+ * タスク集計リポジトリ
+ */
+export declare class AggregateTaskRepo {
+    readonly taskModel: IModel;
+    constructor(connection: Connection);
+    aggregateTask(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        runsFrom: Date;
+        runsThrough: Date;
+    }): Promise<IAggregateTask>;
+    private agggregateByStatus;
+}
+export {};

package/lib/chevre/repo/aggregateTask.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AggregateTaskRepo = void 0;
+const factory_1 = require("../factory");
+const task_1 = require("./mongoose/schemas/task");
+/**
+ * タスク集計リポジトリ
+ */
+class AggregateTaskRepo {
+    taskModel;
+    constructor(connection) {
+        this.taskModel = connection.model(task_1.modelName, (0, task_1.createSchema)());
+    }
+    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.AggregateTaskRepo = AggregateTaskRepo;

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

@@ -1,25 +1,8 @@
-import type { AnyKeys, Connection, FilterQuery, ProjectionType, UpdateWriteOpResult } from 'mongoose';
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
 import { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
 import { IModel, IDocType } from './mongoose/schemas/task';
 import type { IExecutableTask } from '../taskSettings';
-interface IAggregationByStatus {
-    taskCount: number;
-    avgLatency: number;
-    maxLatency: number;
-    minLatency: number;
-    percentilesLatency: {
-        name: string;
-        value: number;
-    }[];
-}
-interface IStatus {
-    status: factory.taskStatus;
-    aggregation: IAggregationByStatus;
-}
-export interface IAggregateTask {
-    statuses: IStatus[];
-}
 interface IOptionOnCreate {
     emitImmediately: boolean;
 }
@@ -36,7 +19,6 @@ type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | '
 export declare class TaskRepo {
     readonly taskModel: IModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): FilterQuery<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>[];
     runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
         alternateName?: never;
         identifier?: never;
@@ -140,7 +122,7 @@ export declare class TaskRepo {
             name: string;
         };
         nameFilterBeforeRunsAt: boolean;
-    }, next?: INextFunction): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
+    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
     /**
      * Readyのままで期限切れのタスクをExpiredに変更する
      */
@@ -193,13 +175,6 @@ export declare class TaskRepo {
         status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
         executionResult: factory.task.IExecutionResult;
     }, next?: INextFunction): Promise<void>;
-    count(params: factory.task.ISearchConditions): Promise<{
-        count: number;
-    }>;
-    /**
-     * 検索する
-     */
-    projectFields(params: factory.task.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.task.ITask<factory.taskName>[]>;
     /**
      * タスクの状態を参照する
      * 非同期アクション移行が完了したら廃止する(2026-07-29~)
@@ -222,16 +197,6 @@ export declare class TaskRepo {
             id: string;
         };
     }): Promise<void>;
-    deleteByName(params: {
-        name: factory.taskName;
-        status?: {
-            $eq?: factory.taskStatus;
-        };
-        runsAt?: {
-            $gte: Date;
-            $lte: Date;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
     /**
      * 不要なタスクを削除する
      */
@@ -249,32 +214,5 @@ export declare class TaskRepo {
     }): Promise<{
         count: number;
     }>;
-    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;
-    } & {
-        _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;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | null>;
-    unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.task.ITask<factory.taskName>>;
-        $unset: AnyKeys<factory.task.ITask<factory.taskName>>;
-    }): Promise<UpdateWriteOpResult>;
-    aggregateTask(params: {
-        project?: {
-            id?: {
-                $ne?: string;
-            };
-        };
-        runsFrom: Date;
-        runsThrough: Date;
-    }): Promise<IAggregateTask>;
-    private agggregateByStatus;
 }
 export {};

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' },
@@ -55,86 +48,6 @@ 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, 
@@ -452,8 +365,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');
         }
@@ -471,15 +383,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: {
@@ -518,7 +421,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;
     }
     /**
@@ -589,42 +492,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')
@@ -668,47 +535,6 @@ 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 };
-    }
-    /**
-     * 検索する
-     */
-    async projectFields(params, inclusion) {
-        const conditions = TaskRepo.CREATE_MONGO_CONDITIONS(params);
-        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.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~)
-            .exec();
-    }
     /**
      * タスクの状態を参照する
      * 非同期アクション移行が完了したら廃止する(2026-07-29~)
@@ -745,18 +571,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();
-    }
     /**
      * 不要なタスクを削除する
      */
@@ -790,135 +604,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/repository.d.ts

@@ -17,10 +17,12 @@ import type { PayActionRepo } from './repo/action/pay';
 import type { RefundActionRepo } from './repo/action/refund';
 import type { AsyncActionRepo } from './repo/asyncAction';
 import type { AdditionalPropertyRepo } from './repo/additionalProperty';
+import type { AdminTaskRepo } from './repo/adminTask';
 import type { AggregateActionRepo } from './repo/aggregateAction';
 import type { AggregateOfferRepo } from './repo/aggregateOffer';
 import type { AggregateOrderRepo } from './repo/aggregateOrder';
 import type { AggregateReservationRepo } from './repo/aggregateReservation';
+import type { AggregateTaskRepo } from './repo/aggregateTask';
 import type { AggregationRepo } from './repo/aggregation';
 import type { AssetTransactionRepo } from './repo/assetTransaction';
 import type { ReserveTransactionRepo } from './repo/assetTransaction/reserve';
@@ -159,10 +161,18 @@ export type AdditionalProperty = AdditionalPropertyRepo;
 export declare namespace AdditionalProperty {
     function createInstance(...params: ConstructorParameters<typeof AdditionalPropertyRepo>): Promise<AdditionalPropertyRepo>;
 }
+export type AdminTask = AdminTaskRepo;
+export declare namespace AdminTask {
+    function createInstance(...params: ConstructorParameters<typeof AdminTaskRepo>): Promise<AdminTaskRepo>;
+}
 export type AggregateAction = AggregateActionRepo;
 export declare namespace AggregateAction {
     function createInstance(...params: ConstructorParameters<typeof AggregateActionRepo>): Promise<AggregateActionRepo>;
 }
+export type AggregateTask = AggregateTaskRepo;
+export declare namespace AggregateTask {
+    function createInstance(...params: ConstructorParameters<typeof AggregateTaskRepo>): Promise<AggregateTaskRepo>;
+}
 export type AggregateOffer = AggregateOfferRepo;
 export declare namespace AggregateOffer {
     function createInstance(...params: ConstructorParameters<typeof AggregateOfferRepo>): Promise<AggregateOfferRepo>;

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateAction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = void 0;
+exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateTask = exports.AggregateAction = exports.AdminTask = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -170,6 +170,17 @@ var AdditionalProperty;
     }
     AdditionalProperty.createInstance = createInstance;
 })(AdditionalProperty || (exports.AdditionalProperty = AdditionalProperty = {}));
+var AdminTask;
+(function (AdminTask) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/adminTask.js')).AdminTaskRepo;
+        }
+        return new repo(...params);
+    }
+    AdminTask.createInstance = createInstance;
+})(AdminTask || (exports.AdminTask = AdminTask = {}));
 var AggregateAction;
 (function (AggregateAction) {
     let repo;
@@ -181,6 +192,17 @@ var AggregateAction;
     }
     AggregateAction.createInstance = createInstance;
 })(AggregateAction || (exports.AggregateAction = AggregateAction = {}));
+var AggregateTask;
+(function (AggregateTask) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/aggregateTask.js')).AggregateTaskRepo;
+        }
+        return new repo(...params);
+    }
+    AggregateTask.createInstance = createInstance;
+})(AggregateTask || (exports.AggregateTask = AggregateTask = {}));
 var AggregateOffer;
 (function (AggregateOffer) {
     let repo;

package/lib/chevre/service/aggregation/system.d.ts

@@ -1,9 +1,9 @@
 import type { AggregateActionRepo } from '../../repo/aggregateAction';
+import type { AggregateTaskRepo } from '../../repo/aggregateTask';
 import { AggregationRepo } from '../../repo/aggregation';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { EventRepo } from '../../repo/event';
 import { OrderRepo } from '../../repo/order';
-import type { TaskRepo } from '../../repo/task';
 import type { TransactionRepo } from '../../repo/transaction';
 type AggregateDurationUnit = 'days' | 'hours';
 interface IAggregateParams {
@@ -141,7 +141,7 @@ declare function aggregateReserveTransaction(params: IAggregateParams): (repos:
 }>;
 declare function aggregateTask(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    task: TaskRepo;
+    aggregateTask: AggregateTaskRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;

package/lib/chevre/service/aggregation/system.js

@@ -673,7 +673,7 @@ function aggregateTask(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.task.aggregateTask({
+            const aggregateResult = await repos.aggregateTask.aggregateTask({
                 project: { id: { $ne: params.excludedProjectId } },
                 runsFrom,
                 runsThrough

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.d.ts

@@ -1,7 +1,7 @@
-import type { TaskRepo } from '../../repo/task';
+import type { AdminTaskRepo } from '../../repo/adminTask';
 import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 interface INotifyAbortedTasksRepos {
-    task: TaskRepo;
+    adminTask: AdminTaskRepo;
     integrationSetting: IntegrationSettingRepo;
 }
 /**

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.js

@@ -16,7 +16,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:notification');
 function notifyAbortedTasksByEmail(params) {
     return async (repos) => {
         const abortedTasksWithoutReport = await repos.integrationSetting.getByKey('abortedTasksWithoutReport');
-        const abortedTasks = await repos.task.projectFields({
+        const abortedTasks = await repos.adminTask.findTasks({
             limit: params.limit,
             page: 1,
             status: { $eq: factory_1.factory.taskStatus.Aborted },

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.d.ts

@@ -1,6 +1,3 @@
-/**
- * 注文決済時処理
- */
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 declare function onOrderPaymentDue(params: {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOrderPaymentDue = onOrderPaymentDue;
+/**
+ * 注文決済時処理
+ */
+const util_1 = require("util");
 const factory_1 = require("../../../factory");
 function onOrderPaymentDue(params) {
     return async (repos) => {
@@ -13,8 +17,9 @@ function onOrderPaymentDue(params) {
         switch (params.order.orderStatus) {
             // OrderPaymentDueを追加(2023-08-23~)
             case factory_1.factory.orderStatus.OrderPaymentDue:
+                await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos);
                 tasks = [
-                    ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
+                    // ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     ...createCreateAccountingReportTask(params.order) // 経理レポート作成タスク(2024-02-02~)
                 ];
                 break;
@@ -27,55 +32,79 @@ function onOrderPaymentDue(params) {
 function createConfirmPayTransactionTasks(order, simpleOrder) {
     return async (repos) => {
         const taskRunsAt = new Date();
-        const tasks = [];
+        // const tasks: factory.task.IAttributes<factory.taskName.ConfirmPayTransaction>[] = [];
         await Promise.all(order.paymentMethods.map(async (invoice) => {
             // PaymentAutomaticallyAppliedであれば、自動決済処理を実行(2023-08-24~)
             if (invoice.paymentStatus !== factory_1.factory.paymentStatusType.PaymentAutomaticallyApplied) {
                 return;
             }
-            // 冗長なタスク作成を回避
-            const existingTasks = await repos.task.projectFields({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: order.project.id } },
+            // 識別子指定でタスク作成(2026-07-30~)
+            const data = {
+                project: order.project,
+                typeOf: factory_1.factory.actionType.ConfirmAction,
+                object: [{ typeOf: factory_1.factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
+                agent: order.project,
+                purpose: {
+                    ...simpleOrder,
+                    confirmationNumber: order.confirmationNumber
+                },
+                processOrder: order.orderStatus === factory_1.factory.orderStatus.OrderPaymentDue, // OrderPaymentDueの場合、processOrderを実行する
+                useOnOrderStatusChanged: true
+            };
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmPayTransaction, data.purpose.typeOf, data.purpose.orderNumber, factory_1.factory.assetTransactionType.Pay, invoice.paymentMethodId);
+            const confirmPayTransactionTask = {
+                alternateName: taskIdentifier,
+                identifier: taskIdentifier,
+                project: order.project,
                 name: factory_1.factory.taskName.ConfirmPayTransaction,
-                data: {
-                    object: { transactionNumber: { $eq: invoice.paymentMethodId } },
-                    purpose: { orderNumber: { $eq: order.orderNumber } }
-                }
-            }, ['id']);
-            if (existingTasks.length === 0) {
-                const data = {
-                    project: order.project,
-                    typeOf: factory_1.factory.actionType.ConfirmAction,
-                    object: [{ typeOf: factory_1.factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
-                    agent: order.project,
-                    purpose: {
-                        ...simpleOrder,
-                        confirmationNumber: order.confirmationNumber
-                    },
-                    // 廃止(2024-03-12~)
-                    // instrument: {
-                    //     typeOf: factory.assetTransactionType.Pay, // 産取引化(2024-03-11~)
-                    //     identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre,
-                    //     transactionNumber: invoice.paymentMethodId
-                    // },
-                    processOrder: order.orderStatus === factory_1.factory.orderStatus.OrderPaymentDue, // OrderPaymentDueの場合、processOrderを実行する
-                    useOnOrderStatusChanged: true
-                };
-                tasks.push({
-                    project: order.project,
-                    name: factory_1.factory.taskName.ConfirmPayTransaction,
-                    status: factory_1.factory.taskStatus.Ready,
-                    runsAt: taskRunsAt,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data
-                });
-            }
+                status: factory_1.factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            await repos.task.createIfNotExistByAlternateName(confirmPayTransactionTask, { emitImmediately: true });
+            // 冗長なタスク作成を回避
+            // const existingTasks = await repos.task.projectFields(
+            //     {
+            //         limit: 1,
+            //         page: 1,
+            //         project: { id: { $eq: order.project.id } },
+            //         name: factory.taskName.ConfirmPayTransaction,
+            //         data: {
+            //             object: { transactionNumber: { $eq: invoice.paymentMethodId } },
+            //             purpose: { orderNumber: { $eq: order.orderNumber } }
+            //         }
+            //     },
+            //     ['id']
+            // ) as { id: string }[];
+            // if (existingTasks.length === 0) {
+            //     const data: factory.task.IData<factory.taskName.ConfirmPayTransaction> = {
+            //         project: order.project,
+            //         typeOf: factory.actionType.ConfirmAction,
+            //         object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
+            //         agent: order.project,
+            //         purpose: {
+            //             ...simpleOrder,
+            //             confirmationNumber: order.confirmationNumber
+            //         },
+            //         processOrder: order.orderStatus === factory.orderStatus.OrderPaymentDue, // OrderPaymentDueの場合、processOrderを実行する
+            //         useOnOrderStatusChanged: true
+            //     };
+            //     tasks.push({
+            //         project: order.project,
+            //         name: factory.taskName.ConfirmPayTransaction,
+            //         status: factory.taskStatus.Ready,
+            //         runsAt: taskRunsAt,
+            //         remainingNumberOfTries: 10,
+            //         numberOfTried: 0,
+            //         executionResults: [],
+            //         data
+            //     });
+            // }
         }));
-        return tasks;
+        // return tasks;
     };
 }
 function createCreateAccountingReportTask(order) {

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.54"
+  "version": "25.2.0-alpha.55"
 }