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

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

@@ -0,0 +1,19 @@
+import type { Connection, FilterQuery } from 'mongoose';
+import { factory } from '../factory';
+import { IDocType } from './mongoose/schemas/asyncAction';
+import type { IExecutableTask } from '../taskSettings';
+export type IExecutableAsyncAction = Pick<IExecutableTask<factory.taskName>, 'data' | 'expires' | 'id' | 'name' | 'project' | 'runsAt' | 'status'>;
+type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
+type IFindParams = Pick<factory.task.ISearchConditions, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status' | 'limit' | 'page' | 'sort'>;
+/**
+ * 非同期アクション管理リポジトリ
+ */
+export declare class AdminAsyncActionRepo {
+    private readonly asyncActionModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status'>): 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>[];
+    findAsyncActions(params: IFindParams, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
+        id: string;
+    })[]>;
+}
+export {};

package/lib/chevre/repo/adminAsyncAction.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminAsyncActionRepo = void 0;
+const settings_1 = require("../settings");
+const asyncAction_1 = require("./mongoose/schemas/asyncAction");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'name',
+    'status',
+    'runsAt',
+    'lastTriedAt',
+    'executionResults',
+    'executor',
+    'data',
+    'dateAborted',
+    'expires'
+];
+/**
+ * 非同期アクション管理リポジトリ
+ */
+class AdminAsyncActionRepo {
+    asyncActionModel;
+    constructor(connection) {
+        this.asyncActionModel = connection.model(asyncAction_1.modelName, (0, asyncAction_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 (params.runsFrom instanceof Date) {
+            andConditions.push({ runsAt: { $gte: params.runsFrom } });
+        }
+        if (params.runsThrough instanceof Date) {
+            andConditions.push({ runsAt: { $lte: params.runsThrough } });
+        }
+        return andConditions;
+    }
+    async findAsyncActions(params, inclusion) {
+        const conditions = AdminAsyncActionRepo.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));
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.asyncActionModel.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()
+            .exec();
+    }
+}
+exports.AdminAsyncActionRepo = AdminAsyncActionRepo;

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

@@ -0,0 +1,32 @@
+import type { Connection } from 'mongoose';
+import { factory } from '../factory';
+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 AggregateScheduledTaskRepo {
+    private readonly scheduledTaskModel;
+    constructor(connection: Connection);
+    aggregateScheduledTask(params: {
+        runsFrom: Date;
+        runsThrough: Date;
+    }): Promise<IAggregateTask>;
+    private agggregateByStatus;
+}
+export {};

package/lib/chevre/repo/aggregateScheduledTask.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AggregateScheduledTaskRepo = void 0;
+const factory_1 = require("../factory");
+const scheduledTasks_1 = require("./mongoose/schemas/scheduledTasks");
+/**
+ * 予定タスク集計リポジトリ
+ */
+class AggregateScheduledTaskRepo {
+    scheduledTaskModel;
+    constructor(connection) {
+        this.scheduledTaskModel = connection.model(scheduledTasks_1.modelName, (0, scheduledTasks_1.createSchema)());
+    }
+    async aggregateScheduledTask(params) {
+        const statuses = await Promise.all([
+            factory_1.factory.taskStatus.Executed,
+            factory_1.factory.taskStatus.Aborted
+        ].map(async (taskStatus) => {
+            const matchConditions = {
+                status: { $eq: taskStatus },
+                runsAt: {
+                    $gte: params.runsFrom,
+                    $lte: params.runsThrough
+                },
+                // ...(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.scheduledTaskModel.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.scheduledTaskModel.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.AggregateScheduledTaskRepo = AggregateScheduledTaskRepo;

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

@@ -1,23 +1,18 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-import { IModel, IDocType } from './mongoose/schemas/asyncAction';
+import { IDocType } from './mongoose/schemas/asyncAction';
 import type { IExecutableTask } from '../taskSettings';
 type ISavingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'name' | 'project' | 'runsAt' | 'status'> & {
     expires: Date;
 };
 export type IExecutableAsyncAction = Pick<IExecutableTask<factory.taskName>, 'data' | 'expires' | 'id' | 'name' | 'project' | 'runsAt' | 'status'>;
 type IKeyOfProjection = keyof factory.task.ITask<factory.taskName> | 'expires';
-type IFindParams = Pick<factory.task.ISearchConditions, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status' | 'limit' | 'page' | 'sort'>;
 /**
  * 非同期アクションリポジトリ
  */
 export declare class AsyncActionRepo {
-    readonly asyncActionModel: IModel;
+    private readonly asyncActionModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: Pick<IFindParams, 'id' | 'name' | 'project' | 'runsFrom' | 'runsThrough' | 'status'>): 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>[];
-    findAsyncActions(params: IFindParams, inclusion: IKeyOfProjection[]): Promise<(IDocType & {
-        id: string;
-    })[]>;
     /**
      * Readyタスクをひとつ追加する
      */

package/lib/chevre/repo/asyncAction.js

@@ -35,65 +35,6 @@ class AsyncActionRepo {
     constructor(connection) {
         this.asyncActionModel = connection.model(asyncAction_1.modelName, (0, asyncAction_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 (params.runsFrom instanceof Date) {
-            andConditions.push({ runsAt: { $gte: params.runsFrom } });
-        }
-        if (params.runsThrough instanceof Date) {
-            andConditions.push({ runsAt: { $lte: params.runsThrough } });
-        }
-        return andConditions;
-    }
-    async findAsyncActions(params, inclusion) {
-        const conditions = AsyncActionRepo.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));
-        }
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
-        };
-        const query = this.asyncActionModel.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()
-            .exec();
-    }
     /**
      * Readyタスクをひとつ追加する
      */
@@ -168,55 +109,6 @@ class AsyncActionRepo {
         }
         return doc;
     }
-    // /**
-    //  * Readyのままで期限切れのタスクをExpiredに変更する
-    //  */
-    // public async makeExpiredMany(params: {
-    //     expiresLt: Date;
-    // }): Promise<UpdateWriteOpResult> {
-    //     const { expiresLt } = params;
-    //     if (!(expiresLt instanceof Date)) {
-    //         throw new factory.errors.Argument('expiresLt', 'must be Date');
-    //     }
-    //     return this.asyncActionModel.updateMany(
-    //         {
-    //             status: { $eq: factory.taskStatus.Ready },
-    //             expires: { $lt: expiresLt }
-    //         },
-    //         {
-    //             $set: {
-    //                 status: factory.taskStatus.Expired
-    //             }
-    //         }
-    //     )
-    //         .exec();
-    // }
-    // /**
-    //  * taskNameに関わらず、Runningのまま放置された非同期アクションをAbortedに変更する
-    //  */
-    // public async abortMany(params: {
-    //     intervalInMinutes: number;
-    // }): Promise<UpdateWriteOpResult> {
-    //     const lastTriedAtShoudBeLessThan = moment()
-    //         .add(-params.intervalInMinutes, 'minutes')
-    //         .toDate();
-    //     return this.asyncActionModel.updateMany(
-    //         {
-    //             status: { $eq: factory.taskStatus.Running },
-    //             lastTriedAt: {
-    //                 $exists: true,
-    //                 $lt: lastTriedAtShoudBeLessThan
-    //             }
-    //         },
-    //         {
-    //             $set: {
-    //                 status: factory.taskStatus.Aborted,
-    //                 dateAborted: new Date()
-    //             }
-    //         }
-    //     )
-    //         .exec();
-    // }
     /**
      * タスクIDから実行結果とステータスを保管する
      * Abortedの場合、dateAbortedもセットする

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

@@ -0,0 +1,23 @@
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import { INextFunction } from '../eventEmitter/task';
+import { factory } from '../factory';
+/**
+ * 旧非同期アクション(tasksコレクションにて管理)リポジトリ
+ */
+export declare class AsyncActionLegacyRepo {
+    private readonly taskModel;
+    constructor(connection: Connection);
+    runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
+        alternateName?: never;
+        identifier?: never;
+        expires: Date;
+    }, next: INextFunction): Promise<{
+        id: string;
+    }>;
+    /**
+     * Readyのままで期限切れのタスクをExpiredに変更する
+     */
+    makeExpiredMany(params: {
+        expiresLt: Date;
+    }): Promise<UpdateWriteOpResult>;
+}

package/lib/chevre/repo/asyncActionLegacy.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncActionLegacyRepo = void 0;
+const task_1 = require("../eventEmitter/task");
+const factory_1 = require("../factory");
+const task_2 = require("./mongoose/schemas/task");
+/**
+ * 旧非同期アクション(tasksコレクションにて管理)リポジトリ
+ */
+class AsyncActionLegacyRepo {
+    taskModel;
+    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 };
+    }
+    /**
+     * 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();
+    }
+}
+exports.AsyncActionLegacyRepo = AsyncActionLegacyRepo;

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

@@ -13,10 +13,6 @@ interface IOnReservationStatusChanged {
      * AggService通知先
      */
     informReservation?: factory.project.IInformParams[];
-    /**
-     * 確定予約最小化をサポート(2026-07-14~)
-     */
-    minimizeReservation?: boolean;
 }
 interface IOnTaskStatusChanged {
     /**
@@ -36,6 +32,8 @@ interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];
 }
 export interface IStorageSettings {
+    useScheduledDeleteTransactionTask?: boolean;
+    deleteTransactionTaskExpiresInDays?: number;
     /**
      * 取引保管期間(Confirmed)
      * default:365

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

@@ -79,7 +79,6 @@ export interface IPaymentMethodByPaymentUrl {
  */
 export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
-    private readonly transactionModel;
     constructor(connection: Connection);
     createPlaceOrderIfNotExists(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier' | 'broker' | 'seller' | 'customer'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
@@ -177,8 +176,6 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     savePaymentMethodId(params: {
         id: string;
         paymentMethod: IPaymentMethodByPaymentUrl;
-    }, options: {
-        savePaymentMethodIdInTransaction: boolean;
     }): Promise<void>;
     /**
      * 進行中取引に保管された採用済決済方法を検索する

package/lib/chevre/repo/orderInTransaction.js

@@ -5,7 +5,11 @@ exports.OrderInTransactionRepo = void 0;
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
-const transaction_1 = require("./mongoose/schemas/transaction");
+// import {
+//     createSchema as createTransactionSchema,
+//     IModel as ITransactionModel, modelName as transactionModelName,
+//     IDocType as ITransactionDocType
+// } from './mongoose/schemas/transaction';
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 // const debug = createDebug('chevre-domain:repo:orderInTransaction');
 /**
@@ -13,11 +17,11 @@ const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
  */
 class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveRepo {
     orderModel;
-    transactionModel;
+    // private readonly transactionModel: ITransactionModel;
     constructor(connection) {
         super(connection);
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
-        this.transactionModel = connection.model(transaction_1.modelName, (0, transaction_1.createSchema)());
+        // this.transactionModel = connection.model<ITransactionDocType, ITransactionModel>(transactionModelName, createTransactionSchema());
     }
     async createPlaceOrderIfNotExists(params) {
         const { orderNumber, project, identifier, broker, seller, customer } = params;
@@ -284,29 +288,33 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
      * 特定の進行中取引の決済方法IDを保管する
      * transactionsへの保管としてひとまず定義(2026-07-11~)
      */
-    async savePaymentMethodId(params, options) {
-        const { savePaymentMethodIdInTransaction } = options;
+    async savePaymentMethodId(params) {
         const { paymentMethodId } = params.paymentMethod;
         if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
             throw new factory_1.factory.errors.ArgumentNull('paymentMethod.paymentMethodId');
         }
-        if (savePaymentMethodIdInTransaction) {
-            await this.transactionModel.findOneAndUpdate({
-                _id: { $eq: params.id },
-                status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-            }, {
-                $set: { 'object.paymentMethods': { paymentMethodId } }
-            }, {
-                projection: { _id: 1 }
-            })
-                .lean()
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
-                }
-            });
-        }
+        // savePaymentMethodIdInTransactionは廃止(2026-08-04~)
+        // if (savePaymentMethodIdInTransaction) {
+        //     await this.transactionModel.findOneAndUpdate(
+        //         {
+        //             _id: { $eq: params.id },
+        //             status: { $eq: factory.transactionStatusType.InProgress }
+        //         },
+        //         {
+        //             $set: { 'object.paymentMethods': { paymentMethodId } }
+        //         },
+        //         {
+        //             projection: { _id: 1 }
+        //         }
+        //     )
+        //         .lean<{ _id: ObjectId }>()
+        //         .exec()
+        //         .then((doc) => {
+        //             if (doc === null) {
+        //                 throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+        //             }
+        //         });
+        // }
         // 注文ドキュメントにも保管する(2026-07-12~)
         await this.orderModel.findOneAndUpdate({
             identifier: { $eq: params.id },

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

@@ -5,7 +5,7 @@ type ICreatingTaskKeys = 'data' | 'executionResults' | 'name' | 'numberOfTried'
 /**
  * リトライ可能なタスク作成属性
  */
-type ICreatingTask = (Pick<factory.task.importEventCapacitiesFromCOA.IAttributes, ICreatingTaskKeys> | Pick<factory.task.importEventsFromCOA.IAttributes, ICreatingTaskKeys>) & {
+type ICreatingTask = (Pick<factory.task.importEventCapacitiesFromCOA.IAttributes, ICreatingTaskKeys> | Pick<factory.task.importEventsFromCOA.IAttributes, ICreatingTaskKeys> | Pick<factory.task.deleteTransaction.IAttributes, ICreatingTaskKeys>) & {
     expires: Date;
 };
 /**