@chevre/domain 24.1.0-alpha.25 → 24.1.0-alpha.26

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

@@ -4,7 +4,12 @@ type IProjection4searchWithUnwoundAcceptedOffers = {
     [key in keyof factory.order.IOrder]?: 1;
 } & {};
 type IDistinctField = 'acceptedOffers.id' | 'acceptedOffers.itemOffered.reservationNumber' | 'acceptedOffers.itemOffered.reservationFor.id' | 'acceptedOffers.serialNumber' | 'acceptedOffers.offeredThrough.identifier' | 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode';
-type IAcceptedOffer = factory.order.IAcceptedOffer;
+type IAcceptedOffer = Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+    /**
+     * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+     */
+    priceSpecification?: factory.order.ITicketPriceSpecification;
+};
 interface ISearchSlicedAcceptedOffersResult {
     acceptedOffers: IAcceptedOffer[];
     numAcceptedOffers: number;
@@ -31,7 +36,7 @@ export declare class AcceptedOfferRepo {
         useMatchBeforeUnwind: boolean;
         useReserveTransaction: boolean;
     }): Promise<(factory.order.IOrder & {
-        acceptedOffers: [factory.order.IAcceptedOffer];
+        acceptedOffers: [IAcceptedOffer];
         _id?: never;
     })[]>;
     aggreateOwnershipInfosByOrder(filter: {

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

@@ -42,7 +42,9 @@ export declare class OrderInTransactionRepo {
         project: {
             id: string;
         };
-    }): Promise<factory.order.IAcceptedOffer[]>;
+    }): Promise<(Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+        priceSpecification?: factory.order.ITicketPriceSpecification;
+    })[]>;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      */
@@ -61,7 +63,12 @@ export declare class OrderInTransactionRepo {
      * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
      */
     acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
-        acceptedOffers: IAcceptedOffer[];
+        acceptedOffers: (Omit<IAcceptedOffer, 'priceSpecification'> & {
+            /**
+             * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+             */
+            priceSpecification?: factory.order.ITicketPriceSpecification;
+        })[];
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する

package/lib/chevre/repo/orderInTransaction.js

@@ -71,21 +71,15 @@ class OrderInTransactionRepo {
         }
         return doc.acceptedOffers.map((acceptedOffer) => {
             const priceBySubReservation = subReservations.find((subReservation) => subReservation.id === acceptedOffer.itemOffered.id)?.price;
-            // 予約の価格は必ず存在するはず
+            // COA予約でなければ、予約取引の価格は必ず存在するはず
             if (priceBySubReservation === undefined) {
-                console.error('findAcceptedOffersWithPriceByOrderNumber: priceBySubReservation: undefined!!!', acceptedOffer.itemOffered.id);
+                throw new factory_1.factory.errors.Internal(`findAcceptedOffersWithPriceByOrderNumber: priceBySubReservation undefined. ${acceptedOffer.itemOffered.id}`);
             }
-            // const priceSpecMatched = isDeepStrictEqual(acceptedOffer.priceSpecification, priceBySubReservation);
-            // debug('findAcceptedOffersWithPriceByOrderNumber: priceSpecMatched?', priceSpecMatched, acceptedOffer.itemOffered.id, params.orderNumber, params.project.id);
-            // if (!priceSpecMatched) {
-            //     console.error('findAcceptedOffersWithPriceByOrderNumber: priceSpecMatched: false!!!', acceptedOffer.itemOffered.id, params.orderNumber, params.project.id);
-            // }
-            // const overwritePriceSpec = priceSpecMatched || acceptedOffer.priceSpecification === undefined;
             return {
                 ...acceptedOffer,
+                priceSpecification: priceBySubReservation
                 // // 予約取引内の価格仕様と一致した場合のみ上書きしてみる
                 // ...((overwritePriceSpec && priceBySubReservation !== undefined) && { priceSpecification: priceBySubReservation })
-                ...((priceBySubReservation !== undefined) && { priceSpecification: priceBySubReservation })
             };
         });
     }

package/lib/chevre/service/delivery/factory.d.ts

@@ -5,7 +5,12 @@ export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.owners
  */
 export declare function createOwnershipInfosFromOrder(params: {
     order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
-        acceptedOffers: factory.order.IAcceptedOffer[];
+        acceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+            /**
+             * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+             */
+            priceSpecification?: factory.order.ITicketPriceSpecification;
+        })[];
     };
     offerIndexBase: number;
 }): IOwnershipInfo[];

package/lib/chevre/service/delivery/factory.js

@@ -43,7 +43,7 @@ function createOwnershipInfosFromOrder(params) {
                         ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
                             project: params.order.project,
                             ownedBy: ownedBy,
-                            acceptedOffer: { ...acceptedOffer, itemOffered },
+                            acceptedOffer,
                             ownedFrom: ownedFrom,
                             identifier: identifier,
                             acquiredFrom: acquiredFrom

package/lib/chevre/service/delivery/reservation/factory.d.ts

@@ -6,9 +6,7 @@ export declare function createReservationOwnershipInfo(params: {
         id: string;
     };
     ownedBy: factory.ownershipInfo.IOwner[];
-    acceptedOffer: factory.order.IAcceptedOffer & {
-        itemOffered: factory.order.IReservation;
-    };
+    acceptedOffer: Pick<factory.order.IAcceptedOffer, 'itemOffered'>;
     ownedFrom: Date;
     identifier: string;
     acquiredFrom: factory.ownershipInfo.IAcquiredFrom;

package/lib/chevre/service/delivery/reservation/factory.js

@@ -19,31 +19,14 @@ function createReservationOwnershipInfo(params) {
     else {
         throw new factory_1.factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`); // eslint-disable-line @typescript-eslint/no-explicit-any
     }
-    // let bookingService = params.acceptedOffer.offeredThrough;
-    // if (bookingService === undefined) {
-    //     // デフォルトブッキングサービスはChevre
-    //     bookingService = {
-    //         typeOf: 'WebAPI',
-    //         identifier: factory.service.webAPI.Identifier.Chevre
-    //     };
-    // }
     let typeOfGood;
     if (itemOffered.typeOf === factory_1.factory.reservationType.EventReservation) {
         typeOfGood = {
             typeOf: itemOffered.typeOf,
             id: itemOffered.id,
             reservationNumber: itemOffered.reservationNumber,
-            // bookingService: bookingService,
             ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
         };
-        // } else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
-        //     typeOfGood = {
-        //         typeOf: itemOffered.typeOf,
-        //         id: itemOffered.id,
-        //         reservationNumber: itemOffered.reservationNumber,
-        //         bookingService: bookingService,
-        //         ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
-        //     };
     }
     else {
         throw new factory_1.factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`); // eslint-disable-line @typescript-eslint/no-explicit-any

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

@@ -10,8 +10,11 @@ export declare function acceptOffer(params: {
     project: {
         id: string;
     };
-    acceptedOffers: (factory.order.IAcceptedOffer & {
-        offeredThrough: factory.offer.IOfferedThrough;
+    acceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+        /**
+         * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+         */
+        priceSpecification?: factory.order.ITicketPriceSpecification;
     })[];
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {

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

@@ -32,10 +32,11 @@ declare function acceptedOffers2authorizeResult(params: {
     ticketOffers: factory.product.ITicketOffer[];
 }): factory.action.authorize.offer.eventService.IResult;
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
-export type IResultAcceptedOffer = factory.order.IAcceptedOffer & {
-    itemOffered: factory.order.IReservation;
+export type IResultAcceptedOffer = Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+    itemOffered: factory.order.IEventReservation;
     offeredThrough: factory.offer.IOfferedThrough;
     serialNumber: string;
+    priceSpecification?: factory.order.ITicketPriceSpecification;
 };
 declare function responseBody2acceptedOffers4result(params: {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;

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

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

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.d.ts

@@ -5,7 +5,12 @@ type IInTransitOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'projec
         limit: number;
         page: number;
     };
-    deliveredAcceptedOffers: factory.order.IAcceptedOffer[];
+    deliveredAcceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+        /**
+         * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+         */
+        priceSpecification?: factory.order.ITicketPriceSpecification;
+    })[];
     orderStatus: factory.orderStatus.OrderInTransit;
 };
 declare function createInformTasks(params: {

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "8.2.0-alpha.0",
+    "@chevre/factory": "8.2.0-alpha.1",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.25"
+  "version": "24.1.0-alpha.26"
 }