@chevre/domain 25.0.0-alpha.16 → 25.0.0-alpha.18

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

@@ -72,6 +72,11 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
         project: {
             id: string;
         };
+    }, options: {
+        /**
+         * 注文取引タイプのドキュメントのみを参照対象にするかどうか
+         */
+        onlyPlaceOrder: boolean;
     }): Promise<string>;
     /**
      * 注文取引からcustomerを参照する

package/lib/chevre/repo/orderInTransaction.js

@@ -49,12 +49,13 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
      * 注文取引から注文番号を参照する
      * 存在しなければNotFoundError
      */
-    async findOrderNumberByIdentifier(params) {
+    async findOrderNumberByIdentifier(params, options) {
         const { project, identifier } = params;
+        const onlyPlaceOrder = options.onlyPlaceOrder === true;
         const doc = await this.orderModel.findOne({
             identifier: { $eq: identifier },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
-            'project.id': { $eq: project.id }
+            'project.id': { $eq: project.id },
+            ...((onlyPlaceOrder) && { typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder } })
         }, {
             _id: 0,
             orderNumber: 1

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/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/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 }
-        }, { issueForce: false })(repos);
+        }, { onlyPlaceOrder: true });
         // まず取引番号発行
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         const actionAttributes = (0, factory_2.createAuthorizeSeatReservationActionAttributes)({

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

@@ -2,17 +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 { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-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;
-    orderInTransaction: OrderInTransactionRepo;
-    orderNumber: OrderNumberRepo;
-    project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
@@ -21,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() }
-        }, { issueForce: false })(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;

package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.d.ts

@@ -1,8 +1,6 @@
 import { factory } from '../../../../factory';
 import type { ConfirmationNumberRepo } from '../../../../repo/confirmationNumber';
 import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
-import type { OrderNumberRepo } from '../../../../repo/orderNumber';
-import type { ProjectRepo } from '../../../../repo/project';
 import type { PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
 declare function fixOrderAsNeeded(params: {
     project: {
@@ -10,11 +8,9 @@ declare function fixOrderAsNeeded(params: {
     };
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
 }): (repos: {
-    project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     confirmationNumber: ConfirmationNumberRepo;
     orderInTransaction: OrderInTransactionRepo;
-    orderNumber: OrderNumberRepo;
 }) => Promise<{
     confirmationNumber: string;
     orderNumber: string;

package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixOrderAsNeeded = fixOrderAsNeeded;
 const factory_1 = require("../../../../factory");
 const publishConfirmationNumberIfNotExist_1 = require("../../../transaction/placeOrder/publishConfirmationNumberIfNotExist");
-const issueOrderNumberIfNotExist_1 = require("../../../transaction/placeOrder/issueOrderNumberIfNotExist");
 function fixOrderAsNeeded(params) {
     return async (repos) => {
         const orderDate = new Date();
@@ -17,12 +16,11 @@ function fixOrderAsNeeded(params) {
             object: { orderDate }
         })(repos);
         // }
-        // publish orderNumber(2025-02-14~)
-        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+        // 注文ドキュメントを参照(2026-06-24~)
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: params.purpose.id,
             project: { id: params.project.id },
-            id: params.purpose.id,
-            object: { orderDate }
-        }, { issueForce: false })(repos);
+        }, { onlyPlaceOrder: true });
         return { confirmationNumber, orderNumber };
     };
 }

package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts

@@ -7,11 +7,8 @@ import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
-import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
-import type { ProjectRepo } from '../../../repo/project';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TicketRepo } from '../../../repo/ticket';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -25,12 +22,9 @@ interface IPublishPaymentUrlRepos {
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
-    orderInTransaction: OrderInTransactionRepo;
-    orderNumber: OrderNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     ticket: TicketRepo;
     placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;

package/lib/chevre/service/payment/any/publishPaymentUrl.js

@@ -36,7 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishPaymentUrl = publishPaymentUrl;
 const factory_1 = require("../../../factory");
 const PayTransactionService = __importStar(require("../../assetTransaction/pay"));
-const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const fixTransactionNumberOnPublishPaymentUrl_1 = require("./publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl");
 const factory_2 = require("./factory");
 /**
@@ -53,12 +52,11 @@ function publishPaymentUrl(params) {
             if (project.id !== transaction.project.id) {
                 throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
             }
-            // issueOrderNumber(2025-03-11~)
-            await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
-                project: { id: transaction.project.id },
-                id: transaction.id,
-                object: { orderDate: new Date() }
-            }, { issueForce: false })(repos);
+            // // 注文ドキュメントを参照(2026-06-24~)
+            // const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            //     identifier: transaction.id,
+            //     project: { id: transaction.project.id },
+            // });
             // 取引番号生成
             const { transactionNumber, ticketToken } = await (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
                 object: params.object,

package/lib/chevre/service/task/acceptCOAOffer.js

@@ -7,9 +7,9 @@ const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
-const orderInTransaction_1 = require("../../repo/orderInTransaction");
-const orderNumber_1 = require("../../repo/orderNumber");
-const project_1 = require("../../repo/project");
+// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
+// import { OrderNumberRepo } from '../../repo/orderNumber';
+// import { ProjectRepo } from '../../repo/project';
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const integration_1 = require("../../repo/setting/integration");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -86,8 +86,8 @@ function call(params) {
                     action: actionRepo,
                     authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
-                    project: new project_1.ProjectRepo(connection),
+                    // orderNumber: new OrderNumberRepo({ connection }),
+                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService
@@ -104,9 +104,9 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
-                    project: new project_1.ProjectRepo(connection),
+                    // orderInTransaction: new OrderInTransactionRepo(connection),
+                    // orderNumber: new OrderNumberRepo({ connection }),
+                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService

package/lib/chevre/service/task/publishPaymentUrl.js

@@ -9,11 +9,11 @@ const authorization_1 = require("../../repo/authorization");
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
-const orderInTransaction_1 = require("../../repo/orderInTransaction");
-const orderNumber_1 = require("../../repo/orderNumber");
+// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
+// import { OrderNumberRepo } from '../../repo/orderNumber';
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
-const project_1 = require("../../repo/project");
+// import { ProjectRepo } from '../../repo/project';
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
 const ticket_1 = require("../../repo/ticket");
@@ -48,12 +48,12 @@ function call(params) {
                 event: new event_1.EventRepo(connection),
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
-                orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
-                orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
+                // orderInTransaction: new OrderInTransactionRepo(connection),
+                // orderNumber: new OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
-                project: new project_1.ProjectRepo(connection),
+                // project: new ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -19,16 +19,17 @@ const debug = (0, debug_1.default)('chevre-domain:service:transaction');
 /**
  * 進行中でない取引を処理する
  */
-function processTransactionNotInProgress(transaction) {
+function processTransactionNotInProgress(params) {
     return async (repos) => {
+        const { transaction, orderNumber } = params;
         if (transaction.status === factory_1.factory.transactionStatusType.Confirmed) {
             const resultCustomer = await repos.orderInTransaction.findCustomerByOrderNumber({
-                orderNumber: { $eq: String(transaction.object.orderNumber) }
+                orderNumber: { $eq: orderNumber }
             });
             // if (resultCustomer === undefined) {
             //     throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
             // }
-            const { confirmationNumber, orderNumber } = transaction.object;
+            const { confirmationNumber } = transaction.object;
             // Confirmedの取引であればobjectには必ず存在するはず
             if (typeof confirmationNumber !== 'string' || typeof orderNumber !== 'string'
                 || confirmationNumber === '' || orderNumber === '') {
@@ -62,30 +63,30 @@ function confirm(params, options) {
             object: { orderDate: params.result.order.orderDate }
         })(repos);
         const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: factory_1.factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
-        const confirmResult = await processTransactionNotInProgress(transaction)(repos);
+        // 注文ドキュメントから注文番号を参照(取引開始時に発行済の前提)(2026-06-26~)
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: params.id,
+            project: { id: transaction.project.id }
+        }, { onlyPlaceOrder: false } // すでに取引確定済かもしれないのでfalse
+        );
+        const confirmResult = await processTransactionNotInProgress({ transaction, orderNumber })(repos);
         if (confirmResult !== undefined) {
             return confirmResult;
         }
         if (typeof params.agent?.id === 'string' && transaction.agent.id !== params.agent.id) {
             throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }
-        // 注文番号は興行オファー承認時に発行済のはず(2026-06-16~)
-        const orderNumber = transaction.object.orderNumber;
-        if (typeof orderNumber !== 'string' || orderNumber === '') {
-            throw new factory_1.factory.errors.Argument('transactionId', 'orderNumber not issued');
-        }
+        // // 注文番号は興行オファー承認時に発行済のはず(2026-06-16~)
+        // const orderNumber = transaction.object.orderNumber;
+        // if (typeof orderNumber !== 'string' || orderNumber === '') {
+        //     throw new factory.errors.Argument('transactionId', 'orderNumber not issued');
+        // }
         // 取引に対する全ての承認アクションをマージ
         const completedAuthorizeActions = await searchAuthorizeActions(params)(repos);
         let acceptPayActions = [];
         if (typeof transaction.object.paymentMethods?.paymentMethodId === 'string') {
             acceptPayActions = await searchAcceptPayActions(params)(repos);
         }
-        // 注文番号は興行オファー承認時に発行済のはずなので、ここは不要(承認オファーなしの注文は存在しえない)(2026-06-16~)
-        // const orderNumber = await issueOrderNumberIfNotExist({
-        //     project: { id: transaction.project.id },
-        //     id: transaction.id,
-        //     object: { orderDate: params.result.order.orderDate }
-        // })(repos);
         // 必要あらば注文コード発行(2024-02-05~)
         let code;
         const publishCodeExpiresInSeconds = options.publishCodeExpiresInSeconds;

package/lib/chevre/service/transaction/placeOrder/issueOrderNumberIfNotExist.d.ts

@@ -16,8 +16,6 @@ declare function issueOrderNumberIfNotExist(params: {
     object: {
         orderDate: Date;
     };
-}, options: {
-    issueForce: boolean;
 }): (repos: {
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;

package/lib/chevre/service/transaction/placeOrder/issueOrderNumberIfNotExist.js

@@ -2,21 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.issueOrderNumberIfNotExist = issueOrderNumberIfNotExist;
 const factory_1 = require("../../../factory");
-const USE_LEGACY_ISSUE_ORDER_NUMBER = process.env.USE_LEGACY_ISSUE_ORDER_NUMBER === '1';
+// const USE_LEGACY_ISSUE_ORDER_NUMBER = process.env.USE_LEGACY_ISSUE_ORDER_NUMBER === '1';
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */
-function issueOrderNumberIfNotExist(params, options) {
+function issueOrderNumberIfNotExist(params) {
     return async (repos) => {
-        // issueForceオプションあるいは、廃止予定の発行オプションの場合、注文番号を新たに発行する
-        const issueOrderNumber = options?.issueForce === true || USE_LEGACY_ISSUE_ORDER_NUMBER;
-        if (!issueOrderNumber) {
-            // 注文ドキュメントを参照(2026-06-24~)
-            return repos.orderInTransaction.findOrderNumberByIdentifier({
-                identifier: params.id,
-                project: { id: params.project.id }
-            });
-        }
+        // // issueForceオプションあるいは、廃止予定の発行オプションの場合、注文番号を新たに発行する
+        // const issueOrderNumber = options?.issueForce === true || USE_LEGACY_ISSUE_ORDER_NUMBER;
+        // if (!issueOrderNumber) {
+        //     // 注文ドキュメントを参照(2026-06-24~)
+        //     return repos.orderInTransaction.findOrderNumberByIdentifier({
+        //         identifier: params.id,
+        //         project: { id: params.project.id }
+        //     })
+        // }
         // 1. 最初のチェック
         let orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
         // すでに発行済であれば何もしない

package/lib/chevre/service/transaction/placeOrder/start.d.ts

@@ -23,7 +23,6 @@ interface IStartOperationRepos {
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 interface IStartOptions {
-    createOrderDocument: boolean;
     minimizeStartPlaceOrderParams: boolean;
 }
 /**

package/lib/chevre/service/transaction/placeOrder/start.js

@@ -54,27 +54,25 @@ function start(params, options) {
             transaction = await repos.placeOrder.startPlaceOrder(startParams);
         }
         // support createOrderDocument(2026-06-23~)
-        if (options.createOrderDocument) {
-            const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
-                project: { id: params.project.id },
-                id: transaction.id,
-                object: { orderDate: new Date() }
-            }, { issueForce: true })(repos);
-            await repos.orderInTransaction.createPlaceOrderIfNotExists({
-                orderNumber,
-                project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-                identifier: transaction.id,
-                seller: {
-                    id: seller.id,
-                    name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
-                    typeOf: seller.typeOf,
-                    additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
-                },
-                ...((typeof params.object.customer?.typeOf === 'string') && { customer: params.object.customer }),
-                ...((typeof params.broker?.typeOf === 'string') && { broker: params.broker })
-            });
-            // console.log('createPlaceOrderResult:', createPlaceOrderResult);
-        }
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+            project: { id: params.project.id },
+            id: transaction.id,
+            object: { orderDate: new Date() }
+        })(repos);
+        await repos.orderInTransaction.createPlaceOrderIfNotExists({
+            orderNumber,
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+            identifier: transaction.id,
+            seller: {
+                id: seller.id,
+                name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
+                typeOf: seller.typeOf,
+                additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+            },
+            ...((typeof params.object.customer?.typeOf === 'string') && { customer: params.object.customer }),
+            ...((typeof params.broker?.typeOf === 'string') && { broker: params.broker })
+        });
+        // console.log('createPlaceOrderResult:', createPlaceOrderResult);
         return transaction;
     };
 }

package/lib/chevre/service/transaction/placeOrder/updateAgent.d.ts

@@ -1,7 +1,5 @@
 import { factory } from '../../../factory';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { OrderNumberRepo } from '../../../repo/orderNumber';
-import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 /**
  * 取引人プロフィール更新
@@ -17,7 +15,5 @@ export declare function updateAgent(params: {
     };
 }): (repos: {
     orderInTransaction: OrderInTransactionRepo;
-    orderNumber: OrderNumberRepo;
-    project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
 }) => Promise<void>;

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAgent = updateAgent;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
-const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 function fixCustomer(params) {
     return async (repos) => {
         let formattedTelephone;
@@ -74,11 +73,11 @@ function updateAgent(params) {
         const { customer, transaction } = await fixCustomer(params)(repos);
         // also save in orderInTransaction(2024-06-20~)
         if (customer !== undefined) {
-            const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+            // 注文ドキュメントを参照(2026-06-24~)
+            const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+                identifier: params.id,
                 project: { id: transaction.project.id },
-                id: params.id,
-                object: { orderDate: new Date() }
-            }, { issueForce: false })(repos);
+            }, { onlyPlaceOrder: true });
             const customerName = (typeof customer.name === 'string' && customer.name !== '')
                 ? customer.name
                 : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.16"
+  "version": "25.0.0-alpha.18"
 }