@chevre/domain 25.0.0-alpha.9 → 25.1.0-alpha.0

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

@@ -1,7 +1,8 @@
 import type { Connection, FilterQuery } from 'mongoose';
-import { ISetting } from './mongoose/schemas/setting';
-type IKeyOfProjection = keyof ISetting;
-export { ISetting };
+import { ISetting, IStorageSettings } from './mongoose/schemas/setting';
+type IKeyOfProjection = Exclude<keyof ISetting, 'jwt' | 'project' | 'waiter' | 'integration'>;
+type IGlobalSetting = Pick<ISetting, 'defaultSenderEmail' | 'onEventChanged' | 'onOrderStatusChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'onTaskStatusChanged' | 'orderNumber' | 'quota' | 'serviceOutputIdentifier' | 'storage' | 'transactionNumber' | 'triggerWebhook' | 'useInformResourceTypes' | 'useMongo4confirmationNumberFrom' | 'useMongo4orderNumberFrom' | 'useMongo4transactionNumberFrom' | 'useMongoAsStockHolder' | 'useMongoAsStockHolderProjects' | 'userPoolIdNew' | 'userPoolIdOld'>;
+export { IGlobalSetting as ISetting };
 /**
  * 設定リポジトリ
  */
@@ -15,14 +16,14 @@ export declare class SettingRepo {
                 $eq?: string;
             };
         };
-    }, inclusion: IKeyOfProjection[]): Promise<ISetting | null>;
-    updateByProject(filter: {
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter' | 'orderNumber' | 'transactionNumber'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, inclusion: IKeyOfProjection[]): Promise<IGlobalSetting | null>;
+    /**
+     * 初期設定追加専用
+     */
+    addGlobalStorageSettings(params: {
+        key: keyof IStorageSettings;
+        value: number;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<ISetting>;
         $unset: any;

package/lib/chevre/repo/setting.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingRepo = void 0;
-// import { factory } from '../factory';
 const setting_1 = require("./mongoose/schemas/setting");
 /**
  * 設定リポジトリ
@@ -36,24 +35,13 @@ class SettingRepo {
             .lean()
             .exec();
     }
-    async updateByProject(filter, update) {
-        const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter, orderNumber, transactionNumber } = update;
-        return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
+    /**
+     * 初期設定追加専用
+     */
+    async addGlobalStorageSettings(params) {
+        return this.settingModel.updateOne({ 'project.id': { $eq: '*' } }, {
             $set: {
-                ...(onEventChanged !== undefined) ? { onEventChanged } : undefined,
-                ...(onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined,
-                ...(onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : undefined,
-                ...(onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined,
-                ...(defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined,
-                ...(useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined,
-                ...(userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined,
-                ...(userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined,
-                ...(storage !== undefined) ? { storage } : undefined,
-                ...(quota !== undefined) ? { quota } : undefined,
-                ...(triggerWebhook !== undefined) ? { triggerWebhook } : undefined,
-                ...(waiter !== undefined) ? { waiter } : undefined,
-                ...(orderNumber !== undefined) ? { orderNumber } : undefined,
-                ...(transactionNumber !== undefined) ? { transactionNumber } : undefined
+                [`storage.${params.key}`]: params.value
             }
         })
             .exec();

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

@@ -31,7 +31,7 @@ type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | '
 export declare class TaskRepo {
     readonly taskModel: IModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/deletePerson").ITask | import("@chevre/factory/lib/chevre/task/deleteTransaction").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").ITask>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): FilterQuery<import("@chevre/factory/lib/chevre/task").ITask | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/createAccountingReport").ITask | import("@chevre/factory/lib/chevre/task/deleteTransaction").ITask | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/chevre/task/onEventChanged").ITask | import("@chevre/factory/lib/chevre/task/onResourceDeleted").ITask | import("@chevre/factory/lib/chevre/task/onResourceUpdated").ITask | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/chevre/task/placeOrder").ITask | import("@chevre/factory/lib/chevre/task/returnOrder").ITask | import("@chevre/factory/lib/chevre/task/returnPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/chevre/task/sendEmailMessage").ITask | import("@chevre/factory/lib/chevre/task/sendOrder").ITask | import("@chevre/factory/lib/chevre/task/triggerWebhook").ITask | import("@chevre/factory/lib/chevre/task/useReservation").ITask | import("@chevre/factory/lib/chevre/task/voidPayTransaction").ITask | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").ITask>[];
     runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'expires' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
         alternateName?: never;
         identifier?: never;

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

@@ -43,12 +43,6 @@ export declare class PlaceOrderRepo {
     findInProgressPaymentMethodId(params: {
         id: string;
     }): Promise<factory.transaction.placeOrder.IPaymentMethodByPaymentUrl | undefined>;
-    /**
-     * 取引の注文番号を検索する
-     */
-    findInProgressOrderNumberById(params: {
-        id: string;
-    }): Promise<string | undefined>;
     /**
      * 取引の確認番号を検索する
      */
@@ -130,6 +124,7 @@ export declare class PlaceOrderRepo {
         id: string;
         object: {
             orderDate: Date;
+            orderNumber: string;
         };
         result: factory.transaction.IResult<factory.transactionType.PlaceOrder>;
         potentialActions: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;

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

@@ -122,16 +122,18 @@ class PlaceOrderRepo {
         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 }
-            });
-        }
+        // result.orderは完全に廃止したので検索条件としても廃止(2026-06-26~)
+        // const resultOrderNumberIn = params.result?.order?.orderNumbers;
+        // if (Array.isArray(resultOrderNumberIn)) {
+        //     andConditions.push({ 'result.order.orderNumber': { $exists: true, $in: resultOrderNumberIn } });
+        // }
+        // result.orderは完全に廃止したので検索条件としても廃止(2026-06-26~)
+        // 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 } });
@@ -200,22 +202,30 @@ class PlaceOrderRepo {
         }
         return doc.object.paymentMethods;
     }
-    /**
-     * 取引の注文番号を検索する
-     */
-    async findInProgressOrderNumberById(params) {
-        const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-        }, { 'object.orderNumber': 1 })
-            .lean() // 2024-08-26~
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} ${factory_1.factory.transactionStatusType.InProgress} not found`);
-        }
-        return doc.object.orderNumber;
-    }
+    // /**
+    //  * 取引の注文番号を検索する
+    //  */
+    // 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;
+    // }
     /**
      * 取引の確認番号を検索する
      */
@@ -430,6 +440,7 @@ class PlaceOrderRepo {
             status: factory_1.factory.transactionStatusType.Confirmed, // ステータス変更
             endDate,
             'object.orderDate': params.object.orderDate, // add(2026-06-15~)
+            'object.orderNumber': params.object.orderNumber, // add(2026-06-27~)
             result: params.result, // resultを更新
             potentialActions: params.potentialActions // resultを更新
         }, {

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

@@ -130,7 +130,7 @@ export declare class TransactionRepo {
             $lt: Date;
         };
     }): Promise<import("mongodb").DeleteResult>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
+    getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;

package/lib/chevre/repo/transaction.js

@@ -316,9 +316,9 @@ class TransactionRepo {
         })
             .exec();
     }
-    getCursor(conditions, projection) {
+    getCursor(conditions, projection, sort) {
         return this.transactionModel.find(conditions, projection)
-            .sort({ startDate: factory_1.factory.sortType.Descending })
+            .sort({ startDate: (sort === factory_1.factory.sortType.Ascending) ? sort : factory_1.factory.sortType.Descending })
             .cursor();
     }
     async aggregatePlaceOrder(params) {

package/lib/chevre/repository.d.ts

@@ -81,6 +81,8 @@ import type { ServiceAvailableHourRepo } from './repo/service/availableHour';
 import type { SettingRepo } from './repo/setting';
 import type { IntegrationSettingRepo } from './repo/setting/integration';
 import type { JWTSettingRepo } from './repo/setting/jwt';
+import type { RateLimitSettingRepo } from './repo/setting/rateLimit';
+import type { WaiterSettingRepo } from './repo/setting/waiter';
 import type { StockHolderRepo } from './repo/stockHolder';
 import type { TaskRepo } from './repo/task';
 import type { TicketRepo } from './repo/ticket';
@@ -446,6 +448,14 @@ export declare namespace setting {
     namespace JWT {
         function createInstance(...params: ConstructorParameters<typeof JWTSettingRepo>): Promise<JWTSettingRepo>;
     }
+    type RateLimit = RateLimitSettingRepo;
+    namespace RateLimit {
+        function createInstance(...params: ConstructorParameters<typeof RateLimitSettingRepo>): Promise<RateLimitSettingRepo>;
+    }
+    type Waiter = WaiterSettingRepo;
+    namespace Waiter {
+        function createInstance(...params: ConstructorParameters<typeof WaiterSettingRepo>): Promise<WaiterSettingRepo>;
+    }
 }
 export type StockHolder = StockHolderRepo;
 export declare namespace StockHolder {

package/lib/chevre/repository.js

@@ -933,6 +933,28 @@ var setting;
         }
         JWT.createInstance = createInstance;
     })(JWT = setting.JWT || (setting.JWT = {}));
+    let RateLimit;
+    (function (RateLimit) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await import('./repo/setting/rateLimit.js')).RateLimitSettingRepo;
+            }
+            return new repo(...params);
+        }
+        RateLimit.createInstance = createInstance;
+    })(RateLimit = setting.RateLimit || (setting.RateLimit = {}));
+    let Waiter;
+    (function (Waiter) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await import('./repo/setting/waiter.js')).WaiterSettingRepo;
+            }
+            return new repo(...params);
+        }
+        Waiter.createInstance = createInstance;
+    })(Waiter = setting.Waiter || (setting.Waiter = {}));
 })(setting || (exports.setting = setting = {}));
 var StockHolder;
 (function (StockHolder) {

package/lib/chevre/service/assetTransaction/reserve/start.d.ts

@@ -15,7 +15,6 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import { SeatRepo } from '../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
-import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
@@ -37,7 +36,6 @@ interface IStartOperationRepos {
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
     priceSpecification: PriceSpecificationRepo;
-    project: ProjectRepo;
     seat: SeatRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/offer/any.d.ts

@@ -6,13 +6,11 @@ interface IAcceptOfferOperationRepos {
 type IAcceptOfferOperation<T> = (repos: IAcceptOfferOperationRepos) => Promise<T>;
 export type IAuthorizeActionWithInstrument = Pick<factory.action.authorize.offer.eventService.IAction, 'instrument'>;
 export declare function acceptOffer(params: {
-    orderNumber: string;
     project: {
         id: string;
     };
     placeOrderId: string;
     acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
-    broker?: factory.order.IBroker;
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {
     /**
@@ -22,7 +20,7 @@ export declare function voidAcceptedOffer(params: {
      * instrument.serialNumberからvoidする場合に指定
      */
     authorizeActionsWithInstrument: IAuthorizeActionWithInstrument[];
-    orderNumber: string;
+    placeOrderId: string;
 }): (repos: {
     orderInTransaction: OrderInTransactionRepo;
 }) => Promise<void>;

package/lib/chevre/service/offer/any.js

@@ -10,18 +10,16 @@ const factory_1 = require("../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:offer');
 function acceptOffer(params) {
     return async (repos) => {
-        await repos.orderInTransaction.acceptOffer({
-            orderNumber: params.orderNumber,
+        await repos.orderInTransaction.acceptOfferByIdentifier({
             project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
             identifier: params.placeOrderId,
-            acceptedOffers: params.acceptedOffers,
-            ...((params.broker !== undefined) && { broker: params.broker })
+            acceptedOffers: params.acceptedOffers
         });
     };
 }
 function voidAcceptedOffer(params) {
     return async (repos) => {
-        const { orderNumber } = params;
+        const { placeOrderId } = params;
         // let reservationNumbers: string[] = [];
         // authorizeActions.forEach((authorizeAction) => {
         //     const reserveTransactionNumberByAction = authorizeAction.object.pendingTransaction?.transactionNumber;
@@ -42,10 +40,11 @@ function voidAcceptedOffer(params) {
             const serialNumbers = params.authorizeActionsWithInstrument
                 .filter(({ instrument }) => typeof instrument.transactionNumber === 'string')
                 .map(({ instrument }) => String(instrument.transactionNumber));
-            debug('removing acceptedOffers from PlaceOrder...', orderNumber, 'serialNumbers:', serialNumbers);
+            debug('removing acceptedOffers from PlaceOrder...', placeOrderId, 'serialNumbers:', serialNumbers);
             if (serialNumbers.length > 0) {
-                const result = await repos.orderInTransaction.voidAcceptedOfferBySerialNumber({
-                    orderNumber,
+                const result = await repos.orderInTransaction.voidAcceptedOfferByIdentifier({
+                    // orderNumber,
+                    identifier: placeOrderId,
                     acceptedOffers: { serialNumber: { $in: serialNumbers } }
                 });
                 debug('acceptedOffers removed from PlaceOrder by serialNumbers.', result);

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

@@ -15,7 +15,6 @@ import type { PaymentServiceRepo } from '../../../../repo/paymentService';
 import type { SeatRepo } from '../../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../../repo/product';
-import type { ProjectRepo } from '../../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../../repo/setting';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
@@ -63,7 +62,6 @@ declare function processStartReserve4chevre(params: {
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
     priceSpecification: PriceSpecificationRepo;
-    project: ProjectRepo;
     seat: SeatRepo;
     setting: SettingRepo;
     task: TaskRepo;

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

@@ -13,12 +13,10 @@ import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { SeatRepo } from '../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import type { ProductRepo } from '../../../repo/product';
-import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
@@ -43,11 +41,9 @@ interface IAuthorizeRepos {
     offerCatalogItem: OfferCatalogItemRepo;
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
-    orderNumber: OrderNumberRepo;
     paymentService: PaymentServiceRepo;
     priceSpecification: PriceSpecificationRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     seat: SeatRepo;
     setting: SettingRepo;
     task: TaskRepo;

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const factory_1 = require("../../../factory");
-const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("../any");
 const defaultOffer_1 = require("./authorize/defaultOffer");
 const factory_2 = require("./authorize/factory");
@@ -25,11 +24,11 @@ function authorize(params, options) {
         })(repos);
         let acceptedOffers4result;
         const now = new Date();
-        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+        // 注文ドキュメントを参照(2026-06-24~)
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: transaction.id,
             project: { id: params.project.id },
-            id: transaction.id,
-            object: { orderDate: now }
-        })(repos);
+        }, { onlyPlaceOrder: true });
         // まず取引番号発行
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         const actionAttributes = (0, factory_2.createAuthorizeSeatReservationActionAttributes)({
@@ -64,11 +63,9 @@ function authorize(params, options) {
                     };
                 });
                 await (0, any_1.acceptOffer)({
-                    orderNumber,
                     project: transaction.project,
                     placeOrderId: transaction.id,
-                    acceptedOffers: minimizedAcceptedOffers,
-                    ...((typeof params.object.broker?.typeOf === 'string') && { broker: params.object.broker })
+                    acceptedOffers: minimizedAcceptedOffers
                 })(repos);
             }
         }

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

@@ -48,23 +48,35 @@ function voidTransaction(params) {
             default:
             // no op
         }
-        // add orderInTransaction(2024-01-15~)
-        // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-        const orderNumberByTransaction = transaction.object.orderNumber;
-        if (typeof orderNumberByTransaction === 'string') {
-            switch (transaction.status) {
-                case factory_1.factory.transactionStatusType.Confirmed:
-                    // 確定取引の場合、不要なオファーのみ除外
-                    await (0, any_1.voidAcceptedOffer)({
-                        // authorizeActions,
-                        authorizeActionsWithInstrument: authorizeActions,
-                        orderNumber: orderNumberByTransaction
-                    })(repos);
-                    break;
-                default:
-                    // orderInTransaction自体を削除
-                    await repos.orderInTransaction.deleteByOrderNumber({ orderNumber: orderNumberByTransaction });
-            }
+        // // add orderInTransaction(2024-01-15~)
+        // // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
+        // const orderNumberByTransaction = transaction.object.orderNumber;
+        // if (typeof orderNumberByTransaction === 'string') {
+        //     switch (transaction.status) {
+        //         case factory.transactionStatusType.Confirmed:
+        //             // 確定取引の場合、不要なオファーのみ除外
+        //             await voidAcceptedOffer({
+        //                 // authorizeActions,
+        //                 authorizeActionsWithInstrument: authorizeActions,
+        //                 orderNumber: orderNumberByTransaction
+        //             })(repos);
+        //             break;
+        //         default:
+        //             // orderInTransaction自体を削除
+        //             await repos.orderInTransaction.deleteByOrderNumber({ orderNumber: orderNumberByTransaction });
+        //     }
+        // }
+        switch (transaction.status) {
+            case factory_1.factory.transactionStatusType.Confirmed:
+                // 確定取引の場合、不要なオファーのみ除外
+                await (0, any_1.voidAcceptedOffer)({
+                    authorizeActionsWithInstrument: authorizeActions,
+                    placeOrderId: params.purpose.id
+                })(repos);
+                break;
+            default:
+                // orderInTransaction自体を削除
+                await repos.orderInTransaction.deleteByIdentifier({ identifier: params.purpose.id });
         }
         await Promise.all(authorizeActions.map(async (action) => {
             await repos.authorizeOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });

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

@@ -26,7 +26,7 @@ function voidTransactionByActionId(params) {
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
-        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
+        // const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
         const action = await repos.authorizeOfferAction.findById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory_1.factory.errors.Argument('Transaction', 'Action not found in the transaction');
@@ -34,17 +34,21 @@ function voidTransactionByActionId(params) {
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
         await repos.authorizeOfferAction.cancelWithVoid({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id, cancelAction });
-        // add orderInTransaction(2024-01-15~)
-        // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-        // const orderNumberByTransaction = transaction.object.orderNumber;
-        const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
-        if (typeof orderNumberByTransaction === 'string') {
-            await (0, any_1.voidAcceptedOffer)({
-                // authorizeActions: [action],
-                authorizeActionsWithInstrument: [action],
-                orderNumber: orderNumberByTransaction
-            })(repos);
-        }
+        // // add orderInTransaction(2024-01-15~)
+        // // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
+        // // const orderNumberByTransaction = transaction.object.orderNumber;
+        // const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
+        // if (typeof orderNumberByTransaction === 'string') {
+        //     await voidAcceptedOffer({
+        //         // authorizeActions: [action],
+        //         authorizeActionsWithInstrument: [action],
+        //         orderNumber: orderNumberByTransaction
+        //     })(repos);
+        // }
+        await (0, any_1.voidAcceptedOffer)({
+            authorizeActionsWithInstrument: [action],
+            placeOrderId: params.purpose.id
+        })(repos);
         switch (action.instrument.typeOf) {
             case factory_1.factory.assetTransactionType.COAReserveTransaction: {
                 const { reserveService } = repos;

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

@@ -2,15 +2,11 @@ import type { COA } from '@motionpicture/coa-service';
 import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { EventRepo } from '../../../repo/event';
-import type { OrderNumberRepo } from '../../../repo/orderNumber';
-import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
 interface IAcceptRepos {
     action: AcceptCOAOfferActionRepo;
     event: EventRepo;
-    orderNumber: OrderNumberRepo;
-    project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
@@ -19,8 +15,6 @@ interface IReAcceptRepos {
     action: AcceptCOAOfferActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     event: EventRepo;
-    orderNumber: OrderNumberRepo;
-    project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;

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

@@ -4,7 +4,6 @@ exports.acceptOffer = acceptOffer;
 exports.reAcceptOffer = reAcceptOffer;
 const errorHandler_1 = require("../../../errorHandler");
 const factory_1 = require("../../../factory");
-const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const authorize_1 = require("./acceptOffer/authorize");
 const factory_2 = require("./acceptOffer/factory");
 function findCOAInfo(params) {
@@ -39,12 +38,11 @@ function acceptOffer(params) {
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        // issueOrderNumber(2025-03-11~)
-        await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
-            project: { id: transaction.project.id },
-            id: transaction.id,
-            object: { orderDate: new Date() }
-        })(repos);
+        // // 注文ドキュメントを参照(2026-06-24~)
+        // const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+        //     identifier: transaction.id,
+        //     project: { id: transaction.project.id },
+        // });
         const coaInfo = await findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         const updTmpReserveSeatArgs = (0, factory_2.createUpdTmpReserveSeatArgs)({ object: params.object, coaInfo });
         let updTmpReserveSeatResult;
@@ -125,11 +123,11 @@ function reAcceptOffer(params) {
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: transaction.id });
-        if (typeof orderNumber !== 'string') {
-            // 事前に発行されているはず
-            throw new factory_1.factory.errors.NotFound('transaction.object.orderNumber');
-        }
+        // const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: transaction.id });
+        // if (typeof orderNumber !== 'string') {
+        //     // 事前に発行されているはず
+        //     throw new factory.errors.NotFound('transaction.object.orderNumber');
+        // }
         const coaInfo = await findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         // 承認アクション存在検証
         await repos.authorizeOfferAction.findById({ id: params.potentialActions.id, typeOf: factory_1.factory.actionType.AuthorizeAction }, ['id'], []);

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -32,7 +32,7 @@ export declare function responseBody2acceptedOffers4result(params: {
     responseBody: IResponseBody;
     acceptedOffer: IAcceptedOffer4COA[];
     event: Pick<IMinimizedIndividualEvent, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
-    seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
+    seller?: never;
     bookingTime: Date;
     totalPrice: number;
 }): IResultAcceptedOffer[];