@chevre/domain 28.2.0-alpha.1 → 28.2.0-alpha.2

package/lib/chevre/service/reserve/findByCode.d.ts

@@ -1,11 +1,12 @@
 import { factory } from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AuthorizationRepo } from '../../repo/authorization';
+import type { OfferRepo } from '../../repo/offer/unitPriceInCatalog';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
 type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.assetTransaction.reserve.ITicketType, 'identifier'> & {
+        ticketType?: Pick<factory.assetTransaction.reserve.ITicketType, 'identifier'> & {
             name: {
                 ja?: string;
             };
@@ -30,6 +31,7 @@ declare function findByCode(params: {
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     authorization: AuthorizationRepo;
+    offer: OfferRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
 }) => Promise<{

package/lib/chevre/service/reserve/findByCode.js

@@ -46,10 +46,22 @@ function findByCode(params) {
                     if (acceptedOffer.itemOffered.typeOf !== factory_1.factory.reservationType.EventReservation) {
                         throw new factory_1.factory.errors.Argument('id', `itemOffered.typeOf must be ${factory_1.factory.reservationType.EventReservation}`);
                     }
-                    ticketType = {
-                        identifier: acceptedOffer.itemOffered.reservedTicket.ticketType.identifier,
-                        name: { ja: acceptedOffer.itemOffered.reservedTicket.ticketType.name?.ja }
-                    };
+                    // acceptedOffer.itemOffered.reservedTicket.ticketType廃止につき、単価オファー情報を参照(2026-11-11~)
+                    const unitPriceOffer = (await repos.offer.findUnitPriceOffers({
+                        id: { $eq: String(acceptedOffer.id) },
+                        project: { id: { $eq: params.project.id } }
+                    }, { identifier: 1, name: 1 })).shift();
+                    // console.log('findByCode: unitPriceOffer found.', unitPriceOffer);
+                    if (unitPriceOffer !== undefined) {
+                        ticketType = {
+                            identifier: unitPriceOffer.identifier,
+                            name: { ja: unitPriceOffer.name?.ja }
+                        };
+                    }
+                    // ticketType = {
+                    //     identifier: acceptedOffer.itemOffered.reservedTicket.ticketType.identifier,
+                    //     name: { ja: acceptedOffer.itemOffered.reservedTicket.ticketType.name?.ja }
+                    // };
                 }
                 else {
                     throw new factory_1.factory.errors.NotFound('orderNumber');
@@ -61,21 +73,13 @@ function findByCode(params) {
         }
         const reservationFromRepo = await repos.reservation.findReservationById({
             id: reservationId,
-            inclusion: [
-                'additionalTicketText', 'checkedIn', 'reservationStatus',
-                // 'reservedTicket'
-            ]
+            inclusion: ['additionalTicketText', 'checkedIn', 'reservationStatus']
         });
         const { id, additionalTicketText, checkedIn, reservationStatus } = reservationFromRepo;
         const reservation = {
             id, reservationStatus,
             reservedTicket: {
-                // ticketTypeは注文を参照する(2026-03-25~)
-                // ticketType: {
-                //     identifier: reservedTicket.ticketType.identifier,
-                //     name: { ja: reservedTicket.ticketType.name?.ja }
-                // },
-                ticketType
+                ...((ticketType !== undefined) && { ticketType })
             },
             ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
             ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined

package/package.json

@@ -46,7 +46,7 @@
     "csvtojson": "^2.0.10",
     "dependency-cruiser": "17.3.8",
     "eslint": "9.39.2",
-    "mongoose": "8.23.0",
+    "mongoose": "8.24.8",
     "rimraf": "6.1.3",
     "size-limit": "12.0.0",
     "typescript": "5.9.3",
@@ -55,7 +55,7 @@
   },
   "peerDependencies": {
     "@redis/client": "^6.2.1",
-    "mongoose": "^8.23.0"
+    "mongoose": "^8.24.8"
   },
   "engines": {
     "node": ">=22.0.0",
@@ -89,5 +89,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.2.0-alpha.1"
+  "version": "28.2.0-alpha.2"
 }