@chevre/domain 24.0.0-alpha.7 → 24.0.0-alpha.8

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

@@ -1,5 +1,22 @@
 import type { Connection } from 'mongoose';
 import * as factory from '../../factory';
+type IKeyOfProjection = 'agent' | 'endDate' | 'expires' | 'project' | 'startDate' | 'status' | 'typeOf' | 'instrument' | 'object' | 'seller' | 'result';
+export type ITransactionInProgress = Pick<factory.transaction.placeOrder.ITransaction, IKeyOfProjection> & {
+    /**
+     * 取引ID
+     * 常にprojectされる
+     */
+    id: string;
+};
+export type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IKeyOfProjection> & {
+    /**
+     * 取引ID
+     * 常にprojectされる
+     */
+    id: string;
+};
+type IStartedPlaceOrderFields = 'expires' | 'id' | 'startDate' | 'status';
+export type IStartedPlaceOrder = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IStartedPlaceOrderFields>;
 /**
  * 注文取引リポジトリ
  */
@@ -30,8 +47,8 @@ export declare class PlaceOrderRepo {
     /**
      * 取引期限変更
      */
-    updateExpires<T extends factory.transactionType>(params: {
-        typeOf: T;
+    updateExpires(params: {
+        typeOf: factory.transactionType.PlaceOrder;
         id: string;
         expires: Date;
     }): Promise<void>;
@@ -39,8 +56,8 @@ export declare class PlaceOrderRepo {
      * 取引オブジェクトを更新
      * 注文名称など
      */
-    updateObject<T extends factory.transactionType>(params: {
-        typeOf: T;
+    updateObject(params: {
+        typeOf: factory.transactionType.PlaceOrder;
         id: string;
         object?: {
             name?: string;
@@ -73,4 +90,39 @@ export declare class PlaceOrderRepo {
         };
         confirmationNumber: string;
     }): Promise<void>;
+    /**
+     * 進行中の注文取引を取得する
+     */
+    findPlaceOrderInProgressById(params: {
+        typeOf: factory.transactionType.PlaceOrder;
+        id: string;
+    }, inclusion: IKeyOfProjection[]): Promise<ITransactionInProgress>;
+    /**
+     * 特定注文取引参照
+     */
+    findPlaceOrderById(params: {
+        typeOf: factory.transactionType.PlaceOrder;
+        id: string;
+    }, inclusion: IKeyOfProjection[]): Promise<IPlaceOrder>;
+    /**
+     * 取引を開始する
+     */
+    startPlaceOrder(params: factory.transaction.IStartParams<factory.transactionType.PlaceOrder>): Promise<IStartedPlaceOrder>;
+    /**
+     * 取引を確定する
+     */
+    confirmPlaceOrder(params: {
+        typeOf: factory.transactionType.PlaceOrder;
+        id: string;
+        result: factory.transaction.IResult<factory.transactionType.PlaceOrder>;
+        potentialActions: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;
+    }): Promise<void>;
+    /**
+     * 取引を中止する
+     */
+    cancelPlaceOrder(params: {
+        typeOf: factory.transactionType.PlaceOrder;
+        id: string;
+    }): Promise<void>;
 }
+export {};

package/lib/chevre/repo/transaction/placeOrder.js

@@ -22,18 +22,40 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaceOrderRepo = void 0;
+const moment_1 = __importDefault(require("moment"));
+const transaction_1 = require("../../eventEmitter/transaction");
 const factory = __importStar(require("../../factory"));
 // import { MONGO_MAX_TIME_MS } from '../../settings';
-const transaction_1 = require("../mongoose/schemas/transaction");
+const transaction_2 = require("../mongoose/schemas/transaction");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'status',
+    'typeOf',
+    'agent',
+    'seller',
+    'object',
+    'expires',
+    'startDate',
+    'endDate',
+    'instrument',
+    'result',
+    // 'recipient',
+    // 'error',
+    // 'tasksExportAction',
+    // 'potentialActions',
+];
 /**
  * 注文取引リポジトリ
  */
 class PlaceOrderRepo {
     transactionModel;
     constructor(connection) {
-        this.transactionModel = connection.model(transaction_1.modelName, (0, transaction_1.createSchema)());
+        this.transactionModel = connection.model(transaction_2.modelName, (0, transaction_2.createSchema)());
     }
     /**
      * 進行中取引に保管された採用済決済方法を検索する
@@ -166,5 +188,195 @@ class PlaceOrderRepo {
         }, { $set: { 'object.confirmationNumber': params.confirmationNumber } })
             .exec();
     }
+    /**
+     * 進行中の注文取引を取得する
+     */
+    async findPlaceOrderInProgressById(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()
+            .exec();
+        if (doc === null) {
+            throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
+        }
+        return doc;
+    }
+    /**
+     * 特定注文取引参照
+     */
+    async findPlaceOrderById(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])))
+        };
+        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 startPlaceOrder(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;
+        // 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');
+        }
+        let creatingTransaction;
+        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 {
+            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 confirmPlaceOrder(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.findPlaceOrderById({ 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
+        });
+    }
+    /**
+     * 取引を中止する
+     */
+    async cancelPlaceOrder(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.findPlaceOrderById(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
+        });
+    }
 }
 exports.PlaceOrderRepo = PlaceOrderRepo;

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

@@ -19,7 +19,7 @@ export interface IAggregatePlaceOrder {
     statuses: IStatus[];
 }
 type IOmittedFieldsInProgress = 'tasksExportAction' | 'tasksExportedAt' | 'tasksExportationStatus';
-export type ITransactionInProgress<T extends factory.transactionType> = T extends factory.transactionType.MoneyTransfer ? Omit<factory.transaction.moneyTransfer.ITransaction, IOmittedFieldsInProgress> : T extends factory.transactionType.PlaceOrder ? Omit<factory.transaction.placeOrder.ITransaction, IOmittedFieldsInProgress> : T extends factory.transactionType.ReturnOrder ? Omit<factory.transaction.returnOrder.ITransaction, IOmittedFieldsInProgress> : never;
+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>;
 /**
@@ -32,36 +32,25 @@ export declare class TransactionRepo {
     /**
      * 取引を開始する
      */
-    start<T extends factory.transactionType>(params: factory.transaction.IStartParams<T>): Promise<IStartedTransaction>;
+    startNoPlaceOrder<T extends factory.transactionType.MoneyTransfer | factory.transactionType.ReturnOrder>(params: factory.transaction.IStartParams<T>): Promise<IStartedTransaction>;
     /**
      * 特定取引検索
      */
-    projectFieldsById<T extends factory.transactionType>(params: {
+    projectFieldsByIdNoPlaceOrder<T extends factory.transactionType.MoneyTransfer | factory.transactionType.ReturnOrder>(params: {
         typeOf: T;
         id: string;
     }, inclusion: IKeyOfProjection<T>[]): Promise<factory.transaction.ITransaction<T>>;
     /**
      * 進行中の取引を取得する
      */
-    projectFieldsInProgressById<T extends factory.transactionType>(params: {
-        typeOf: T;
+    findMoneyTransferInProgressById(params: {
+        typeOf: factory.transactionType.MoneyTransfer;
         id: string;
-    }, inclusion: IKeyOfProjection<T>[]): Promise<ITransactionInProgress<T>>;
-    /**
-     * 取引進行者プロフィールを更新
-     */
-    updateAgent<T extends factory.transactionType>(params: {
-        typeOf: T;
-        id: string;
-        agent: Pick<factory.transaction.IAgent, 'id'>;
-        object?: {
-            customer?: factory.order.ICustomer;
-        };
-    }): Promise<void>;
+    }, inclusion: IKeyOfProjection<factory.transactionType.MoneyTransfer>[]): Promise<IMoneyTransferTransactionInProgress>;
     /**
      * 取引を確定する
      */
-    confirm<T extends factory.transactionType>(params: {
+    confirmNoPlaceOrder<T extends factory.transactionType.MoneyTransfer | factory.transactionType.ReturnOrder>(params: {
         typeOf: T;
         id: string;
         result: factory.transaction.IResult<T>;
@@ -155,7 +144,7 @@ export declare class TransactionRepo {
     /**
      * 取引を中止する
      */
-    cancel<T extends factory.transactionType>(params: {
+    cancelNoPlaceOrder<T extends factory.transactionType.MoneyTransfer | factory.transactionType.ReturnOrder>(params: {
         typeOf: T;
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/transaction.js

@@ -212,15 +212,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)
@@ -242,14 +241,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 = {
@@ -273,7 +264,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) {
@@ -313,7 +304,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) {
@@ -327,24 +318,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 },
@@ -361,6 +334,48 @@ class TransactionRepo {
         return doc;
     }
     // /**
+    //  * 進行中の取引を取得する
+    //  */
+    // 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: {
@@ -433,29 +448,43 @@ class TransactionRepo {
     //     }
     //     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`);
-        }
-    }
+    // /**
+    //  * 取引進行者プロフィールを更新
+    //  */
+    // 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`
+    //         );
+    //     }
+    // }
     // /**
     //  * 取引期限変更
     //  */
@@ -526,7 +555,7 @@ class TransactionRepo {
     /**
      * 取引を確定する
      */
-    async confirm(params) {
+    async confirmNoPlaceOrder(params) {
         const endDate = new Date();
         const doc = await this.transactionModel.findOneAndUpdate({
             _id: { $eq: params.id },
@@ -547,7 +576,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) {
                 // すでに確定済の場合スルー
             }
@@ -895,7 +924,7 @@ class TransactionRepo {
     /**
      * 取引を中止する
      */
-    async cancel(params) {
+    async cancelNoPlaceOrder(params) {
         const endDate = new Date();
         // 進行中ステータスの取引を中止する
         const doc = await this.transactionModel.findOneAndUpdate({
@@ -913,7 +942,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) {
                 // すでに中止済の場合スルー
             }

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -26,7 +26,6 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TicketRepo } from '../../../repo/ticket';
-import type { TransactionRepo } from '../../../repo/transaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
@@ -57,7 +56,6 @@ interface IAuthorizeRepos {
     task: TaskRepo;
     ticket: TicketRepo;
     placeOrder: PlaceOrderRepo;
-    transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;

package/lib/chevre/service/offer/event/authorize.js

@@ -106,7 +106,7 @@ function authorize(params, options) {
 }
 function validateCreateRequest(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'instrument']);

package/lib/chevre/service/offer/event/issueEventOfferTicket.d.ts

@@ -8,7 +8,7 @@ import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { TicketRepo } from '../../../repo/ticket';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 declare function issueEventOfferTicket(params: {
     now: Date;
     audience: Pick<factory.action.authorize.offer.eventService.IPurpose, 'id'>;
@@ -41,7 +41,7 @@ declare function issueEventOfferTicket(params: {
     memberProgram: MemberProgramRepo;
     productOffer: ProductOfferRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<{
     ticketToken: string;
 }>;

package/lib/chevre/service/offer/event/issueEventOfferTicket.js

@@ -86,7 +86,7 @@ function issueEventOfferTicket(params) {
     return async (repos) => {
         const { now, audience, eventId, eventOfferId, ticketedOffer, author, project, instrument } = params;
         // 取引は存在するか
-        const transaction = await repos.transaction.projectFieldsInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
         // イベントは存在するか
         const event = await repos.event.projectEventFieldsById({ id: eventId }, ['project', 'offers', 'identifier']);
         // 取引番号発行