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

package/lib/chevre/repo/transaction.js

@@ -60,27 +60,22 @@ class TransactionRepo {
     static CREATE_MONGO_CONDITIONS(params) {
         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 +84,6 @@ class TransactionRepo {
                 }
             });
         }
-        /* istanbul ignore else */
         if (params.endThrough !== undefined) {
             andConditions.push({
                 endDate: {
@@ -98,24 +92,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 +113,6 @@ class TransactionRepo {
                     }
                 });
             }
-            /* istanbul ignore else */
             if (Array.isArray(params.agent.ids)) {
                 andConditions.push({
                     'agent.id': {
@@ -133,7 +121,6 @@ class TransactionRepo {
                     }
                 });
             }
-            /* istanbul ignore else */
             if (Array.isArray(params.agent.identifiers)) {
                 andConditions.push({
                     'agent.identifier': {
@@ -176,12 +163,10 @@ class TransactionRepo {
             // }
         }
         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 } });
         }
@@ -207,11 +192,8 @@ class TransactionRepo {
                 }
                 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': {
@@ -378,54 +360,79 @@ 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;
-    }
+    // /**
+    //  * 進行中取引に保管された採用済決済方法を検索する
+    //  */
+    // 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;
+    // }
     /**
      * 取引進行者プロフィールを更新
      */
@@ -449,49 +456,73 @@ class TransactionRepo {
             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 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`
+    //         );
+    //     }
+    // }
     /**
      * 取引を確定する
      */
@@ -947,52 +978,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();

package/lib/chevre/repository.d.ts

@@ -84,6 +84,7 @@ import type { TaskRepo } from './repo/task';
 import type { TelemetryRepo } from './repo/telemetry';
 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';
 import type { TransactionProcessRepo } from './repo/transactionProcess';
 import type { TripRepo } from './repo/trip';
@@ -466,6 +467,12 @@ export type Transaction = TransactionRepo;
 export declare namespace Transaction {
     function createInstance(...params: ConstructorParameters<typeof TransactionRepo>): Promise<TransactionRepo>;
 }
+export declare namespace transaction {
+    type PlaceOrder = PlaceOrderRepo;
+    namespace PlaceOrder {
+        function createInstance(...params: ConstructorParameters<typeof PlaceOrderRepo>): Promise<PlaceOrderRepo>;
+    }
+}
 export type TransactionNumber = TransactionNumberRepo;
 export declare namespace TransactionNumber {
     function createInstance(...params: ConstructorParameters<typeof TransactionNumberRepo>): Promise<TransactionNumberRepo>;

package/lib/chevre/repository.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedPaymentMethod = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = exports.paymentMethod = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = exports.paymentMethod = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -1001,6 +1001,20 @@ var Transaction;
     }
     Transaction.createInstance = createInstance;
 })(Transaction || (exports.Transaction = Transaction = {}));
+var transaction;
+(function (transaction) {
+    let PlaceOrder;
+    (function (PlaceOrder) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/transaction/placeOrder')))).PlaceOrderRepo;
+            }
+            return new repo(...params);
+        }
+        PlaceOrder.createInstance = createInstance;
+    })(PlaceOrder = transaction.PlaceOrder || (transaction.PlaceOrder = {}));
+})(transaction || (exports.transaction = transaction = {}));
 var TransactionNumber;
 (function (TransactionNumber) {
     let repo;

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

@@ -27,6 +27,7 @@ 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 {
     action: ActionRepo;
@@ -55,6 +56,7 @@ interface IAuthorizeRepos {
     setting: SettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }

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

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const factory = __importStar(require("../../../factory"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("../any");
 const defaultOffer_1 = require("./authorize/defaultOffer");
 const factory_1 = require("./authorize/factory");
@@ -52,7 +52,7 @@ function authorize(params, options) {
         })(repos);
         let acceptedOffers4result;
         const now = new Date();
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: transaction.id,
             object: { orderDate: now }

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

@@ -10,6 +10,7 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -19,6 +20,7 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     /**
      * COAオファー承認取消の場合必須

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

@@ -10,6 +10,7 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionByActionIdRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -19,6 +20,7 @@ interface IVoidTransactionByActionIdRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     /**
      * COAオファー承認取消の場合必須

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

@@ -49,7 +49,7 @@ function voidTransactionByActionId(params) {
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.purpose.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
         const action = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.d.ts

@@ -4,12 +4,14 @@ import type { EventRepo } from '../../../repo/event';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 interface IAcceptRepos {
     action: ActionRepo;
     event: EventRepo;
     orderNumber: OrderNumberRepo;
     project: ProjectRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -27,7 +27,7 @@ exports.acceptOffer = acceptOffer;
 exports.reAcceptOffer = reAcceptOffer;
 const errorHandler_1 = require("../../../errorHandler");
 const factory = __importStar(require("../../../factory"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const authorize_1 = require("./acceptOffer/authorize");
 const factory_1 = require("./acceptOffer/factory");
 function findCOAInfo(params) {
@@ -62,8 +62,8 @@ function acceptOffer(params) {
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        // publishOrderNumber(2025-03-11~)
-        await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        // issueOrderNumber(2025-03-11~)
+        await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
@@ -148,7 +148,7 @@ function reAcceptOffer(params) {
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');