@chevre/domain 26.0.0-alpha.26 → 26.0.0-alpha.28

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

@@ -1,37 +1,11 @@
-import type { Connection, UpdateQuery } from 'mongoose';
+import type { Connection } from 'mongoose';
 import { factory } from '../factory';
-import { IDocType } from './mongoose/schemas/transaction';
-interface IAggregationByStatus {
-    transactionCount: number;
-    avgDuration: number;
-    maxDuration: number;
-    minDuration: number;
-    percentilesDuration: {
-        name: string;
-        value: number;
-    }[];
-}
-interface IStatus {
-    status: factory.transactionStatusType;
-    aggregation: IAggregationByStatus;
-}
-export interface IAggregatePlaceOrder {
-    statuses: IStatus[];
-}
 /**
  * 取引リポジトリ
  */
 export declare class TransactionRepo {
     private readonly transactionModel;
     constructor(connection: Connection);
-    countPotentiallyExportTasks(params: {
-        endDate: {
-            $lt: Date;
-        };
-        limit?: number;
-    }): Promise<{
-        count: number;
-    }>;
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
@@ -53,27 +27,6 @@ export declare class TransactionRepo {
             startDate?: factory.sortType;
         };
     }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | null>;
-    /**
-     * tasksExportAction.actionStatusがActiveActionStatusのまま一定時間経過した取引について
-     * PotentialActionStatusに変更する
-     * 2025-03-10~
-     */
-    reExportAction(params: {
-        startDate: {
-            $lt: Date;
-        };
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
-    /**
-     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
-     */
-    exportTasksMany(params: {
-        now: Date;
-        delayInSeconds: number;
-        status: {
-            $in: factory.transactionStatusType[];
-        };
-        limit: number;
-    }): Promise<Pick<import("@chevre/factory/lib/chevre/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/chevre/transaction/returnOrder").ITransaction, "id" | "typeOf" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する
@@ -81,143 +34,4 @@ export declare class TransactionRepo {
     setTasksExportedById(params: {
         id: string;
     }): Promise<void>;
-    /**
-     * add(2025-03-13~)
-     */
-    countPotentiallyExpired(params: {
-        expires: {
-            $lt: Date;
-        };
-        limit?: number;
-    }): Promise<{
-        count: number;
-    }>;
-    /**
-     * add(2025-03-03~)
-     */
-    makeOneExpiredIfExists(params: {
-        expires: {
-            $lt: Date;
-        };
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | undefined>;
-    /**
-     * 取引を期限切れにする
-     */
-    makeExpired(params: {
-        expires: {
-            $lt: Date;
-        };
-        limit: number;
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'>[]>;
-    findByIdAndDelete(params: {
-        id: string;
-    }): Promise<void>;
-    unsetUnnecessaryFields(params: {
-        filter: any;
-        $unset: any;
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
-    updateById4migration(params: {
-        id: string;
-        update: UpdateQuery<IDocType>;
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
-    /**
-     * 終了日時を一定期間過ぎたアクションを削除する
-     */
-    deleteEndDatePassedCertainPeriod(params: {
-        typeOf: factory.transactionType;
-        endDate: {
-            $gte: Date;
-            $lt: Date;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
-    getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
-        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
-        project: import("@chevre/factory/lib/chevre/transaction").IProject;
-        seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
-        typeOf: factory.transactionType.PlaceOrder;
-        expires: Date;
-        result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
-        startDate: Date;
-        endDate?: Date | undefined;
-        instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
-        status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
-        error?: any;
-        project: import("@chevre/factory/lib/chevre/transaction").IProject;
-        seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
-        typeOf: factory.transactionType.ReturnOrder;
-        expires: Date;
-        result?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult | undefined;
-        startDate: Date;
-        endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        recipient?: undefined;
-        status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
-        object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
-        project: import("@chevre/factory/lib/chevre/transaction").IProject;
-        seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
-        typeOf: factory.transactionType.PlaceOrder;
-        expires: Date;
-        result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
-        startDate: Date;
-        endDate?: Date | undefined;
-        instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
-        status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | ({
-        object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
-        error?: any;
-        project: import("@chevre/factory/lib/chevre/transaction").IProject;
-        seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
-        typeOf: factory.transactionType.ReturnOrder;
-        expires: Date;
-        result?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult | undefined;
-        startDate: Date;
-        endDate?: Date | undefined;
-        agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
-        recipient?: undefined;
-        status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
-    } & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }))) | null>;
-    aggregatePlaceOrder(params: {
-        project?: {
-            id?: {
-                $ne?: string;
-            };
-        };
-        startFrom: Date;
-        startThrough: Date;
-        typeOf: factory.transactionType;
-        clientId?: string;
-    }): Promise<IAggregatePlaceOrder>;
-    private agggregateByStatus;
 }
-export {};

package/lib/chevre/repo/transaction.js

@@ -1,48 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionRepo = void 0;
-const moment_1 = __importDefault(require("moment"));
-const transaction_1 = require("../eventEmitter/transaction");
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
-const transaction_2 = require("./mongoose/schemas/transaction");
+const transaction_1 = require("./mongoose/schemas/transaction");
 /**
  * 取引リポジトリ
  */
 class TransactionRepo {
     transactionModel;
     constructor(connection) {
-        this.transactionModel = connection.model(transaction_2.modelName, (0, transaction_2.createSchema)());
-    }
-    async countPotentiallyExportTasks(params) {
-        const { endDate, limit } = params;
-        const endDateLt = endDate?.$lt;
-        if (!(endDateLt instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('endDate.$lt', 'must be Date');
-        }
-        const query = this.transactionModel.countDocuments({
-            status: {
-                $in: [
-                    factory_1.factory.transactionStatusType.Canceled,
-                    factory_1.factory.transactionStatusType.Confirmed,
-                    factory_1.factory.transactionStatusType.Expired
-                ]
-            },
-            'tasksExportAction.actionStatus': {
-                $exists: true,
-                $eq: factory_1.factory.actionStatusType.PotentialActionStatus
-            },
-            endDate: { $exists: true, $lt: endDateLt }
-        });
-        if (typeof limit === 'number' && limit >= 0) {
-            query.limit(limit);
-        }
-        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec();
-        return { count };
+        this.transactionModel = connection.model(transaction_1.modelName, (0, transaction_1.createSchema)());
     }
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
@@ -101,72 +69,6 @@ class TransactionRepo {
             .exec()
             .then((doc) => (doc === null) ? null : doc);
     }
-    /**
-     * tasksExportAction.actionStatusがActiveActionStatusのまま一定時間経過した取引について
-     * PotentialActionStatusに変更する
-     * 2025-03-10~
-     */
-    async reExportAction(params) {
-        const { startDate } = params;
-        if (!(startDate.$lt instanceof Date)) {
-            throw new factory_1.factory.errors.Argument('startDate.$lt', 'must be Date');
-        }
-        return this.transactionModel.updateMany({
-            'tasksExportAction.actionStatus': {
-                $exists: true,
-                $eq: factory_1.factory.actionStatusType.ActiveActionStatus
-            },
-            'tasksExportAction.startDate': {
-                $exists: true,
-                $lt: startDate.$lt
-            }
-        }, {
-            $set: {
-                tasksExportAction: {
-                    actionStatus: factory_1.factory.actionStatusType.PotentialActionStatus
-                }
-            }
-        })
-            .exec();
-    }
-    /**
-     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
-     */
-    async exportTasksMany(params) {
-        const delayedTransactions = await this.transactionModel.find({
-            status: { $in: params.status.$in },
-            'tasksExportAction.actionStatus': {
-                $exists: true,
-                $eq: factory_1.factory.actionStatusType.PotentialActionStatus
-            },
-            endDate: {
-                $exists: true,
-                $lt: (0, moment_1.default)(params.now)
-                    .add(-params.delayInSeconds, 'seconds')
-                    .toDate()
-            }
-        })
-            .select({
-            _id: 0,
-            id: { $toString: '$_id' },
-            typeOf: 1,
-            status: 1
-        })
-            .limit(params.limit)
-            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean()
-            .exec();
-        if (delayedTransactions.length > 0) {
-            delayedTransactions.forEach((delayedTransaction) => {
-                transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
-                    id: delayedTransaction.id,
-                    typeOf: delayedTransaction.typeOf,
-                    status: delayedTransaction.status
-                });
-            });
-        }
-        return delayedTransactions;
-    }
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する
@@ -189,288 +91,5 @@ class TransactionRepo {
         })
             .exec();
     }
-    /**
-     * add(2025-03-13~)
-     */
-    async countPotentiallyExpired(params) {
-        const { expires, limit } = params;
-        const query = this.transactionModel.countDocuments({
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress },
-            expires: { $lt: expires.$lt }
-        });
-        if (typeof limit === 'number' && limit >= 0) {
-            query.limit(limit);
-        }
-        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec();
-        return { count };
-    }
-    /**
-     * add(2025-03-03~)
-     */
-    async makeOneExpiredIfExists(params) {
-        const endDate = new Date();
-        const sort = {
-            expires: factory_1.factory.sortType.Ascending
-        };
-        const doc = await this.transactionModel.findOneAndUpdate({
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress },
-            expires: { $lt: params.expires.$lt }
-        }, {
-            status: factory_1.factory.transactionStatusType.Expired,
-            endDate
-        }, {
-            new: true,
-            projection: {
-                _id: 0,
-                id: { $toString: '$_id' },
-                typeOf: 1
-            }
-        })
-            .sort(sort)
-            .lean()
-            .exec();
-        if (doc === null) {
-            // no op
-            return;
-        }
-        else {
-            transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
-                id: doc.id,
-                typeOf: doc.typeOf,
-                status: factory_1.factory.transactionStatusType.Expired
-            });
-            return doc;
-        }
-    }
-    /**
-     * 取引を期限切れにする
-     */
-    async makeExpired(params) {
-        if (typeof params.limit !== 'number' || params.limit === 0) {
-            throw new factory_1.factory.errors.ArgumentNull('limit');
-        }
-        const sort = {
-            expires: factory_1.factory.sortType.Ascending
-        };
-        // IDをemitしたいのでまずリスト検索(2023-04-27~)
-        const expiringTransactions = await this.transactionModel.find({
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress },
-            expires: { $lt: params.expires.$lt }
-        })
-            .select({
-            _id: 0,
-            id: { $toString: '$_id' },
-            typeOf: 1
-        })
-            .limit(params.limit)
-            .sort(sort) // sort(2025-03-03~)
-            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean()
-            .exec();
-        if (expiringTransactions.length > 0) {
-            // ステータスと期限を見て更新
-            await this.transactionModel.updateMany({
-                _id: { $in: expiringTransactions.map((t) => t.id) },
-                status: { $eq: factory_1.factory.transactionStatusType.InProgress },
-                expires: { $lt: params.expires.$lt }
-            }, {
-                status: factory_1.factory.transactionStatusType.Expired,
-                endDate: new Date()
-            })
-                .exec();
-            expiringTransactions.forEach((expiringTransaction) => {
-                transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
-                    id: expiringTransaction.id,
-                    typeOf: expiringTransaction.typeOf,
-                    status: factory_1.factory.transactionStatusType.Expired
-                });
-            });
-        }
-        return expiringTransactions;
-    }
-    async findByIdAndDelete(params) {
-        await this.transactionModel.findByIdAndDelete(params.id)
-            .exec();
-    }
-    async unsetUnnecessaryFields(params) {
-        return this.transactionModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-            .exec();
-    }
-    async updateById4migration(params) {
-        return this.transactionModel.updateOne({ _id: { $eq: params.id } }, params.update)
-            .exec();
-    }
-    /**
-     * 終了日時を一定期間過ぎたアクションを削除する
-     */
-    async deleteEndDatePassedCertainPeriod(params) {
-        return this.transactionModel.deleteMany({
-            typeOf: { $eq: params.typeOf },
-            // 終了日時を一定期間過ぎたもの
-            endDate: {
-                $exists: true,
-                $gte: params.endDate.$gte,
-                $lt: params.endDate.$lt
-            }
-        })
-            .exec();
-    }
-    getCursor(conditions, projection, sort) {
-        return this.transactionModel.find(conditions, projection)
-            .sort({ startDate: (sort === factory_1.factory.sortType.Ascending) ? sort : factory_1.factory.sortType.Descending })
-            .cursor();
-    }
-    async aggregatePlaceOrder(params) {
-        const statuses = await Promise.all([
-            factory_1.factory.transactionStatusType.Confirmed,
-            factory_1.factory.transactionStatusType.Canceled,
-            factory_1.factory.transactionStatusType.Expired
-        ].map(async (transactionStatus) => {
-            const matchConditions = {
-                startDate: {
-                    $gte: params.startFrom,
-                    $lte: params.startThrough
-                },
-                typeOf: { $eq: params.typeOf },
-                status: { $eq: transactionStatus },
-                ...(typeof params.project?.id?.$ne === 'string')
-                    ? { 'project.id': { $ne: params.project.id.$ne } }
-                    : undefined,
-                ...(typeof params.clientId === 'string')
-                    // customerIdentifierAll.push();
-                    ? {
-                        'agent.identifier': {
-                            $exists: true,
-                            $all: [{ name: 'clientId', value: params.clientId }]
-                        }
-                    }
-                    : undefined
-            };
-            return this.agggregateByStatus({ matchConditions, status: transactionStatus });
-        }));
-        return { statuses };
-    }
-    async agggregateByStatus(params) {
-        const matchConditions = params.matchConditions;
-        const transactionStatus = params.status;
-        const aggregations = await this.transactionModel.aggregate([
-            {
-                $match: matchConditions
-            },
-            {
-                $project: {
-                    duration: { $subtract: ['$endDate', '$startDate'] },
-                    status: '$status',
-                    startDate: '$startDate',
-                    endDate: '$endDate',
-                    typeOf: '$typeOf'
-                }
-            },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    transactionCount: { $sum: 1 },
-                    maxDuration: { $max: '$duration' },
-                    minDuration: { $min: '$duration' },
-                    avgDuration: { $avg: '$duration' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    transactionCount: '$transactionCount',
-                    avgDuration: '$avgDuration',
-                    maxDuration: '$maxDuration',
-                    minDuration: '$minDuration'
-                }
-            }
-        ])
-            .exec();
-        const percents = [50, 95, 99];
-        if (aggregations.length === 0) {
-            return {
-                status: transactionStatus,
-                aggregation: {
-                    transactionCount: 0,
-                    avgDuration: 0,
-                    maxDuration: 0,
-                    minDuration: 0,
-                    percentilesDuration: percents.map((percent) => {
-                        return {
-                            name: String(percent),
-                            value: 0
-                        };
-                    })
-                    // totalPrice: 0,
-                    // maxPrice: 0,
-                    // minPrice: 0,
-                    // avgPrice: 0
-                }
-            };
-        }
-        const ranks4percentile = percents.map((percentile) => {
-            return {
-                percentile,
-                rank: Math.floor(aggregations[0].transactionCount * percentile / 100)
-            };
-        });
-        const aggregations2 = await this.transactionModel.aggregate([
-            {
-                $match: matchConditions
-            },
-            {
-                $project: {
-                    duration: { $subtract: ['$endDate', '$startDate'] },
-                    status: '$status',
-                    startDate: '$startDate',
-                    endDate: '$endDate',
-                    typeOf: '$typeOf'
-                    // result: '$result',
-                    // price: {
-                    //     $cond: {
-                    //         if: { $isNumber: '$result.order.price' },
-                    //         then: '$result.order.price',
-                    //         else: 0
-                    //     }
-                    // }
-                }
-            },
-            { $sort: { duration: 1 } },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    durations: { $push: '$duration' }
-                    // totalPrice: { $sum: '$price' },
-                    // maxPrice: { $max: '$price' },
-                    // minPrice: { $min: '$price' },
-                    // avgPrice: { $avg: '$price' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    percentilesDuration: ranks4percentile.map((rank) => {
-                        return {
-                            name: String(rank.percentile),
-                            value: { $arrayElemAt: ['$durations', rank.rank] }
-                        };
-                    })
-                    // totalPrice: '$totalPrice',
-                    // maxPrice: '$maxPrice',
-                    // minPrice: '$minPrice',
-                    // avgPrice: '$avgPrice'
-                }
-            }
-        ])
-            .exec();
-        return {
-            status: transactionStatus,
-            aggregation: {
-                ...aggregations[0],
-                ...aggregations2[0]
-            }
-        };
-    }
 }
 exports.TransactionRepo = TransactionRepo;

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

@@ -0,0 +1,52 @@
+import { Connection, FilterQuery } from 'mongoose';
+import { factory } from '../factory';
+import { IDocType } from './mongoose/schemas/updateAction';
+type StartableActionType = factory.actionType.AddAction | factory.actionType.UpdateAction | factory.actionType.ReplaceAction;
+export type IAction<T extends StartableActionType> = T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : never;
+type IKeyOfProjection = keyof IDocType;
+type IFindParams = Pick<factory.action.ISearchConditions, 'actionStatus' | 'actionStatusTypes' | 'agent' | 'id' | 'instrument' | 'limit' | 'object' | 'page' | 'project' | 'result' | 'sameAs' | 'sort' | 'startFrom' | 'startThrough' | 'typeOf'>;
+/**
+ * リソース編集アクションリポジトリ
+ */
+export declare class UpdateActionRepo {
+    private readonly updateActionModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: IFindParams): FilterQuery<IDocType>[];
+    /**
+     * アクション開始
+     */
+    startUpdateAction<T extends StartableActionType>(attributes: factory.action.IAttributes<T, any, any>): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
+    completeUpdateAction(params: {
+        typeOf: StartableActionType;
+        id: string;
+        result: any;
+    }): Promise<void>;
+    /**
+     * アクション失敗
+     */
+    giveUpUpdateAction(params: {
+        typeOf: StartableActionType;
+        id: string;
+        error: Error | Error[] | unknown;
+    }): Promise<void>;
+    findUpdateActions(params: IFindParams, inclusion: IKeyOfProjection[]): Promise<IAction<StartableActionType>[]>;
+    searchBySameAs(params: {
+        sameAs: {
+            id: {
+                $eq: string;
+            };
+        };
+        purpose?: {
+            id: {
+                $eq: string;
+            };
+        };
+        /**
+         * 1taskから複数actionが発生する可能性があるので、typeOf指定が必須
+         */
+        typeOf: {
+            $eq: StartableActionType;
+        };
+    }): Promise<Pick<IAction<StartableActionType>, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
+}
+export {};