@chevre/domain 24.0.0-alpha.43 → 24.0.0-alpha.45

package/lib/chevre/repo/place/seat.d.ts

@@ -128,23 +128,29 @@ export declare class SeatRepo {
         /**
          * 座席コード
          */
-        branchCode?: {
-            $in?: string[];
+        branchCode: {
+            $in: string[];
         };
-        containedInPlace?: {
+        containedInPlace: {
             /**
              * セクションコード
              */
-            branchCode?: {
-                $in?: string[];
+            branchCode: {
+                $in: string[];
             };
-            containedInPlace?: {
-                branchCode?: {
-                    $eq?: string;
+            containedInPlace: {
+                /**
+                 * ルームコード
+                 */
+                branchCode: {
+                    $eq: string;
                 };
-                containedInPlace?: {
-                    branchCode?: {
-                        $eq?: string;
+                containedInPlace: {
+                    /**
+                     * 施設コード
+                     */
+                    branchCode: {
+                        $eq: string;
                     };
                 };
             };

package/lib/chevre/repo/place/seat.js

@@ -542,6 +542,12 @@ class SeatRepo {
     // ルーム指定の座席検索として再定義(2025-04-28~)
     async projectSeatsByScreeningRoom(params) {
         const { limit, page, project, containedInPlace, screeningRoom, $projection, ...searchSeatsConditions } = params;
+        if (typeof screeningRoom.branchCode.$eq !== 'string' || screeningRoom.branchCode.$eq === '') {
+            throw new factory.errors.ArgumentNull('screeningRoom.branchCode.$eq');
+        }
+        if (typeof screeningRoom.containedInPlace.branchCode.$eq !== 'string' || screeningRoom.containedInPlace.branchCode.$eq === '') {
+            throw new factory.errors.ArgumentNull('screeningRoom.containedInPlace.branchCode.$eq');
+        }
         // まずルーム検索
         const screeningRoomDoc = await this.placeModel.findOne({
             typeOf: { $eq: factory.placeType.ScreeningRoom },
@@ -706,10 +712,16 @@ class SeatRepo {
             matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
         }
         const branchCodeEq = params.containedInPlace?.containedInPlace?.branchCode?.$eq;
+        if (typeof branchCodeEq !== 'string' || branchCodeEq === '') {
+            throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode.$eq');
+        }
         if (typeof branchCodeEq === 'string') {
             matchStages.push({ $match: { branchCode: { $eq: branchCodeEq } } });
         }
         const containedInPlaceBranchCodeEq = params.containedInPlace?.containedInPlace?.containedInPlace?.branchCode?.$eq;
+        if (typeof containedInPlaceBranchCodeEq !== 'string' || containedInPlaceBranchCodeEq === '') {
+            throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.containedInPlace.branchCode.$eq');
+        }
         if (typeof containedInPlaceBranchCodeEq === 'string') {
             matchStages.push({
                 $match: { 'containedInPlace.branchCode': { $exists: true, $eq: containedInPlaceBranchCodeEq } }

package/lib/chevre/repo/place/section.js

@@ -520,6 +520,12 @@ class SectionRepo {
     // >
     ) {
         const { limit, page, projectId, sellerId, movieTheaterCode, roomCode } = params;
+        if (typeof movieTheaterCode !== 'string' || movieTheaterCode === '') {
+            throw new factory.errors.ArgumentNull('movieTheaterCode');
+        }
+        if (typeof roomCode !== 'string' || roomCode === '') {
+            throw new factory.errors.ArgumentNull('roomCode');
+        }
         const matchStageBeforeUnwind = {
             $match: {
                 'project.id': { $eq: projectId },

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

@@ -13,7 +13,7 @@ export type ICreatingReservation<T extends factory.reservationType> = T extends
 type IKeyOfProjection = keyof factory.reservation.IReservation<factory.reservationType.EventReservation> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
 export type IAttendedReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'id' | 'typeOf' | 'project' | 'modifiedTime'> & {
     reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
-    reservedTicket: Pick<factory.reservation.ITicket, 'dateUsed'>;
+    reservedTicket: Pick<factory.reservation.eventReservation.IReservedTicket, 'dateUsed'>;
 };
 /**
  * 予約リポジトリ

package/lib/chevre/repo/reservation.js

@@ -884,7 +884,7 @@ class ReservationRepo {
                 switch (subReservation.typeOf) {
                     case factory.reservationType.EventReservation:
                         setOnInsert = {
-                            ...subReservation,
+                            ...subReservation, // priceは廃止予定だが、互換性維持対応としてひとまず型を強制的に合わせる
                             _id: subReservation.id,
                             bookingTime: params.bookingTime,
                             checkedIn: false,

package/lib/chevre/service/assetTransaction/reserve/start/factory/createReservation.d.ts

@@ -2,10 +2,7 @@ import * as factory from '../../../../../factory';
 import { IMinimizedIndividualEvent } from '../../../../../factory/event';
 import { IAcceptedAddOn } from './price';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
-/**
- * 確定時予約のITicket
- */
-type IReservedTicket = Pick<factory.reservation.ITicket, 'identifier' | 'issuedBy' | 'ticketType' | 'ticketedSeat' | 'typeOf'>;
+type IReservedTicket = Pick<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'identifier' | 'issuedBy' | 'ticketType' | 'ticketedSeat' | 'typeOf'>;
 declare function createReservedTicket(params: {
     id: string;
     acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
@@ -43,7 +40,7 @@ declare function createReservation(params: {
     };
     id: string;
     reservationFor: IMinimizedIndividualEvent;
-    reservedTicket: IReservedTicket;
+    reservedTicket: factory.assetTransaction.reserve.ISubReservationReservedTicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;
     ticketOffer: factory.product.ITicketOffer;

package/lib/chevre/service/assetTransaction/reserve/start/factory/price.d.ts

@@ -14,4 +14,4 @@ export declare function createPrice(params: {
     seatPriceComponent: factory.place.seat.IPriceComponent[];
     acceptedAddOns: IAcceptedAddOn[];
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
-}): factory.reservation.IPriceSpecification<factory.reservationType.EventReservation>;
+}): factory.reservation.eventReservation.IPrice;

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

@@ -36,7 +36,7 @@ declare function processUnlockOfferRateLimit(params: {
     };
     reservation: {
         reservationNumber: string;
-        reservedTicket: factory.reservation.ITicket;
+        reservedTicket: factory.reservation.eventReservation.IReservedTicket;
     };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
 }): (repos: {

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

@@ -421,8 +421,8 @@ function processUnlockSeat(params) {
 function processUnlockOfferRateLimit(params) {
     return async (repos) => {
         const reservation = params.reservation;
-        const scope = reservation.reservedTicket.ticketType.validRateLimit?.scope;
-        const unitInSeconds = reservation.reservedTicket.ticketType.validRateLimit?.unitInSeconds;
+        const scope = reservation.reservedTicket.ticketType?.validRateLimit?.scope;
+        const unitInSeconds = reservation.reservedTicket.ticketType?.validRateLimit?.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
                 project: { id: params.project.id },

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

@@ -1,11 +1,12 @@
 import * as factory from '../../factory';
+import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
 type AvailableReservationType = factory.reservationType.EventReservation;
 type IReservationResult = Pick<factory.reservation.IReservation<AvailableReservationType>, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier'> & {
+        ticketType: Pick<factory.reservation.eventReservation.ITicketType, 'identifier'> & {
             name: {
                 ja?: string;
             };
@@ -28,6 +29,7 @@ declare function findByCode(params: {
         id?: string;
     };
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     authorization: AuthorizationRepo;
     order: OrderRepo;
     reservation: ReservationRepo;

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

@@ -38,6 +38,7 @@ function findByCode(params) {
             project: { id: params.project.id },
             code: params.code
         });
+        let ticketType;
         switch (authorization.object.typeOf) {
             case factory.order.OrderType.Order: {
                 const { orderNumber } = authorization.object;
@@ -49,6 +50,32 @@ function findByCode(params) {
                         reservationId,
                         seller: params.seller
                     });
+                    const acceptedOffer = (await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                        limit: 1,
+                        page: 1,
+                        // $slice?: [number, number];
+                        orderNumber: { $eq: orderNumber },
+                        project: { id: { $eq: params.project.id } },
+                        acceptedOffers: {
+                            itemOffered: {
+                                id: { $eq: reservationId }
+                                // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
+                            }
+                        }
+                    }, ['itemOffered'])).shift();
+                    if (acceptedOffer === undefined) {
+                        throw new factory.errors.NotFound('acceptedOffer');
+                    }
+                    if (acceptedOffer.itemOffered.typeOf !== factory.reservationType.EventReservation) {
+                        throw new factory.errors.Argument('id', `itemOffered.typeOf must be ${factory.reservationType.EventReservation}`);
+                    }
+                    ticketType = {
+                        identifier: acceptedOffer.itemOffered.reservedTicket.ticketType.identifier,
+                        name: { ja: acceptedOffer.itemOffered.reservedTicket.ticketType.name?.ja }
+                    };
+                }
+                else {
+                    throw new factory.errors.NotFound('orderNumber');
                 }
                 break;
             }
@@ -57,16 +84,21 @@ function findByCode(params) {
         }
         const reservationFromRepo = await repos.reservation.projectFieldsById({
             id: reservationId,
-            inclusion: ['additionalTicketText', 'checkedIn', 'reservationStatus', 'reservedTicket']
+            inclusion: [
+                'additionalTicketText', 'checkedIn', 'reservationStatus',
+                // 'reservedTicket'
+            ]
         });
-        const { id, additionalTicketText, checkedIn, reservationStatus, reservedTicket } = reservationFromRepo;
+        const { id, additionalTicketText, checkedIn, reservationStatus } = reservationFromRepo;
         const reservation = {
             id, reservationStatus,
             reservedTicket: {
-                ticketType: {
-                    identifier: reservedTicket.ticketType.identifier,
-                    name: { ja: reservedTicket.ticketType.name?.ja }
-                }
+                // ticketTypeは注文を参照する(2026-03-25~)
+                // ticketType: {
+                //     identifier: reservedTicket.ticketType.identifier,
+                //     name: { ja: reservedTicket.ticketType.name?.ja }
+                // },
+                ticketType
             },
             ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
             ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined

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

@@ -73,11 +73,12 @@ function useReservation(params) {
             reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
             reservedTicket: {
                 typeOf: reservedTicket.typeOf,
-                ticketType: {
-                    identifier: reservedTicket.ticketType.identifier,
-                    typeOf: reservedTicket.ticketType.typeOf,
-                    ...(typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined
-                },
+                // discontinue ticketType(2026-03-25~)
+                // ticketType: {
+                //     identifier: reservedTicket.ticketType.identifier,
+                //     typeOf: reservedTicket.ticketType.typeOf,
+                //     ...(typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined
+                // },
                 ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
                 ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
             }

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "6.0.0-alpha.5",
-    "@cinerino/sdk": "13.2.0",
+    "@chevre/factory": "6.0.0-alpha.8",
+    "@cinerino/sdk": "13.3.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.43"
+  "version": "24.0.0-alpha.45"
 }