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

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

@@ -6,8 +6,17 @@ type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'>
     acceptedOffers: factory.order.IAcceptedOffer[];
     customer?: factory.order.ICustomer;
 };
+/**
+ * typeOf: Orderへドキュメント変換時の編集フィールド
+ */
 export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'identifier' | 'isGift' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf' | 'url'> & {
+    /**
+     * 上書きしてはいけない
+     */
     acceptedOffers?: never;
+    /**
+     * 上書きしてはいけない
+     */
     customer?: never;
 };
 /**
@@ -15,7 +24,9 @@ export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationN
  */
 export declare class OrderInTransactionRepo {
     private readonly orderModel;
+    private readonly reserveTransactionModel;
     constructor(connection: Connection);
+    private findSubReservationsByReservationNumbers;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      */
@@ -26,6 +37,7 @@ export declare class OrderInTransactionRepo {
     }): Promise<factory.order.IAcceptedOffer[]>;
     /**
      * 注文を受注する
+     * typeOf: PlaceOrder -> typeOf: Order
      */
     placeOrder(order: IPlacingOrder): Promise<void>;
     /**

package/lib/chevre/repo/orderInTransaction.js

@@ -1,15 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderInTransactionRepo = void 0;
+const util_1 = require("util");
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
+const assetTransaction_1 = require("./mongoose/schemas/assetTransaction");
 /**
  * 取引中注文リポジトリ
  */
 class OrderInTransactionRepo {
     orderModel;
+    reserveTransactionModel;
     constructor(connection) {
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
+        this.reserveTransactionModel = connection.model(assetTransaction_1.modelName, (0, assetTransaction_1.createSchema)());
+    }
+    async findSubReservationsByReservationNumbers(params) {
+        const { reservationNumbers } = params;
+        if (!Array.isArray(reservationNumbers) || reservationNumbers.length === 0) {
+            throw new factory_1.factory.errors.ArgumentNull('reservationNumbers');
+        }
+        const aggregate = this.reserveTransactionModel.aggregate([
+            {
+                $match: {
+                    typeOf: { $eq: factory_1.factory.assetTransactionType.Reserve },
+                    transactionNumber: { $in: reservationNumbers }
+                }
+            },
+            {
+                $unwind: {
+                    path: '$object.subReservation'
+                    // includeArrayIndex: 'elementIndex'
+                }
+            },
+            {
+                $project: {
+                    _id: 0,
+                    id: '$object.subReservation.id',
+                    price: '$object.subReservation.price',
+                }
+            }
+        ]);
+        return aggregate.exec();
     }
     /**
      * 取引進行中の注文からacceptedOffersを検索する
@@ -24,10 +56,28 @@ class OrderInTransactionRepo {
         if (doc === null) {
             throw new factory_1.factory.errors.NotFound('orderInTransaction');
         }
-        return doc.acceptedOffers;
+        // priceSpecificationを予約取引から補完する(2026-05-12~)
+        const reservationNumbers = [...new Set(doc.acceptedOffers.map((aceptedOffer) => aceptedOffer.itemOffered.reservationNumber))];
+        let subReservations = [];
+        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);
+            if (!priceSpecMatched) {
+                console.error('findAcceptedOffersByOrderNumber: priceSpecMatched: false!!!', acceptedOfferWithoutPrice.itemOffered.id, params.orderNumber.$eq);
+            }
+            return {
+                ...acceptedOfferWithoutPrice,
+                ...((priceBySubReservation !== undefined) && { priceSpecification: priceBySubReservation })
+            };
+        });
     }
     /**
      * 注文を受注する
+     * typeOf: PlaceOrder -> typeOf: Order
      */
     async placeOrder(order) {
         if (!(order.orderDate instanceof Date)) {

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

@@ -302,7 +302,6 @@ function responseBody2acceptedOffers4result(params) {
  * 注文データの予約を生成する
  */
 function createReservation(params) {
-    // const { itemOffered, event, reservationFor } = params;
     const { itemOffered } = params;
     const event = params.reservationFor;
     let reservationItem;
@@ -367,19 +366,17 @@ function createReservation(params) {
         if (params.issuedThrough.typeOf !== factory_1.factory.product.ProductType.EventService) {
             throw new factory_1.factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory_1.factory.product.ProductType.EventService}`);
         }
+        const { additionalProperty, additionalTicketText, programMembershipUsed } = itemOffered;
         reservationItem = {
             typeOf: itemOffered.typeOf,
-            additionalProperty: itemOffered.additionalProperty,
-            additionalTicketText: itemOffered.additionalTicketText,
             id: itemOffered.id,
             issuedThrough: params.issuedThrough,
             reservationNumber: params.reservationNumber,
             reservationFor,
             reservedTicket,
-            // 使用メンバーシップがあれば追加
-            ...(typeof itemOffered.programMembershipUsed?.typeOf === 'string')
-                ? { programMembershipUsed: itemOffered.programMembershipUsed }
-                : undefined
+            ...((Array.isArray(additionalProperty)) && { additionalProperty }),
+            ...((typeof additionalTicketText === 'string') && { additionalTicketText }),
+            ...((typeof programMembershipUsed?.typeOf === 'string') && { programMembershipUsed }) // 使用メンバーシップがあれば追加
         };
     }
     else {

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

@@ -3,6 +3,6 @@ import { factory } from '../../../../factory';
  * 受入オファーを注文アイテムに変換する
  */
 declare function acceptedOffers2orderedItem(params: {
-    eventReservationAcceptedOffers: factory.order.IAcceptedOffer[];
+    eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered'>[];
 }): factory.order.IOrderedItem[];
 export { acceptedOffers2orderedItem };

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

@@ -9,11 +9,6 @@ function acceptedOffers2orderedItem(params) {
     // 予約がある場合
     const { reservationOrderItems } = createReservationAcceptedOffers(params);
     // 通貨転送がある場合
-    // const { moneyTransferOrderItems } = createMoneyTransferAcceptedOffers(params);
-    // プロダクトがある場合
-    // const { productOrderItems } = createProductItems(params);
-    // return [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
-    // return [...reservationOrderItems, ...productOrderItems];
     return reservationOrderItems;
 }
 function createReservationAcceptedOffers(params) {

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

@@ -1,7 +1,7 @@
 import type { IPlacingOrder } from '../../../repo/orderInTransaction';
 import { factory } from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
-type IOrderAcceptedOffer = factory.order.IAcceptedOffer;
+type IOrderAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>;
 declare function createPaymentMethods(params: {
     authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];
 }): {

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validateInvoiceReferencesOrder.d.ts

@@ -4,5 +4,5 @@ declare function validateInvoiceReferencesOrder(authorizePaymentActions: IAuthor
 /**
  * 受け入れられた興行オファー
  */
-eventReservationAcceptedOffers: factory.order.IAcceptedOffer[]): void;
+eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered'>[]): void;
 export { validateInvoiceReferencesOrder };

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validateMovieTicket.d.ts

@@ -18,4 +18,4 @@ authorizedMovieTickets: IMovieTicket4validate[],
 /**
  * 受け入れられた興行オファー
  */
-eventReservationAcceptedOffers: factory.order.IAcceptedOffer[]): void;
+eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[]): void;

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -5,7 +5,7 @@ export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction,
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証
@@ -14,7 +14,7 @@ export declare function validateAcceptedOffers(params: {
     result: {
         order: PlaceOrderFactory.IResultOrderParams;
     };
-    acceptedOffers: factory.order.IAcceptedOffer[];
+    acceptedOffers: (Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber'>)[];
 }): void;
 export declare function validateOrderedItem(params: {
     order: Pick<factory.order.IOrder, 'orderedItem'>;

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

@@ -288,7 +288,7 @@ function createResult(params, options) {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
             case factory_1.factory.reservationType.EventReservation:
-                eventReservationAcceptedOffers.push(acceptedOffer);
+                eventReservationAcceptedOffers.push((acceptedOffer));
                 break;
             // case factory.permit.PermitType.Permit:
             //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));

package/package.json

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