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

package/lib/chevre/repo/transaction.js

@@ -58,29 +58,27 @@ class TransactionRepo {
         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;
-        /* istanbul ignore else */
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        /* istanbul ignore else */
         if (typeof params.typeOf === 'string') {
             andConditions.push({ typeOf: { $eq: params.typeOf } });
         }
-        /* istanbul ignore else */
         if (params.startFrom !== undefined) {
             andConditions.push({
                 startDate: { $gte: params.startFrom }
             });
         }
-        /* istanbul ignore else */
         if (params.startThrough !== undefined) {
             andConditions.push({
                 startDate: { $lte: params.startThrough }
             });
         }
-        /* istanbul ignore else */
         if (params.endFrom !== undefined) {
             andConditions.push({
                 endDate: {
@@ -89,7 +87,6 @@ class TransactionRepo {
                 }
             });
         }
-        /* istanbul ignore else */
         if (params.endThrough !== undefined) {
             andConditions.push({
                 endDate: {
@@ -98,24 +95,19 @@ class TransactionRepo {
                 }
             });
         }
-        /* istanbul ignore else */
         if (Array.isArray(params.ids)) {
             andConditions.push({
                 _id: { $in: params.ids }
             });
         }
-        /* istanbul ignore else */
         if (Array.isArray(params.statuses)) {
             andConditions.push({ status: { $in: params.statuses } });
         }
-        /* istanbul ignore else */
         const statusIn = params.status?.$in;
         if (Array.isArray(statusIn)) {
             andConditions.push({ status: { $in: statusIn } });
         }
-        /* istanbul ignore else */
         if (params.agent !== undefined) {
-            /* istanbul ignore else */
             if (params.agent.typeOf !== undefined) {
                 andConditions.push({
                     'agent.typeOf': {
@@ -124,7 +116,6 @@ class TransactionRepo {
                     }
                 });
             }
-            /* istanbul ignore else */
             if (Array.isArray(params.agent.ids)) {
                 andConditions.push({
                     'agent.id': {
@@ -133,7 +124,6 @@ class TransactionRepo {
                     }
                 });
             }
-            /* istanbul ignore else */
             if (Array.isArray(params.agent.identifiers)) {
                 andConditions.push({
                     'agent.identifier': {
@@ -142,87 +132,52 @@ class TransactionRepo {
                     }
                 });
             }
-            // if (typeof params.agent.familyName === 'string' && params.agent.familyName.length > 0) {
-            //     andConditions.push({
-            //         'agent.familyName': {
-            //             $exists: true,
-            //             $regex: new RegExp(params.agent.familyName)
-            //         }
-            //     });
-            // }
-            // if (typeof params.agent.givenName === 'string' && params.agent.givenName.length > 0) {
-            //     andConditions.push({
-            //         'agent.givenName': {
-            //             $exists: true,
-            //             $regex: new RegExp(params.agent.givenName)
-            //         }
-            //     });
-            // }
-            // if (typeof params.agent.email === 'string' && params.agent.email.length > 0) {
-            //     andConditions.push({
-            //         'agent.email': {
-            //             $exists: true,
-            //             $regex: new RegExp(params.agent.email)
-            //         }
-            //     });
-            // }
-            // if (typeof params.agent.telephone === 'string' && params.agent.telephone.length > 0) {
-            //     andConditions.push({
-            //         'agent.telephone': {
-            //             $exists: true,
-            //             $regex: new RegExp(params.agent.telephone)
-            //         }
-            //     });
-            // }
         }
         const tasksExportActionStatusIn = params.tasksExportAction?.actionStatus?.$in;
-        /* istanbul ignore else */
         if (Array.isArray(tasksExportActionStatusIn)) {
             andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $in: tasksExportActionStatusIn } });
         }
         const tasksExportActionStatusEq = params.tasksExportAction?.actionStatus?.$eq;
-        /* istanbul ignore else */
         if (typeof tasksExportActionStatusEq === 'string') {
             andConditions.push({ 'tasksExportAction.actionStatus': { $exists: true, $eq: tasksExportActionStatusEq } });
         }
         switch (params.typeOf) {
             case factory.transactionType.PlaceOrder:
-                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;
+                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:
-                /* istanbul ignore else */
-                if (params.object !== undefined) {
-                    /* istanbul ignore else */
-                    if (params.object.order !== undefined) {
-                        /* istanbul ignore else */
-                        if (Array.isArray(params.object.order.orderNumbers)) {
-                            andConditions.push({
-                                'object.order.orderNumber': {
-                                    $exists: true,
-                                    $in: params.object.order.orderNumbers
-                                }
-                            });
-                        }
-                    }
-                }
-                break;
+                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;
@@ -230,15 +185,14 @@ class TransactionRepo {
     /**
      * 取引を開始する
      */
-    async start(params) {
+    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.PlaceOrder
-            || typeOf === factory.transactionType.ReturnOrder) {
+        if (typeOf === factory.transactionType.ReturnOrder) {
             // expiresInSecondsの指定があれば優先して適用する(2022-11-25~)
             if (typeof params.expiresInSeconds === 'number' && params.expiresInSeconds > 0) {
                 expires = (0, moment_1.default)(startDate)
@@ -260,14 +214,6 @@ class TransactionRepo {
                 agent, project, seller, object, recipient
             };
         }
-        else if (typeOf === factory.transactionType.PlaceOrder) {
-            const { agent, project, object, seller, instrument } = params;
-            creatingTransaction = {
-                status, startDate, expires, typeOf, tasksExportAction,
-                agent, project, seller, object,
-                ...(typeof instrument?.id === 'string') ? { instrument } : undefined
-            };
-        }
         else if (typeOf === factory.transactionType.ReturnOrder) {
             const { agent, project, object, seller } = params;
             creatingTransaction = {
@@ -291,7 +237,7 @@ class TransactionRepo {
     /**
      * 特定取引検索
      */
-    async projectFieldsById(params, inclusion // make required(2024-05-31~)
+    async projectFieldsByIdNoPlaceOrder(params, inclusion // make required(2024-05-31~)
     ) {
         let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
@@ -331,7 +277,7 @@ class TransactionRepo {
     /**
      * 進行中の取引を取得する
      */
-    async projectFieldsInProgressById(params, inclusion // make required(2024-05-29~)
+    async findMoneyTransferInProgressById(params, inclusion // make required(2024-05-29~)
     ) {
         let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
@@ -345,24 +291,6 @@ class TransactionRepo {
             id: { $toString: '$_id' },
             ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
         };
-        // let projection: { [key in (IKeyOfProjection<T> | '__v' | 'createdAt' | 'updatedAt')]?: ProjectionElementType } = {};
-        // if (Array.isArray(inclusion) && inclusion.length > 0) {
-        //     inclusion.forEach((field) => {
-        //         projection[field] = 1;
-        //     });
-        // } else {
-        //     // minimize(2024-05-29~)
-        //     projection = {
-        //         __v: 0,
-        //         createdAt: 0,
-        //         updatedAt: 0,
-        //         tasksExportAction: 0,
-        //         ...{
-        //             tasksExportedAt: 0,
-        //             tasksExportationStatus: 0
-        //         }
-        //     };
-        // }
         const filter = {
             _id: { $eq: params.id },
             typeOf: { $eq: params.typeOf },
@@ -378,124 +306,229 @@ class TransactionRepo {
         }
         return doc;
     }
-    /**
-     * 進行中取引に保管された採用済決済方法を検索する
-     */
-    async findInProgressPaymentMethodId(params) {
-        const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: factory.transactionType.PlaceOrder },
-            status: { $eq: factory.transactionStatusType.InProgress }
-        }, { 'object.paymentMethods': 1 })
-            .lean() // 2024-08-26~
-            .exec();
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
-        }
-        return doc.object.paymentMethods;
-    }
-    /**
-     * 取引の注文番号を検索する
-     */
-    async findInProgressOrderNumberById(params) {
-        const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: factory.transactionType.PlaceOrder },
-            status: { $eq: factory.transactionStatusType.InProgress }
-        }, { 'object.orderNumber': 1 })
-            .lean() // 2024-08-26~
-            .exec();
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
-        }
-        return doc.object.orderNumber;
-    }
-    /**
-     * 取引の確認番号を検索する
-     */
-    async findInProgressConfirmationNumberById(params) {
-        const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: factory.transactionType.PlaceOrder },
-            status: { $in: params.status.$in }
-        }, { 'object.confirmationNumber': 1 })
-            .lean() // 2024-08-26~
-            .exec();
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`);
-        }
-        return doc.object.confirmationNumber;
-    }
-    /**
-     * 取引進行者プロフィールを更新
-     */
-    async updateAgent(params) {
-        const doc = await this.transactionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
-            status: { $eq: factory.transactionStatusType.InProgress }
-        }, {
-            $set: {
-                'agent.id': params.agent.id,
-                // ...(typeof params.agent.name === 'string') ? { 'agent.name': params.agent.name } : undefined,
-                ...(typeof params.object?.customer?.typeOf === 'string') ? { 'object.customer': params.object.customer } : undefined
-            }
-        }, {
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
-        }
-    }
-    /**
-     * 取引期限変更
-     */
-    async updateExpires(params) {
-        const doc = await this.transactionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
-            status: { $eq: factory.transactionStatusType.InProgress }
-        }, {
-            $set: {
-                expires: params.expires
-            }
-        }, {
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
-        }
-    }
-    /**
-     * 取引オブジェクトを更新
-     * 注文名称など
-     */
-    async updateObject(params) {
-        const doc = await this.transactionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
-            status: { $eq: factory.transactionStatusType.InProgress }
-        }, {
-            $set: {
-                ...(typeof params.object?.name === 'string') ? { 'object.name': params.object.name } : undefined
-            }
-        }, {
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
-        }
-    }
+    // /**
+    //  * 進行中の取引を取得する
+    //  */
+    // public async projectFieldsInProgressById<T extends factory.transactionType.MoneyTransfer>(
+    //     params: {
+    //         typeOf: T;
+    //         id: string;
+    //     },
+    //     inclusion: IKeyOfProjection<T>[] // make required(2024-05-29~)
+    // ): Promise<ITransactionInProgress<T>> {
+    //     let positiveProjectionFields: (IKeyOfProjection<factory.transactionType.MoneyTransfer>
+    //         | IKeyOfProjection<factory.transactionType.PlaceOrder>
+    //         | IKeyOfProjection<factory.transactionType.ReturnOrder>
+    //     )[] = AVAILABLE_PROJECT_FIELDS;
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         positiveProjectionFields = positiveProjectionFields.filter((key) => inclusion.includes(<IKeyOfProjection<T>>key));
+    //     } else {
+    //         throw new factory.errors.NotImplemented('inclusion must be specified'); // 2024-08-26~
+    //     }
+    //     const projection: ProjectionType<factory.transaction.ITransaction<T>> = {
+    //         _id: 0,
+    //         id: { $toString: '$_id' },
+    //         ...Object.fromEntries<1>(positiveProjectionFields.map((key) => ([key, 1])))
+    //     };
+    //     const filter: FilterQuery<factory.transaction.ITransaction<T>> = {
+    //         _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<T>>() // 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 async findInProgressPaymentMethodId(params: {
+    //     id: string;
+    // }): Promise<factory.transaction.placeOrder.IPaymentMethodByPaymentUrl | undefined> {
+    //     const doc = await this.transactionModel.findOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: factory.transactionType.PlaceOrder },
+    //             status: { $eq: factory.transactionStatusType.InProgress }
+    //         },
+    //         { 'object.paymentMethods': 1 }
+    //     )
+    //         .lean<{ object: Pick<factory.transaction.placeOrder.IObject, 'paymentMethods'> }>() // 2024-08-26~
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`
+    //         );
+    //     }
+    //     return doc.object.paymentMethods;
+    // }
+    // /**
+    //  * 取引の注文番号を検索する
+    //  */
+    // public async findInProgressOrderNumberById(params: {
+    //     id: string;
+    // }): Promise<string | undefined> {
+    //     const doc = await this.transactionModel.findOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: factory.transactionType.PlaceOrder },
+    //             status: { $eq: factory.transactionStatusType.InProgress }
+    //         },
+    //         { 'object.orderNumber': 1 }
+    //     )
+    //         .lean<{ object: Pick<factory.transaction.placeOrder.IObject, 'orderNumber'> }>() // 2024-08-26~
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`
+    //         );
+    //     }
+    //     return doc.object.orderNumber;
+    // }
+    // /**
+    //  * 取引の確認番号を検索する
+    //  */
+    // public async findInProgressConfirmationNumberById(params: {
+    //     id: string;
+    //     status: { $in: factory.transactionStatusType[] };
+    // }): Promise<string | undefined> {
+    //     const doc = await this.transactionModel.findOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: factory.transactionType.PlaceOrder },
+    //             status: { $in: params.status.$in }
+    //         },
+    //         { 'object.confirmationNumber': 1 }
+    //     )
+    //         .lean<{ object: Pick<factory.transaction.placeOrder.IObject, 'confirmationNumber'> }>() // 2024-08-26~
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`
+    //         );
+    //     }
+    //     return doc.object.confirmationNumber;
+    // }
+    // /**
+    //  * 取引進行者プロフィールを更新
+    //  */
+    // public async updateAgent<T extends factory.transactionType>(params: {
+    //     typeOf: T;
+    //     id: string;
+    //     agent: Pick<factory.transaction.IAgent, 'id'>;
+    //     object?: {
+    //         customer?: factory.order.ICustomer;
+    //     };
+    // }): Promise<void> {
+    //     const doc = await this.transactionModel.findOneAndUpdate(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: params.typeOf },
+    //             status: { $eq: factory.transactionStatusType.InProgress }
+    //         },
+    //         {
+    //             $set: {
+    //                 'agent.id': params.agent.id,
+    //                 // ...(typeof params.agent.name === 'string') ? { 'agent.name': params.agent.name } : undefined,
+    //                 ...(typeof params.object?.customer?.typeOf === 'string') ? { 'object.customer': params.object.customer } : undefined
+    //             }
+    //         },
+    //         {
+    //             projection: { _id: 1 }
+    //         }
+    //     )
+    //         .lean<{ _id: ObjectId }>()
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`
+    //         );
+    //     }
+    // }
+    // /**
+    //  * 取引期限変更
+    //  */
+    // public async updateExpires<T extends factory.transactionType>(params: {
+    //     typeOf: T;
+    //     id: string;
+    //     expires: Date;
+    // }): Promise<void> {
+    //     const doc = await this.transactionModel.findOneAndUpdate(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: params.typeOf },
+    //             status: { $eq: factory.transactionStatusType.InProgress }
+    //         },
+    //         {
+    //             $set: {
+    //                 expires: params.expires
+    //             }
+    //         },
+    //         {
+    //             projection: { _id: 1 }
+    //         }
+    //     )
+    //         .lean<{ _id: ObjectId }>()
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`
+    //         );
+    //     }
+    // }
+    // /**
+    //  * 取引オブジェクトを更新
+    //  * 注文名称など
+    //  */
+    // public async updateObject<T extends factory.transactionType>(params: {
+    //     typeOf: T;
+    //     id: string;
+    //     object?: {
+    //         name?: string;
+    //     };
+    // }): Promise<void> {
+    //     const doc = await this.transactionModel.findOneAndUpdate(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: params.typeOf },
+    //             status: { $eq: factory.transactionStatusType.InProgress }
+    //         },
+    //         {
+    //             $set: {
+    //                 ...(typeof params.object?.name === 'string') ? { 'object.name': params.object.name } : undefined
+    //             }
+    //         },
+    //         {
+    //             projection: { _id: 1 }
+    //         }
+    //     )
+    //         .lean<{ _id: ObjectId }>()
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`
+    //         );
+    //     }
+    // }
     /**
      * 取引を確定する
      */
-    async confirm(params) {
+    async confirmNoPlaceOrder(params) {
         const endDate = new Date();
         const doc = await this.transactionModel.findOneAndUpdate({
             _id: { $eq: params.id },
@@ -516,7 +549,7 @@ class TransactionRepo {
             .exec();
         // NotFoundであれば取引状態確認
         if (doc === null) {
-            const { expires, status } = await this.projectFieldsById({ typeOf: params.typeOf, id: params.id }, ['expires', 'status']);
+            const { expires, status } = await this.projectFieldsByIdNoPlaceOrder({ typeOf: params.typeOf, id: params.id }, ['expires', 'status']);
             if (status === factory.transactionStatusType.Confirmed) {
                 // すでに確定済の場合スルー
             }
@@ -864,7 +897,7 @@ class TransactionRepo {
     /**
      * 取引を中止する
      */
-    async cancel(params) {
+    async cancelNoPlaceOrder(params) {
         const endDate = new Date();
         // 進行中ステータスの取引を中止する
         const doc = await this.transactionModel.findOneAndUpdate({
@@ -882,7 +915,7 @@ class TransactionRepo {
             .exec();
         // NotFoundであれば取引状態確認
         if (doc === null) {
-            const { status } = await this.projectFieldsById(params, ['status']);
+            const { status } = await this.projectFieldsByIdNoPlaceOrder(params, ['status']);
             if (status === factory.transactionStatusType.Canceled) {
                 // すでに中止済の場合スルー
             }
@@ -902,7 +935,7 @@ class TransactionRepo {
             status: factory.transactionStatusType.Canceled
         });
     }
-    async count(params) {
+    async countMoneyTransfer(params) {
         const { limit } = params;
         const conditions = TransactionRepo.CREATE_MONGO_CONDITIONS(params);
         const query = this.transactionModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {});
@@ -916,7 +949,7 @@ class TransactionRepo {
     /**
      * 取引を検索する
      */
-    async projectFields(params) {
+    async findMoneyTransferTransactions(params) {
         const { inclusion } = params;
         const conditions = TransactionRepo.CREATE_MONGO_CONDITIONS(params);
         let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
@@ -947,52 +980,80 @@ class TransactionRepo {
             query.limit(params.limit)
                 .skip(params.limit * (page - 1));
         }
-        /* istanbul ignore else */
         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() // 2024-08-26~
-            .exec();
-    }
-    /**
-     * 特定の進行中取引を更新する(汎用)
-     */
-    async findByIdAndUpdateInProgress(params) {
-        await this.transactionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            status: { $eq: factory.transactionStatusType.InProgress }
-        }, params.update, {
-            // new: true,
-            projection: { _id: 1 }
-        })
             .lean()
-            .exec()
-            .then((doc) => {
-            if (doc === null) {
-                throw new factory.errors.ArgumentNull(this.transactionModel.modelName);
-            }
-        });
-    }
-    async saveOrderNumberIfNotExist(params) {
-        await this.transactionModel.updateOne({
-            _id: { $eq: params.id },
-            status: { $eq: factory.transactionStatusType.InProgress },
-            'object.orderNumber': { $exists: false }
-        }, { 'object.orderNumber': params.orderNumber })
-            .exec();
-    }
-    async saveConfirmationNumberIfNotExist(params) {
-        await this.transactionModel.updateOne({
-            _id: { $eq: params.id },
-            // status: { $eq: factory.transactionStatusType.InProgress },
-            status: { $in: params.status.$in },
-            'object.confirmationNumber': { $exists: false }
-        }, { $set: { 'object.confirmationNumber': params.confirmationNumber } })
             .exec();
     }
+    // /**
+    //  * 特定の進行中取引を更新する(汎用)
+    //  */
+    // public async findByIdAndUpdateInProgress(params: {
+    //     id: string;
+    //     update: {
+    //         $set?: { 'object.paymentMethods'?: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl };
+    //         // $unset?: any;
+    //         // $pull?: any;
+    //         // $push?: any;
+    //     };
+    // }): Promise<void> {
+    //     await this.transactionModel.findOneAndUpdate(
+    //         {
+    //             _id: { $eq: params.id },
+    //             status: { $eq: factory.transactionStatusType.InProgress }
+    //         },
+    //         params.update,
+    //         {
+    //             // new: true,
+    //             projection: { _id: 1 }
+    //         }
+    //     )
+    //         .lean<{ _id: ObjectId }>()
+    //         .exec()
+    //         .then((doc) => {
+    //             if (doc === null) {
+    //                 throw new factory.errors.ArgumentNull(this.transactionModel.modelName);
+    //             }
+    //         });
+    // }
+    // /**
+    //  * 進行中取引のobjectに注文番号を保管する
+    //  */
+    // public async saveOrderNumberIfNotExist(params: {
+    //     id: string;
+    //     orderNumber: string;
+    // }): Promise<{ modifiedCount: number }> {
+    //     const result = await this.transactionModel.updateOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             status: { $eq: factory.transactionStatusType.InProgress },
+    //             'object.orderNumber': { $exists: false }
+    //         },
+    //         { $set: { 'object.orderNumber': params.orderNumber } }
+    //     )
+    //         .exec();
+    //     return { modifiedCount: result.modifiedCount };
+    // }
+    // public async saveConfirmationNumberIfNotExist(params: {
+    //     id: string;
+    //     status: { $in: factory.transactionStatusType[] };
+    //     confirmationNumber: string;
+    // }): Promise<void> {
+    //     await this.transactionModel.updateOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             // status: { $eq: factory.transactionStatusType.InProgress },
+    //             status: { $in: params.status.$in },
+    //             'object.confirmationNumber': { $exists: false }
+    //         },
+    //         { $set: { 'object.confirmationNumber': params.confirmationNumber } }
+    //     )
+    //         .exec();
+    // }
     async findByIdAndDelete(params) {
         await this.transactionModel.findByIdAndDelete(params.id)
             .exec();