@chevre/domain 24.1.0-alpha.15 → 24.1.0-alpha.16

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

@@ -6,6 +6,12 @@ type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'>
     acceptedOffers: factory.order.IAcceptedOffer[];
     customer?: factory.order.ICustomer;
 };
+type IAcceptedOffer = factory.order.IAcceptedOffer & {
+    /**
+     * 受け入れ時に指定必須
+     */
+    offeredThrough: factory.offer.IOfferedThrough;
+};
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
  */
@@ -27,6 +33,16 @@ export declare class OrderInTransactionRepo {
     private readonly reserveTransactionModel;
     constructor(connection: Connection);
     private findSubReservationsByReservationNumbers;
+    /**
+     * 取引進行中の注文からacceptedOffersを検索する
+     * 予約取引から予約ごとの価格仕様も参照する
+     */
+    findAcceptedOffersWithPriceByOrderNumber(params: {
+        orderNumber: string;
+        project: {
+            id: string;
+        };
+    }): Promise<factory.order.IAcceptedOffer[]>;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      */
@@ -34,7 +50,7 @@ export declare class OrderInTransactionRepo {
         orderNumber: {
             $eq: string;
         };
-    }): Promise<factory.order.IAcceptedOffer[]>;
+    }): Promise<Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>[]>;
     /**
      * 注文を受注する
      * typeOf: PlaceOrder -> typeOf: Order
@@ -44,7 +60,9 @@ export declare class OrderInTransactionRepo {
      * 注文documentがなければ作成し、受け入れられたオファーを追加する
      * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
      */
-    acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
+    acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
+        acceptedOffers: IAcceptedOffer[];
+    }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する
      * ホワイトリストとブラックリスト両方に対応

package/lib/chevre/repo/orderInTransaction.js

@@ -45,10 +45,11 @@ class OrderInTransactionRepo {
     }
     /**
      * 取引進行中の注文からacceptedOffersを検索する
+     * 予約取引から予約ごとの価格仕様も参照する
      */
-    async findAcceptedOffersByOrderNumber(params) {
+    async findAcceptedOffersWithPriceByOrderNumber(params) {
         const doc = await this.orderModel.findOne({
-            orderNumber: { $eq: params.orderNumber.$eq },
+            orderNumber: { $eq: params.orderNumber },
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
         }, { acceptedOffers: 1 })
             .lean()
@@ -56,18 +57,23 @@ class OrderInTransactionRepo {
         if (doc === null) {
             throw new factory_1.factory.errors.NotFound('orderInTransaction');
         }
+        const isCOA = doc.acceptedOffers.at(0)?.offeredThrough?.identifier === factory_1.factory.service.webAPI.Identifier.COA;
+        // COAの場合、予約取引は存在しないのでそのまま返す
+        if (isCOA) {
+            return doc.acceptedOffers;
+        }
         // priceSpecificationを予約取引から補完する(2026-05-12~)
-        const reservationNumbers = [...new Set(doc.acceptedOffers.map((aceptedOffer) => aceptedOffer.itemOffered.reservationNumber))];
         let subReservations = [];
+        const reservationNumbers = [...new Set(doc.acceptedOffers.map((aceptedOffer) => aceptedOffer.itemOffered.reservationNumber))];
         if (reservationNumbers.length > 0) {
             subReservations = await this.findSubReservationsByReservationNumbers({ reservationNumbers });
         }
         return doc.acceptedOffers.map(({ priceSpecification, ...acceptedOfferWithoutPrice }) => {
             const priceBySubReservation = subReservations.find((subReservation) => subReservation.id === acceptedOfferWithoutPrice.itemOffered.id)?.price;
             const priceSpecMatched = (0, util_1.isDeepStrictEqual)(priceSpecification, priceBySubReservation);
-            console.log('findAcceptedOffersByOrderNumber: priceSpecMatched?', priceSpecMatched);
+            console.log('findAcceptedOffersByOrderNumber: priceSpecMatched?', priceSpecMatched, acceptedOfferWithoutPrice.itemOffered.id, params.orderNumber, params.project.id);
             if (!priceSpecMatched) {
-                console.error('findAcceptedOffersByOrderNumber: priceSpecMatched: false!!!', acceptedOfferWithoutPrice.itemOffered.id, params.orderNumber.$eq);
+                console.error('findAcceptedOffersByOrderNumber: priceSpecMatched: false!!!', acceptedOfferWithoutPrice.itemOffered.id, params.orderNumber, params.project.id);
             }
             return {
                 ...acceptedOfferWithoutPrice,
@@ -75,6 +81,21 @@ class OrderInTransactionRepo {
             };
         });
     }
+    /**
+     * 取引進行中の注文からacceptedOffersを検索する
+     */
+    async findAcceptedOffersByOrderNumber(params) {
+        const doc = await this.orderModel.findOne({
+            orderNumber: { $eq: params.orderNumber.$eq },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
+        }, { acceptedOffers: 1 })
+            .lean()
+            .exec();
+        if (doc === null) {
+            throw new factory_1.factory.errors.NotFound('orderInTransaction');
+        }
+        return doc.acceptedOffers;
+    }
     /**
      * 注文を受注する
      * typeOf: PlaceOrder -> typeOf: Order

package/lib/chevre/service/aggregation/event/aggregateOffers.js

@@ -150,7 +150,12 @@ function aggregateReservationByOffer(params) {
                         }
                     }
                 });
-                console.log('aggregateReservationByOffer: reservationCount4offer:', reservationCount4offer, 'aggregateSeatingType:', aggregateSeatingType, 'offer.id:', params.offer.id, 'offer.category:', params.offer.category?.codeValue);
+                // console.log(
+                //     'aggregateReservationByOffer: reservationCount4offer:', reservationCount4offer,
+                //     'aggregateSeatingType:', aggregateSeatingType,
+                //     'offer.id:', params.offer.id,
+                //     'offer.category:', params.offer.category?.codeValue
+                // );
             }
         }
         const { maximumAttendeeCapacity, remainingAttendeeCapacity } = await calculateCapacityByOffer(params)(repos);

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

@@ -10,7 +10,9 @@ export declare function acceptOffer(params: {
     project: {
         id: string;
     };
-    acceptedOffers: factory.order.IAcceptedOffer[];
+    acceptedOffers: (factory.order.IAcceptedOffer & {
+        offeredThrough: factory.offer.IOfferedThrough;
+    })[];
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {
     /**

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

@@ -23,7 +23,7 @@ declare function createAuthorizeSeatReservationActionAttributes(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
 }): factory.action.authorize.offer.eventService.IAttributes;
 declare function acceptedOffers2amount(params: {
-    acceptedOffers: IResultAcceptedOffer[];
+    acceptedOffers: Pick<IResultAcceptedOffer, 'priceSpecification' | 'id'>[];
 }): number;
 declare function acceptedOffers2authorizeResult(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
@@ -34,6 +34,7 @@ declare function acceptedOffers2authorizeResult(params: {
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export type IResultAcceptedOffer = factory.order.IAcceptedOffer & {
     itemOffered: factory.order.IReservation;
+    offeredThrough: factory.offer.IOfferedThrough;
 };
 declare function responseBody2acceptedOffers4result(params: {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;

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

@@ -23,6 +23,7 @@ export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
 };
 type IResultAcceptedOffer = Omit<factory.order.IAcceptedOffer, 'itemOffered'> & {
     itemOffered: factory.order.ICOAEventReservation;
+    offeredThrough: factory.offer.IOfferedThrough;
 };
 /**
  * COA仮予約結果から注文アイテムを生成する

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

@@ -99,7 +99,10 @@ function confirm(params, options) {
         // authorizeProductOfferActions,
         serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
-        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
+            orderNumber,
+            project: { id: transaction.project.id }
+        }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];

package/package.json

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