@chevre/domain 25.2.0-alpha.35 → 25.2.0-alpha.36

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

@@ -16,10 +16,20 @@ export type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'pr
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
  */
-export type IPlacingOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'typeOf'> & {
+export type IPlacingOrder = Pick<factory.order.IOrder, 'orderDate' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'typeOf'> & {
     url?: never;
     identifier?: never;
     name?: never;
+    /**
+     * 上書きしてはいけない
+     * 注文取引進行中にセット済であり上書きしてはいけない
+     */
+    orderNumber?: never;
+    /**
+     * 上書きしてはいけない
+     * 注文取引進行中にセット済であり上書きしてはいけない
+     */
+    confirmationNumber?: never;
     /**
      * 上書きしてはいけない
      */
@@ -103,6 +113,11 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
         project: {
             id: string;
         };
+    }, options: {
+        /**
+         * 注文取引タイプのドキュメントのみを参照対象にするかどうか
+         */
+        onlyPlaceOrder: boolean;
     }): Promise<(Pick<factory.order.IAcceptedOffer, 'id' | 'itemOffered' | 'offeredThrough' | 'serialNumber' | 'typeOf'> & {
         priceSpecification?: factory.order.ITicketPriceSpecification;
     })[]>;

package/lib/chevre/repo/orderInTransaction.js

@@ -96,10 +96,12 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する
      */
-    async findAcceptedOffersWithPriceByIdentifier(params) {
+    async findAcceptedOffersWithPriceByIdentifier(params, options) {
+        const onlyPlaceOrder = options.onlyPlaceOrder === true;
         const doc = await this.orderModel.findOne({
             identifier: { $eq: params.identifier },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
+            'project.id': { $eq: params.project.id },
+            ...((onlyPlaceOrder) && { typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder } })
         }, { acceptedOffers: 1 })
             .lean()
             .exec();
@@ -145,7 +147,8 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         if (!(order.orderDate instanceof Date)) {
             throw new factory_1.factory.errors.Argument('orderDate', 'must be Date');
         }
-        const setFields = order;
+        const { confirmationNumber: _confirmationNumber, orderNumber: _orderNumber, ...setFields } = order;
+        // const setFields: AnyKeys<factory.order.IOrder> = order;
         // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
         await this.orderModel.updateOne({
             identifier: { $eq: identifier },

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts

@@ -5,7 +5,6 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
 interface ICreatePlacingOrderFromExistingTransactionRepos {
-    action?: never;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     orderInTransaction: OrderInTransactionRepo;
@@ -18,6 +17,8 @@ declare function createPlacingOrderFromExistingTransaction(params: {
     confirmationNumber: string;
     orderNumber: string;
 }): (repos: ICreatePlacingOrderFromExistingTransactionRepos) => Promise<{
+    orderNumber: string;
+    confirmationNumber: string;
     order: IPlacingOrder;
     placeOrderTransaction: IPlaceOrderTransaction;
     serialNumbers: string[];

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -17,12 +17,6 @@ function createPlacingOrderFromExistingTransaction(params) {
             object: {
                 orderNumber: { $eq: orderNumber },
             },
-            // result: {
-            //     order: {
-            //         confirmationNumber: { $eq: confirmationNumber },
-            //         orderNumbers: [orderNumber]
-            //     }
-            // },
             inclusion: ['project', 'typeOf', 'result', 'object', 'seller']
         });
         const placeOrderTransactionWithResult = placeOrderTransactions.shift();
@@ -39,43 +33,12 @@ function createPlacingOrderFromExistingTransaction(params) {
         const authorizeActionsAsResult = placeOrderTransactionWithResult.result?.authorizeActions;
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
+            /* istanbul ignore else -- @preserve */
             if (completedAuthorizeActionIds.length > 0) {
-                // authorizePaymentActions = <Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[]>
-                //     await repos.action.search<factory.actionType.AuthorizeAction>(
-                //         {
-                //             typeOf: factory.actionType.AuthorizeAction,
-                //             purpose: {
-                //                 typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                //                 id: { $in: [placeOrderTransactionWithResult.id] }
-                //             },
-                //             object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
-                //             id: { $in: completedAuthorizeActionIds }
-                //         },
-                //         ['result']
-                //     );
                 authorizePaymentActions = await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodResultsById({
                     purpose: { id: placeOrderTransactionWithResult.id },
                     ids: completedAuthorizeActionIds
                 });
-                // authorizeOfferActionsWithInstrument = <IAuthorizeActionWithInstrument[]>await repos.action.search<factory.actionType.AuthorizeAction>(
-                //     {
-                //         typeOf: factory.actionType.AuthorizeAction,
-                //         purpose: {
-                //             typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                //             id: { $in: [placeOrderTransactionWithResult.id] }
-                //         },
-                //         object: {
-                //             typeOf: {
-                //                 $in: [
-                //                     factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-                //                     factory.offerType.Offer
-                //                 ]
-                //             }
-                //         },
-                //         id: { $in: completedAuthorizeActionIds }
-                //     },
-                //     ['instrument']
-                // );
                 authorizeOfferActionsWithInstrument = await repos.authorizeOfferAction.findAuthorizeOfferInstrumentsByIds({
                     purpose: { id: placeOrderTransactionWithResult.id },
                     ids: completedAuthorizeActionIds
@@ -87,26 +50,18 @@ function createPlacingOrderFromExistingTransaction(params) {
         const serialNumbers = authorizeOfferActionsWithInstrument
             .filter(({ instrument }) => typeof instrument.transactionNumber === 'string')
             .map(({ instrument }) => String(instrument.transactionNumber));
-        try {
-            // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
-            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByIdentifier({
-                // orderNumber,
-                identifier: placeOrderTransactionWithResult.id,
-                project: { id: params.project.id }
-            }))
-                .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
-        }
-        catch (error) {
-            let throwsError = true;
-            // すでにtypeOf: Orderに変更済の場合、NotFoundとなる
-            if (error instanceof factory_1.factory.errors.NotFound) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
+        // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
+        acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByIdentifier({
+            identifier: placeOrderTransactionWithResult.id,
+            project: { id: params.project.id }
+        }, { onlyPlaceOrder: false } // typeOf:PlaceOrderフィルターを無効化したのでもうNotFoundになる心配はなし(2026-07-20~)
+        ))
+            .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         const order = (0, factory_2.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions, acceptedOffers });
-        return { order, placeOrderTransaction: placeOrderTransactionWithResult, serialNumbers };
+        return {
+            orderNumber,
+            confirmationNumber,
+            order, placeOrderTransaction: placeOrderTransactionWithResult, serialNumbers
+        };
     };
 }

package/lib/chevre/service/order/placeOrder/factory.js

@@ -68,7 +68,6 @@ function createSeller(params) {
 }
 function createPlacingOrder(params) {
     const { transaction, authorizePaymentActions } = params;
-    let orderDateByTransaction;
     const { confirmationNumber, orderDate, orderNumber } = transaction.object;
     if (typeof confirmationNumber !== 'string') {
         // 事前に発行済なはずなので、ありえないフロー
@@ -79,25 +78,8 @@ function createPlacingOrder(params) {
         throw new factory_1.factory.errors.Internal('object.orderNumber undefined');
     }
     if (orderDate === undefined) {
-        // orderDateByTransaction = transaction.result?.order?.orderDate
-    }
-    else {
-        orderDateByTransaction = orderDate;
-    }
-    if (orderDateByTransaction === undefined) {
         throw new factory_1.factory.errors.NotFound('orderDate in the transaction');
     }
-    // const orderByTransaction = transaction.result?.order;
-    // if (orderByTransaction === undefined) {
-    //     throw new factory.errors.NotFound('transaction.result.order');
-    // }
-    // const seller = createSeller({ transaction });
-    // discontinue(2026-06-11~)
-    // const name: string | undefined =
-    //     (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
-    // discontinue(2026-06-22~)
-    // const broker: factory.order.IBroker | undefined =
-    //     (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
@@ -115,15 +97,15 @@ function createPlacingOrder(params) {
     });
     return {
         // ...orderByTransaction, // transaction.result.orderへの依存廃止(2026-06-15~)
-        confirmationNumber,
-        orderNumber,
+        // confirmationNumber, // placeOrder時に上書きする必要なし(2026-07-20~)
+        // orderNumber, // placeOrder時に上書きする必要なし(2026-07-20~)
         typeOf: factory_1.factory.order.OrderType.Order, // 取引保管を廃止するためにここで指定(2026-06-14~)
         orderStatus: factory_1.factory.orderStatus.OrderPaymentDue, // 取引保管を廃止するためにここで指定(2026-06-14~)
         // seller, // 取引開始時の注文ドキュメント作成へ移行(2026-06-25~)
         paymentMethods, // 2024-06-17~
         price, // 2024-06-17~
         priceCurrency: factory_1.factory.priceCurrency.JPY, // 取引保管を廃止するためにここで指定(2026-06-14~)
-        orderDate: (0, moment_1.default)(orderDateByTransaction)
+        orderDate: (0, moment_1.default)(orderDate)
             .toDate(),
         orderedItem, // 2024-06-18~
         // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2026-06-11~)

package/lib/chevre/service/order/placeOrder.d.ts

@@ -11,7 +11,6 @@ import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
-import { IPlacingOrder } from './placeOrder/createPlacingOrderFromExistingTransaction';
 interface IPlaceOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
@@ -29,7 +28,7 @@ interface IPlaceOrderRepos {
  * 注文を作成する
  */
 declare function placeOrder(params: {
-    agent?: factory.action.trade.order.IAgent;
+    agent: factory.action.trade.order.IAgent;
     project: {
         id: string;
     };
@@ -38,7 +37,5 @@ declare function placeOrder(params: {
         orderNumber: string;
     };
     useOnOrderStatusChanged: boolean;
-}): (repos: IPlaceOrderRepos, settings: Settings) => Promise<{
-    order: IPlacingOrder;
-}>;
+}): (repos: IPlaceOrderRepos, settings: Settings) => Promise<void>;
 export { IPlaceOrderRepos, placeOrder };

package/lib/chevre/service/order/placeOrder.js

@@ -11,11 +11,8 @@ const voidAcceptedOfferIfNecessary_1 = require("./placeOrder/voidAcceptedOfferIf
  */
 function placeOrder(params) {
     return async (repos, settings) => {
-        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
-            throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
-        }
         // 注文番号から取引と注文をfixする
-        const { order, placeOrderTransaction, serialNumbers } = await (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
+        const { orderNumber, confirmationNumber, order, placeOrderTransaction, serialNumbers } = await (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
             project: { id: params.project.id },
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
@@ -31,14 +28,14 @@ function placeOrder(params) {
         }
         const simpleOrder = {
             typeOf: order.typeOf,
-            orderNumber: order.orderNumber,
+            orderNumber,
             orderDate: order.orderDate
         };
         const orderActionPurpose = {
             typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id
         };
         const orderActionAttributes = {
-            agent: (typeof params.agent?.typeOf === 'string') ? params.agent : placeOrderTransaction.project,
+            agent: params.agent,
             object: simpleOrder,
             project: placeOrderTransaction.project,
             purpose: orderActionPurpose,
@@ -61,7 +58,6 @@ function placeOrder(params) {
             try {
                 // 冗長なオファーを除外する(念のため)
                 await (0, voidAcceptedOfferIfNecessary_1.voidAcceptedOfferIfNecessary)({
-                    // object: { orderNumber: order.orderNumber },
                     placeOrderId: placeOrderTransaction.id,
                     serialNumbers
                 })(repos);
@@ -81,38 +77,31 @@ function placeOrder(params) {
         if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管->CreateAccountingReportへ移行(2024-02-02~)
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
-            if (order.orderStatus === factory_1.factory.orderStatus.OrderPaymentDue) {
-                await (0, onOrderStatusChanged_1.onOrderPaymentDue)({
-                    order: {
-                        paymentMethods: order.paymentMethods,
-                        project: placeOrderTransaction.project,
-                        orderNumber: order.orderNumber,
-                        confirmationNumber: order.confirmationNumber,
-                        orderDate: order.orderDate,
-                        // seller: order.seller,
-                        typeOf: order.typeOf,
-                        // price: order.price,
-                        // priceCurrency: order.priceCurrency,
-                        orderStatus: order.orderStatus
-                    }
-                })({
-                    task: repos.task
-                });
-            }
-            else {
-                throw new factory_1.factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);
-            }
+            await (0, onOrderStatusChanged_1.onOrderPaymentDue)({
+                order: {
+                    paymentMethods: order.paymentMethods,
+                    project: placeOrderTransaction.project,
+                    orderNumber,
+                    confirmationNumber,
+                    orderDate: order.orderDate,
+                    typeOf: order.typeOf,
+                    orderStatus: order.orderStatus
+                }
+            })({
+                task: repos.task
+            });
             // paymentMethods.length: 0の場合を考慮(2023-08-24~)
+            /* istanbul ignore else -- @preserve */
             if (order.paymentMethods.length === 0) {
                 // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpaymentDue2Processingを実行する必要がある
                 await (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
                     project: { id: placeOrderTransaction.project.id },
-                    confirmationNumber: order.confirmationNumber,
-                    orderNumber: order.orderNumber,
+                    confirmationNumber,
+                    orderNumber,
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
                 })(repos, settings);
             }
         }
-        return { order };
+        // return { order };
     };
 }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
+const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
@@ -22,6 +23,7 @@ function call(data) {
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         await (0, placeOrder_2.placeOrder)({
             ...data,
+            agent: { id: data.project.id, typeOf: factory_1.factory.organizationType.Project },
             useOnOrderStatusChanged: true
         })({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),

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

@@ -112,10 +112,9 @@ function confirm(params, options) {
         serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
         const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByIdentifier({
-            // orderNumber,
             identifier: transaction.id,
             project: { id: transaction.project.id }
-        }))
+        }, { onlyPlaceOrder: true }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // 単価オファーの全適用条件を検証するために、単価オファーを参照(2026-07-06~)
         const unitPriceOfferConditions = await (0, prepareUnitPriceOfferConditions_1.prepareUnitPriceOfferConditions)({

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.35"
+  "version": "25.2.0-alpha.36"
 }