@chevre/domain 24.0.0-alpha.9 → 24.0.0

package/lib/chevre/repo/transaction.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,26 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionRepo = void 0;
 const moment_1 = __importDefault(require("moment"));
 const transaction_1 = require("../eventEmitter/transaction");
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const transaction_2 = require("./mongoose/schemas/transaction");
-const AVAILABLE_PROJECT_FIELDS = [
-    'project',
-    'status',
-    'typeOf',
-    'agent',
-    'recipient',
-    'seller',
-    'error',
-    'result',
-    'object',
-    'expires',
-    'startDate',
-    'endDate',
-    'tasksExportAction',
-    'potentialActions',
-    'instrument'
-];
+// type IOmittedFieldsInProgress = 'tasksExportAction' | 'tasksExportedAt' | 'tasksExportationStatus';
+// export type IMoneyTransferTransactionInProgress = Omit<factory.transaction.moneyTransfer.ITransaction, IOmittedFieldsInProgress>;
+// type IStartedTransactionFields = 'expires' | 'id' | 'startDate' | 'status';
+// export type IStartedTransaction = Pick<factory.transaction.ITransaction<factory.transactionType>, IStartedTransactionFields>;
 /**
  * 取引リポジトリ
  */
@@ -57,255 +21,269 @@ class TransactionRepo {
     constructor(connection) {
         this.transactionModel = connection.model(transaction_2.modelName, (0, transaction_2.createSchema)());
     }
-    static CREATE_MONGO_CONDITIONS(params) {
-        if (params.typeOf !== factory.transactionType.MoneyTransfer) {
-            throw new factory.errors.Argument('typeOf', `must be ${factory.transactionType.MoneyTransfer}`);
-        }
-        const andConditions = [];
-        const projectIdEq = params.project?.id?.$eq;
-        if (typeof projectIdEq === 'string') {
-            andConditions.push({ 'project.id': { $eq: projectIdEq } });
-        }
-        if (typeof params.typeOf === 'string') {
-            andConditions.push({ typeOf: { $eq: params.typeOf } });
-        }
-        if (params.startFrom !== undefined) {
-            andConditions.push({
-                startDate: { $gte: params.startFrom }
-            });
-        }
-        if (params.startThrough !== undefined) {
-            andConditions.push({
-                startDate: { $lte: params.startThrough }
-            });
-        }
-        if (params.endFrom !== undefined) {
-            andConditions.push({
-                endDate: {
-                    $exists: true,
-                    $gte: params.endFrom
-                }
-            });
-        }
-        if (params.endThrough !== undefined) {
-            andConditions.push({
-                endDate: {
-                    $exists: true,
-                    $lt: params.endThrough
-                }
-            });
-        }
-        if (Array.isArray(params.ids)) {
-            andConditions.push({
-                _id: { $in: params.ids }
-            });
-        }
-        if (Array.isArray(params.statuses)) {
-            andConditions.push({ status: { $in: params.statuses } });
-        }
-        const statusIn = params.status?.$in;
-        if (Array.isArray(statusIn)) {
-            andConditions.push({ status: { $in: statusIn } });
-        }
-        if (params.agent !== undefined) {
-            if (params.agent.typeOf !== undefined) {
-                andConditions.push({
-                    'agent.typeOf': {
-                        $exists: true,
-                        $eq: params.agent.typeOf
-                    }
-                });
-            }
-            if (Array.isArray(params.agent.ids)) {
-                andConditions.push({
-                    'agent.id': {
-                        $exists: true,
-                        $in: params.agent.ids
-                    }
-                });
-            }
-            if (Array.isArray(params.agent.identifiers)) {
-                andConditions.push({
-                    'agent.identifier': {
-                        $exists: true,
-                        $in: params.agent.identifiers
-                    }
-                });
-            }
-        }
-        const tasksExportActionStatusIn = params.tasksExportAction?.actionStatus?.$in;
-        if (Array.isArray(tasksExportActionStatusIn)) {
-            andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $in: tasksExportActionStatusIn } });
-        }
-        const tasksExportActionStatusEq = params.tasksExportAction?.actionStatus?.$eq;
-        if (typeof tasksExportActionStatusEq === 'string') {
-            andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
-        }
-        switch (params.typeOf) {
-            case factory.transactionType.PlaceOrder:
-                throw new factory.errors.NotImplemented(`use PlaceOrderRepo`);
-            // const sellerIdIn = params.seller?.ids;
-            // if (Array.isArray(sellerIdIn)) {
-            //     andConditions.push({ 'seller.id': { $exists: true, $in: sellerIdIn } });
-            // }
-            // const resultOrderNumberIn = params.result?.order?.orderNumbers;
-            // if (Array.isArray(resultOrderNumberIn)) {
-            //     andConditions.push({ 'result.order.orderNumber': { $exists: true, $in: resultOrderNumberIn } });
-            // }
-            // const resultOrderConfirmationNumberEq = params.result?.order?.confirmationNumber?.$eq;
-            // if (typeof resultOrderConfirmationNumberEq === 'string') {
-            //     andConditions.push({
-            //         'result.order.confirmationNumber': { $exists: true, $eq: resultOrderConfirmationNumberEq }
-            //     });
-            // }
-            // const objectOrderNumberEq = params.object?.orderNumber?.$eq;
-            // if (typeof objectOrderNumberEq === 'string') {
-            //     andConditions.push({ 'object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
-            // }
-            // break;
-            case factory.transactionType.ReturnOrder:
-                throw new factory.errors.NotImplemented(`use ReturnOrderRepo`);
-            // if (params.object !== undefined) {
-            //     if (params.object.order !== undefined) {
-            //         if (Array.isArray(params.object.order.orderNumbers)) {
-            //             andConditions.push({
-            //                 'object.order.orderNumber': {
-            //                     $exists: true,
-            //                     $in: params.object.order.orderNumbers
-            //                 }
-            //             });
-            //         }
-            //     }
-            // }
-            // break;
-            default:
-        }
-        return andConditions;
-    }
-    /**
-     * 取引を開始する
-     */
-    async startNoPlaceOrder(params) {
-        const status = factory.transactionStatusType.InProgress;
-        const tasksExportAction = { actionStatus: factory.actionStatusType.PotentialActionStatus };
-        // const tasksExportationStatus = factory.transactionTasksExportationStatus.Unexported; // discontinue(2024-06-20~)
-        const startDate = new Date();
-        let expires;
-        const { typeOf } = params;
-        if (typeOf === factory.transactionType.ReturnOrder) {
-            // expiresInSecondsの指定があれば優先して適用する(2022-11-25~)
-            if (typeof params.expiresInSeconds === 'number' && params.expiresInSeconds > 0) {
-                expires = (0, moment_1.default)(startDate)
-                    .add(params.expiresInSeconds, 'seconds')
-                    .toDate();
-            }
-            else {
-                throw new factory.errors.ArgumentNull('expiresInSeconds');
-            }
-        }
-        else {
-            expires = params.expires;
-        }
-        let creatingTransaction;
-        if (typeOf === factory.transactionType.MoneyTransfer) {
-            const { agent, project, object, seller, recipient } = params;
-            creatingTransaction = {
-                status, startDate, expires, typeOf, tasksExportAction,
-                agent, project, seller, object, recipient
-            };
-        }
-        else if (typeOf === factory.transactionType.ReturnOrder) {
-            const { agent, project, object, seller } = params;
-            creatingTransaction = {
-                status, startDate, expires, typeOf, tasksExportAction,
-                agent, project, seller, object
-            };
-        }
-        else {
-            throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
-        }
-        // reimplemnt with insertMany(2024-05-30~)
-        const result = await this.transactionModel.insertMany(creatingTransaction, { rawResult: true });
-        const id = result.insertedIds?.[0]?.toHexString();
-        if (typeof id !== 'string') {
-            throw new factory.errors.Internal('transaction not saved');
-        }
-        // 取引開始時にも取引イベントエミッター連携(2024-03-21~)
-        transaction_1.transactionEventEmitter.emitTransactionStatusChanged({ id, typeOf, status });
-        return { expires, id, startDate, status }; // minimize response(2024-05-30~)
-    }
-    /**
-     * 特定取引検索
-     */
-    async projectFieldsByIdNoPlaceOrder(params, inclusion // make required(2024-05-31~)
-    ) {
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-        if (Array.isArray(inclusion) && inclusion.length > 0) {
-            positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(key));
-        }
-        else {
-            throw new factory.errors.NotImplemented('inclusion must be specified'); // 2024-08-26~
-        }
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
-        };
-        // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: AnyExpression } = {};
-        // if (Array.isArray(inclusion) && inclusion.length > 0) {
-        //     inclusion.forEach((field) => {
-        //         projection[field] = 1;
-        //     });
-        // } else {
-        //     projection = {
-        //         __v: 0,
-        //         createdAt: 0,
-        //         updatedAt: 0
-        //     };
-        // }
-        const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf }
-        }, projection)
-            .lean() // 2024-08-26~
-            .exec();
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} not found`);
-        }
-        return doc;
-    }
-    /**
-     * 進行中の取引を取得する
-     */
-    async findMoneyTransferInProgressById(params, inclusion // make required(2024-05-29~)
-    ) {
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-        if (Array.isArray(inclusion) && inclusion.length > 0) {
-            positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(key));
-        }
-        else {
-            throw new factory.errors.NotImplemented('inclusion must be specified'); // 2024-08-26~
-        }
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
-        };
-        const filter = {
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
-            status: { $eq: factory.transactionStatusType.InProgress },
-            // expiresを条件に追加(2023-05-12~),
-            expires: { $gt: new Date() }
-        };
-        const doc = await this.transactionModel.findOne(filter, projection)
-            .lean() // 2024-08-26~
-            .exec();
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
-        }
-        return doc;
-    }
+    // public static CREATE_MONGO_CONDITIONS(params: factory.transaction.ISearchConditions<factory.transactionType.MoneyTransfer>) {
+    //     if (params.typeOf !== factory.transactionType.MoneyTransfer) {
+    //         throw new factory.errors.Argument('typeOf', `must be ${factory.transactionType.MoneyTransfer}`);
+    //     }
+    //     const andConditions: FilterQuery<factory.assetTransaction.ITransaction<factory.assetTransactionType>>[] = [];
+    //     const projectIdEq = params.project?.id?.$eq;
+    //     if (typeof projectIdEq === 'string') {
+    //         andConditions.push({ 'project.id': { $eq: projectIdEq } });
+    //     }
+    //     if (typeof params.typeOf === 'string') {
+    //         andConditions.push({ typeOf: { $eq: params.typeOf } });
+    //     }
+    //     if (params.startFrom !== undefined) {
+    //         andConditions.push({
+    //             startDate: { $gte: params.startFrom }
+    //         });
+    //     }
+    //     if (params.startThrough !== undefined) {
+    //         andConditions.push({
+    //             startDate: { $lte: params.startThrough }
+    //         });
+    //     }
+    //     if (params.endFrom !== undefined) {
+    //         andConditions.push({
+    //             endDate: {
+    //                 $exists: true,
+    //                 $gte: params.endFrom
+    //             }
+    //         });
+    //     }
+    //     if (params.endThrough !== undefined) {
+    //         andConditions.push({
+    //             endDate: {
+    //                 $exists: true,
+    //                 $lt: params.endThrough
+    //             }
+    //         });
+    //     }
+    //     if (Array.isArray(params.ids)) {
+    //         andConditions.push({
+    //             _id: { $in: params.ids }
+    //         });
+    //     }
+    //     if (Array.isArray(params.statuses)) {
+    //         andConditions.push({ status: { $in: params.statuses } });
+    //     }
+    //     const statusIn = params.status?.$in;
+    //     if (Array.isArray(statusIn)) {
+    //         andConditions.push({ status: { $in: statusIn } });
+    //     }
+    //     if (params.agent !== undefined) {
+    //         if (params.agent.typeOf !== undefined) {
+    //             andConditions.push({
+    //                 'agent.typeOf': {
+    //                     $exists: true,
+    //                     $eq: params.agent.typeOf
+    //                 }
+    //             });
+    //         }
+    //         if (Array.isArray(params.agent.ids)) {
+    //             andConditions.push({
+    //                 'agent.id': {
+    //                     $exists: true,
+    //                     $in: params.agent.ids
+    //                 }
+    //             });
+    //         }
+    //         if (Array.isArray(params.agent.identifiers)) {
+    //             andConditions.push({
+    //                 'agent.identifier': {
+    //                     $exists: true,
+    //                     $in: params.agent.identifiers
+    //                 }
+    //             });
+    //         }
+    //     }
+    //     const tasksExportActionStatusIn = params.tasksExportAction?.actionStatus?.$in;
+    //     if (Array.isArray(tasksExportActionStatusIn)) {
+    //         andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $in: tasksExportActionStatusIn } });
+    //     }
+    //     const tasksExportActionStatusEq = params.tasksExportAction?.actionStatus?.$eq;
+    //     if (typeof tasksExportActionStatusEq === 'string') {
+    //         andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
+    //     }
+    //     switch (params.typeOf) {
+    //         case factory.transactionType.PlaceOrder as any:
+    //             throw new factory.errors.NotImplemented(`use PlaceOrderRepo`);
+    //         // const sellerIdIn = params.seller?.ids;
+    //         // if (Array.isArray(sellerIdIn)) {
+    //         //     andConditions.push({ 'seller.id': { $exists: true, $in: sellerIdIn } });
+    //         // }
+    //         // const resultOrderNumberIn = params.result?.order?.orderNumbers;
+    //         // if (Array.isArray(resultOrderNumberIn)) {
+    //         //     andConditions.push({ 'result.order.orderNumber': { $exists: true, $in: resultOrderNumberIn } });
+    //         // }
+    //         // const resultOrderConfirmationNumberEq = params.result?.order?.confirmationNumber?.$eq;
+    //         // if (typeof resultOrderConfirmationNumberEq === 'string') {
+    //         //     andConditions.push({
+    //         //         'result.order.confirmationNumber': { $exists: true, $eq: resultOrderConfirmationNumberEq }
+    //         //     });
+    //         // }
+    //         // const objectOrderNumberEq = params.object?.orderNumber?.$eq;
+    //         // if (typeof objectOrderNumberEq === 'string') {
+    //         //     andConditions.push({ 'object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
+    //         // }
+    //         // break;
+    //         case factory.transactionType.ReturnOrder as any:
+    //             throw new factory.errors.NotImplemented(`use ReturnOrderRepo`);
+    //         // if (params.object !== undefined) {
+    //         //     if (params.object.order !== undefined) {
+    //         //         if (Array.isArray(params.object.order.orderNumbers)) {
+    //         //             andConditions.push({
+    //         //                 'object.order.orderNumber': {
+    //         //                     $exists: true,
+    //         //                     $in: params.object.order.orderNumbers
+    //         //                 }
+    //         //             });
+    //         //         }
+    //         //     }
+    //         // }
+    //         // break;
+    //         default:
+    //     }
+    //     return andConditions;
+    // }
+    // /**
+    //  * 取引を開始する
+    //  */
+    // // public async startNoPlaceOrder<
+    // public async startMoneyTransfer(
+    //     params: factory.transaction.IStartParams<factory.transactionType.MoneyTransfer>
+    // ): Promise<IStartedTransaction> {
+    //     const status = factory.transactionStatusType.InProgress;
+    //     const tasksExportAction: factory.transaction.ITasksExportAction = { actionStatus: factory.actionStatusType.PotentialActionStatus };
+    //     // const tasksExportationStatus = factory.transactionTasksExportationStatus.Unexported; // discontinue(2024-06-20~)
+    //     const startDate: Date = new Date();
+    //     // let expires: Date;
+    //     const { typeOf } = params;
+    //     // if (typeOf === factory.transactionType.ReturnOrder) {
+    //     //     // expiresInSecondsの指定があれば優先して適用する(2022-11-25~)
+    //     //     if (typeof params.expiresInSeconds === 'number' && params.expiresInSeconds > 0) {
+    //     //         expires = moment(startDate)
+    //     //             .add(params.expiresInSeconds, 'seconds')
+    //     //             .toDate();
+    //     //     } else {
+    //     //         throw new factory.errors.ArgumentNull('expiresInSeconds');
+    //     //     }
+    //     // } else {
+    //     //     expires = params.expires;
+    //     // }
+    //     const expires = params.expires;
+    //     let creatingTransaction: factory.transaction.IAttributes<factory.transactionType.MoneyTransfer>;
+    //     if (typeOf === factory.transactionType.MoneyTransfer) {
+    //         const { agent, project, object, seller, recipient } = params;
+    //         creatingTransaction = {
+    //             status, startDate, expires, typeOf, tasksExportAction,
+    //             agent, project, seller, object, recipient
+    //         };
+    //         // } else if (typeOf === factory.transactionType.ReturnOrder) {
+    //         //     const { agent, project, object, seller } = params;
+    //         //     creatingTransaction = {
+    //         //         status, startDate, expires, typeOf, tasksExportAction,
+    //         //         agent, project, seller, object
+    //         //     };
+    //     } else {
+    //         throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
+    //     }
+    //     // reimplemnt with insertMany(2024-05-30~)
+    //     const result = await this.transactionModel.insertMany(
+    //         creatingTransaction,
+    //         { rawResult: true }
+    //     );
+    //     const id = result.insertedIds?.[0]?.toHexString();
+    //     if (typeof id !== 'string') {
+    //         throw new factory.errors.Internal('transaction not saved');
+    //     }
+    //     // 取引開始時にも取引イベントエミッター連携(2024-03-21~)
+    //     transactionEventEmitter.emitTransactionStatusChanged({ id, typeOf, status });
+    //     return { expires, id, startDate, status }; // minimize response(2024-05-30~)
+    // }
+    // /**
+    //  * 特定取引検索
+    //  */
+    // public async findMoneyTransferById(
+    //     params: { typeOf: factory.transactionType.MoneyTransfer; id: string },
+    //     inclusion: IKeyOfProjection[] // make required(2024-05-31~)
+    // ): Promise<factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>> {
+    //     let positiveProjectionFields: IKeyOfProjection[] = AVAILABLE_PROJECT_FIELDS;
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(<IKeyOfProjection>key));
+    //     } else {
+    //         throw new factory.errors.NotImplemented('inclusion must be specified'); // 2024-08-26~
+    //     }
+    //     const projection: ProjectionType<factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>> = {
+    //         _id: 0,
+    //         id: { $toString: '$_id' },
+    //         ...Object.fromEntries<1>(positiveProjectionFields.map((key) => ([key, 1])))
+    //     };
+    //     // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: AnyExpression } = {};
+    //     // if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //     //     inclusion.forEach((field) => {
+    //     //         projection[field] = 1;
+    //     //     });
+    //     // } else {
+    //     //     projection = {
+    //     //         __v: 0,
+    //     //         createdAt: 0,
+    //     //         updatedAt: 0
+    //     //     };
+    //     // }
+    //     const doc = await this.transactionModel.findOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: params.typeOf }
+    //         },
+    //         projection
+    //     )
+    //         .lean<factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>>() // 2024-08-26~
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} not found`);
+    //     }
+    //     return doc;
+    // }
+    // /**
+    //  * 進行中の取引を取得する
+    //  */
+    // public async findMoneyTransferInProgressById(
+    //     params: {
+    //         typeOf: factory.transactionType.MoneyTransfer;
+    //         id: string;
+    //     },
+    //     inclusion: IKeyOfProjection[] // make required(2024-05-29~)
+    // ): Promise<IMoneyTransferTransactionInProgress> {
+    //     let positiveProjectionFields: IKeyOfProjection[] = AVAILABLE_PROJECT_FIELDS;
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(<IKeyOfProjection>key));
+    //     } else {
+    //         throw new factory.errors.NotImplemented('inclusion must be specified'); // 2024-08-26~
+    //     }
+    //     const projection: ProjectionType<factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>> = {
+    //         _id: 0,
+    //         id: { $toString: '$_id' },
+    //         ...Object.fromEntries<1>(positiveProjectionFields.map((key) => ([key, 1])))
+    //     };
+    //     const filter: FilterQuery<factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>> = {
+    //         _id: { $eq: params.id },
+    //         typeOf: { $eq: params.typeOf },
+    //         status: { $eq: factory.transactionStatusType.InProgress },
+    //         // expiresを条件に追加(2023-05-12~),
+    //         expires: { $gt: new Date() }
+    //     };
+    //     const doc = await this.transactionModel.findOne(filter, projection)
+    //         .lean<factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>>() // 2024-08-26~
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`
+    //         );
+    //     }
+    //     return doc;
+    // }
     // /**
     //  * 進行中の取引を取得する
     //  */
@@ -525,71 +503,82 @@ class TransactionRepo {
     //         );
     //     }
     // }
-    /**
-     * 取引を確定する
-     */
-    async confirmNoPlaceOrder(params) {
-        const endDate = new Date();
-        const doc = await this.transactionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
-            status: { $eq: factory.transactionStatusType.InProgress },
-            expires: { $gt: endDate } // add expires(2025-02-27~)
-        }, {
-            status: factory.transactionStatusType.Confirmed, // ステータス変更
-            endDate,
-            // 'object.authorizeActions': params.authorizeActions,
-            result: params.result, // resultを更新
-            potentialActions: params.potentialActions // resultを更新
-        }, {
-            new: true,
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-        // NotFoundであれば取引状態確認
-        if (doc === null) {
-            const { expires, status } = await this.projectFieldsByIdNoPlaceOrder({ typeOf: params.typeOf, id: params.id }, ['expires', 'status']);
-            if (status === factory.transactionStatusType.Confirmed) {
-                // すでに確定済の場合スルー
-            }
-            else if (status === factory.transactionStatusType.Expired) {
-                throw new factory.errors.Argument('Transaction id', 'Already expired');
-            }
-            else if (status === factory.transactionStatusType.Canceled) {
-                throw new factory.errors.Argument('Transaction id', 'Already canceled');
-            }
-            else {
-                if ((0, moment_1.default)(expires)
-                    .isSameOrBefore((0, moment_1.default)(endDate))) {
-                    throw new factory.errors.Argument('Transaction id', 'potentially expired');
-                }
-                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
-            }
-        }
-        transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
-            id: params.id,
-            typeOf: params.typeOf,
-            status: factory.transactionStatusType.Confirmed
-        });
-    }
+    // /**
+    //  * 取引を確定する
+    //  */
+    // // public async confirmNoPlaceOrder<
+    // public async confirmMoneyTransfer(params: {
+    //     typeOf: factory.transactionType.MoneyTransfer;
+    //     id: string;
+    //     result: factory.transaction.IResult<factory.transactionType.MoneyTransfer>;
+    //     potentialActions: factory.transaction.IPotentialActions<factory.transactionType.MoneyTransfer>;
+    // }): Promise<void> {
+    //     const endDate = new Date();
+    //     const doc = await this.transactionModel.findOneAndUpdate(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: params.typeOf },
+    //             status: { $eq: factory.transactionStatusType.InProgress },
+    //             expires: { $gt: endDate } // add expires(2025-02-27~)
+    //         },
+    //         {
+    //             status: factory.transactionStatusType.Confirmed, // ステータス変更
+    //             endDate,
+    //             // 'object.authorizeActions': params.authorizeActions,
+    //             result: params.result, // resultを更新
+    //             potentialActions: params.potentialActions // resultを更新
+    //         },
+    //         {
+    //             new: true,
+    //             projection: { _id: 1 }
+    //         }
+    //     )
+    //         .lean<{ _id: ObjectId }>()
+    //         .exec();
+    //     // NotFoundであれば取引状態確認
+    //     if (doc === null) {
+    //         const { expires, status } = <Pick<factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>, 'expires' | 'status'>>
+    //             await this.findMoneyTransferById({ typeOf: params.typeOf, id: params.id }, ['expires', 'status']);
+    //         if (status === factory.transactionStatusType.Confirmed) {
+    //             // すでに確定済の場合スルー
+    //         } else if (status === factory.transactionStatusType.Expired) {
+    //             throw new factory.errors.Argument('Transaction id', 'Already expired');
+    //         } else if (status === factory.transactionStatusType.Canceled) {
+    //             throw new factory.errors.Argument('Transaction id', 'Already canceled');
+    //         } else {
+    //             if (moment(expires)
+    //                 .isSameOrBefore(moment(endDate))) {
+    //                 throw new factory.errors.Argument('Transaction id', 'potentially expired');
+    //             }
+    //             throw new factory.errors.NotFound(
+    //                 this.transactionModel.modelName,
+    //                 `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`
+    //             );
+    //         }
+    //     }
+    //     transactionEventEmitter.emitTransactionStatusChanged({
+    //         id: params.id,
+    //         typeOf: params.typeOf,
+    //         status: factory.transactionStatusType.Confirmed
+    //     });
+    // }
     async countPotentiallyExportTasks(params) {
         const { endDate, limit } = params;
         const endDateLt = endDate?.$lt;
         if (!(endDateLt instanceof Date)) {
-            throw new factory.errors.Argument('endDate.$lt', 'must be Date');
+            throw new factory_1.factory.errors.Argument('endDate.$lt', 'must be Date');
         }
         const query = this.transactionModel.countDocuments({
             status: {
                 $in: [
-                    factory.transactionStatusType.Canceled,
-                    factory.transactionStatusType.Confirmed,
-                    factory.transactionStatusType.Expired
+                    factory_1.factory.transactionStatusType.Canceled,
+                    factory_1.factory.transactionStatusType.Confirmed,
+                    factory_1.factory.transactionStatusType.Expired
                 ]
             },
             'tasksExportAction.actionStatus': {
                 $exists: true,
-                $eq: factory.actionStatusType.PotentialActionStatus
+                $eq: factory_1.factory.actionStatusType.PotentialActionStatus
             },
             endDate: { $exists: true, $lt: endDateLt }
         });
@@ -608,14 +597,14 @@ class TransactionRepo {
         const endDateLt = params.endDate?.$lt;
         if (typeof statusEq === 'string') {
             switch (statusEq) {
-                case factory.transactionStatusType.InProgress:
-                    throw new factory.errors.NotImplemented(`status "${params.status}" not implemented on startExportTasks`);
+                case factory_1.factory.transactionStatusType.InProgress:
+                    throw new factory_1.factory.errors.NotImplemented(`status "${params.status}" not implemented on startExportTasks`);
                 default:
                 // no op
             }
         }
         if (!(endDateLt instanceof Date)) {
-            throw new factory.errors.Argument('endDate.$lt', 'must be Date');
+            throw new factory_1.factory.errors.Argument('endDate.$lt', 'must be Date');
         }
         const query = this.transactionModel.findOneAndUpdate({
             // ...(Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined,
@@ -624,20 +613,20 @@ class TransactionRepo {
                     ? { $eq: statusEq }
                     : {
                         $in: [
-                            factory.transactionStatusType.Canceled,
-                            factory.transactionStatusType.Confirmed,
-                            factory.transactionStatusType.Expired
+                            factory_1.factory.transactionStatusType.Canceled,
+                            factory_1.factory.transactionStatusType.Confirmed,
+                            factory_1.factory.transactionStatusType.Expired
                         ]
                     }
             },
             'tasksExportAction.actionStatus': {
                 $exists: true,
-                $eq: factory.actionStatusType.PotentialActionStatus
+                $eq: factory_1.factory.actionStatusType.PotentialActionStatus
             },
             endDate: { $exists: true, $lt: endDateLt },
             ...(typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined
         }, {
-            'tasksExportAction.actionStatus': factory.actionStatusType.ActiveActionStatus,
+            'tasksExportAction.actionStatus': factory_1.factory.actionStatusType.ActiveActionStatus,
             'tasksExportAction.agent': { name: params.tasksExportAction.agent.name },
             'tasksExportAction.startDate': new Date()
         }, {
@@ -715,12 +704,12 @@ class TransactionRepo {
     async reExportAction(params) {
         const { startDate } = params;
         if (!(startDate.$lt instanceof Date)) {
-            throw new factory.errors.Argument('startDate.$lt', 'must be Date');
+            throw new factory_1.factory.errors.Argument('startDate.$lt', 'must be Date');
         }
         return this.transactionModel.updateMany({
             'tasksExportAction.actionStatus': {
                 $exists: true,
-                $eq: factory.actionStatusType.ActiveActionStatus
+                $eq: factory_1.factory.actionStatusType.ActiveActionStatus
             },
             'tasksExportAction.startDate': {
                 $exists: true,
@@ -729,7 +718,7 @@ class TransactionRepo {
         }, {
             $set: {
                 tasksExportAction: {
-                    actionStatus: factory.actionStatusType.PotentialActionStatus
+                    actionStatus: factory_1.factory.actionStatusType.PotentialActionStatus
                 }
             }
         })
@@ -743,7 +732,7 @@ class TransactionRepo {
             status: { $in: params.status.$in },
             'tasksExportAction.actionStatus': {
                 $exists: true,
-                $eq: factory.actionStatusType.PotentialActionStatus
+                $eq: factory_1.factory.actionStatusType.PotentialActionStatus
             },
             endDate: {
                 $exists: true,
@@ -785,12 +774,12 @@ class TransactionRepo {
             // tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
             'tasksExportAction.actionStatus': {
                 $exists: true,
-                $eq: factory.actionStatusType.ActiveActionStatus
+                $eq: factory_1.factory.actionStatusType.ActiveActionStatus
             }
         }, {
             // tasksExportationStatus: factory.transactionTasksExportationStatus.Exported, // discontinue(2024-06-20~)
             // tasksExportedAt: endDate, // discontinue(2024-06-20~)
-            'tasksExportAction.actionStatus': factory.actionStatusType.CompletedActionStatus,
+            'tasksExportAction.actionStatus': factory_1.factory.actionStatusType.CompletedActionStatus,
             'tasksExportAction.endDate': endDate
         })
             .exec();
@@ -801,7 +790,7 @@ class TransactionRepo {
     async countPotentiallyExpired(params) {
         const { expires, limit } = params;
         const query = this.transactionModel.countDocuments({
-            status: { $eq: factory.transactionStatusType.InProgress },
+            status: { $eq: factory_1.factory.transactionStatusType.InProgress },
             expires: { $lt: expires.$lt }
         });
         if (typeof limit === 'number' && limit >= 0) {
@@ -817,13 +806,13 @@ class TransactionRepo {
     async makeOneExpiredIfExists(params) {
         const endDate = new Date();
         const sort = {
-            expires: factory.sortType.Ascending
+            expires: factory_1.factory.sortType.Ascending
         };
         const doc = await this.transactionModel.findOneAndUpdate({
-            status: { $eq: factory.transactionStatusType.InProgress },
+            status: { $eq: factory_1.factory.transactionStatusType.InProgress },
             expires: { $lt: params.expires.$lt }
         }, {
-            status: factory.transactionStatusType.Expired,
+            status: factory_1.factory.transactionStatusType.Expired,
             endDate
         }, {
             new: true,
@@ -838,12 +827,13 @@ class TransactionRepo {
             .exec();
         if (doc === null) {
             // no op
+            return;
         }
         else {
             transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
                 id: doc.id,
                 typeOf: doc.typeOf,
-                status: factory.transactionStatusType.Expired
+                status: factory_1.factory.transactionStatusType.Expired
             });
             return doc;
         }
@@ -853,14 +843,14 @@ class TransactionRepo {
      */
     async makeExpired(params) {
         if (typeof params.limit !== 'number' || params.limit === 0) {
-            throw new factory.errors.ArgumentNull('limit');
+            throw new factory_1.factory.errors.ArgumentNull('limit');
         }
         const sort = {
-            expires: factory.sortType.Ascending
+            expires: factory_1.factory.sortType.Ascending
         };
         // IDをemitしたいのでまずリスト検索(2023-04-27~)
         const expiringTransactions = await this.transactionModel.find({
-            status: { $eq: factory.transactionStatusType.InProgress },
+            status: { $eq: factory_1.factory.transactionStatusType.InProgress },
             expires: { $lt: params.expires.$lt }
         })
             .select({
@@ -877,10 +867,10 @@ class TransactionRepo {
             // ステータスと期限を見て更新
             await this.transactionModel.updateMany({
                 _id: { $in: expiringTransactions.map((t) => t.id) },
-                status: { $eq: factory.transactionStatusType.InProgress },
+                status: { $eq: factory_1.factory.transactionStatusType.InProgress },
                 expires: { $lt: params.expires.$lt }
             }, {
-                status: factory.transactionStatusType.Expired,
+                status: factory_1.factory.transactionStatusType.Expired,
                 endDate: new Date()
             })
                 .exec();
@@ -888,107 +878,128 @@ class TransactionRepo {
                 transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
                     id: expiringTransaction.id,
                     typeOf: expiringTransaction.typeOf,
-                    status: factory.transactionStatusType.Expired
+                    status: factory_1.factory.transactionStatusType.Expired
                 });
             });
         }
         return expiringTransactions;
     }
-    /**
-     * 取引を中止する
-     */
-    async cancelNoPlaceOrder(params) {
-        const endDate = new Date();
-        // 進行中ステータスの取引を中止する
-        const doc = await this.transactionModel.findOneAndUpdate({
-            typeOf: params.typeOf,
-            _id: params.id,
-            status: factory.transactionStatusType.InProgress
-        }, {
-            status: factory.transactionStatusType.Canceled,
-            endDate: endDate
-        }, {
-            new: true,
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-        // NotFoundであれば取引状態確認
-        if (doc === null) {
-            const { status } = await this.projectFieldsByIdNoPlaceOrder(params, ['status']);
-            if (status === factory.transactionStatusType.Canceled) {
-                // すでに中止済の場合スルー
-            }
-            else if (status === factory.transactionStatusType.Expired) {
-                throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
-            }
-            else if (status === factory.transactionStatusType.Confirmed) {
-                throw new factory.errors.Argument('Transaction id', 'Confirmed transaction unable to cancel');
-            }
-            else {
-                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
-            }
-        }
-        transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
-            id: params.id,
-            typeOf: params.typeOf,
-            status: factory.transactionStatusType.Canceled
-        });
-    }
-    async countMoneyTransfer(params) {
-        const { limit } = params;
-        const conditions = TransactionRepo.CREATE_MONGO_CONDITIONS(params);
-        const query = this.transactionModel.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 findMoneyTransferTransactions(params) {
-        const { inclusion } = params;
-        const conditions = TransactionRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-        if (Array.isArray(inclusion) && inclusion.length > 0) {
-            positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(key));
-        }
-        const projection = {
-            _id: 0,
-            id: { $toString: '$_id' },
-            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
-        };
-        // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: AnyExpression } = {};
-        // if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
-        //     params.inclusion.forEach((field) => {
-        //         projection[field] = 1;
-        //     });
-        // } else {
-        //     projection = {
-        //         __v: 0,
-        //         createdAt: 0,
-        //         updatedAt: 0
-        //     };
-        // }
-        const query = this.transactionModel.find((conditions.length > 0) ? { $and: conditions } : {})
-            .select(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?.startDate !== undefined) {
-            query.sort({ startDate: params.sort.startDate });
-        }
-        // const explainResult = await (<any>query).explain();
-        // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .lean()
-            .exec();
-    }
+    // /**
+    //  * 取引を中止する
+    //  */
+    // public async cancelMoneyTransfer(params: {
+    //     typeOf: factory.transactionType.MoneyTransfer;
+    //     id: string;
+    // }): Promise<void> {
+    //     const endDate = new Date();
+    //     // 進行中ステータスの取引を中止する
+    //     const doc = await this.transactionModel.findOneAndUpdate(
+    //         {
+    //             typeOf: params.typeOf,
+    //             _id: params.id,
+    //             status: factory.transactionStatusType.InProgress
+    //         },
+    //         {
+    //             status: factory.transactionStatusType.Canceled,
+    //             endDate: endDate
+    //         },
+    //         {
+    //             new: true,
+    //             projection: { _id: 1 }
+    //         }
+    //     )
+    //         .lean<{ _id: ObjectId }>()
+    //         .exec();
+    //     // NotFoundであれば取引状態確認
+    //     if (doc === null) {
+    //         const { status } = <Pick<factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>, 'status'>>
+    //             await this.findMoneyTransferById(params, ['status']);
+    //         if (status === factory.transactionStatusType.Canceled) {
+    //             // すでに中止済の場合スルー
+    //         } else if (status === factory.transactionStatusType.Expired) {
+    //             throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
+    //         } else if (status === factory.transactionStatusType.Confirmed) {
+    //             throw new factory.errors.Argument('Transaction id', 'Confirmed transaction unable to cancel');
+    //         } else {
+    //             throw new factory.errors.NotFound(
+    //                 this.transactionModel.modelName,
+    //                 `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`
+    //             );
+    //         }
+    //     }
+    //     transactionEventEmitter.emitTransactionStatusChanged({
+    //         id: params.id,
+    //         typeOf: params.typeOf,
+    //         status: factory.transactionStatusType.Canceled
+    //     });
+    // }
+    // public async countMoneyTransfer<
+    //     // T extends factory.transactionType
+    //     T extends factory.transactionType.MoneyTransfer
+    // >(params: factory.transaction.ISearchConditions<T>): Promise<{ count: number }> {
+    //     const { limit } = params;
+    //     const conditions = TransactionRepo.CREATE_MONGO_CONDITIONS(params);
+    //     const query = this.transactionModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {});
+    //     if (typeof limit === 'number' && limit >= 0) {
+    //         query.limit(limit);
+    //     }
+    //     const count = await query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    //     return { count };
+    // }
+    // /**
+    //  * 取引を検索する
+    //  */
+    // public async findMoneyTransferTransactions<
+    //     // T extends factory.transactionType,
+    //     T extends factory.transactionType.MoneyTransfer,
+    //     F extends IKeyOfProjection
+    // >(
+    //     params: factory.transaction.ISearchConditions<T> & {
+    //         inclusion: F[];
+    //     }
+    // ): Promise<(Pick<factory.transaction.ITransaction<T>, F> & { id: string })[]> {
+    //     const { inclusion } = params;
+    //     const conditions = TransactionRepo.CREATE_MONGO_CONDITIONS(params);
+    //     let positiveProjectionFields: IKeyOfProjection[] = AVAILABLE_PROJECT_FIELDS;
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(<F>key));
+    //     }
+    //     const projection: ProjectionType<factory.transaction.ITransaction<T>> = {
+    //         _id: 0,
+    //         id: { $toString: '$_id' },
+    //         ...Object.fromEntries<1>(positiveProjectionFields.map((key) => ([key, 1])))
+    //     };
+    //     // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: AnyExpression } = {};
+    //     // if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+    //     //     params.inclusion.forEach((field) => {
+    //     //         projection[field] = 1;
+    //     //     });
+    //     // } else {
+    //     //     projection = {
+    //     //         __v: 0,
+    //     //         createdAt: 0,
+    //     //         updatedAt: 0
+    //     //     };
+    //     // }
+    //     const query = this.transactionModel.find(
+    //         (conditions.length > 0) ? { $and: conditions } : {}
+    //     )
+    //         .select(projection);
+    //     if (typeof params.limit === 'number' && params.limit > 0) {
+    //         const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+    //         query.limit(params.limit)
+    //             .skip(params.limit * (page - 1));
+    //     }
+    //     if (params.sort?.startDate !== undefined) {
+    //         query.sort({ startDate: params.sort.startDate });
+    //     }
+    //     // const explainResult = await (<any>query).explain();
+    //     // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
+    //     return query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .lean<(Pick<factory.transaction.ITransaction<T>, F> & { id: string })[]>()
+    //         .exec();
+    // }
     // /**
     //  * 特定の進行中取引を更新する(汎用)
     //  */
@@ -1079,14 +1090,14 @@ class TransactionRepo {
     }
     getCursor(conditions, projection) {
         return this.transactionModel.find(conditions, projection)
-            .sort({ startDate: factory.sortType.Descending })
+            .sort({ startDate: factory_1.factory.sortType.Descending })
             .cursor();
     }
     async aggregatePlaceOrder(params) {
         const statuses = await Promise.all([
-            factory.transactionStatusType.Confirmed,
-            factory.transactionStatusType.Canceled,
-            factory.transactionStatusType.Expired
+            factory_1.factory.transactionStatusType.Confirmed,
+            factory_1.factory.transactionStatusType.Canceled,
+            factory_1.factory.transactionStatusType.Expired
         ].map(async (transactionStatus) => {
             const matchConditions = {
                 startDate: {