@chevre/domain 24.0.0-alpha.42 → 24.0.0-alpha.44

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/service/assetTransaction/reserve/start/factory/createStartParams.js

@@ -127,9 +127,14 @@ function createIssuedThrough(params) {
         }
         : undefined;
     const availableChannel = eventOffers.itemOffered.availableChannel;
-    if (availableChannel === undefined) {
+    // itemOffered.availableChannel: optional(20226-03-24~)
+    // if (availableChannel === undefined) {
+    //     // availableChannelは必ず存在するはず
+    //     throw new factory.errors.NotFound('reservationFor.offers.availableChannel');
+    // }
+    if (typeof eventOffers.itemOffered.id !== 'string') {
         // availableChannelは必ず存在するはず
-        throw new factory.errors.NotFound('reservationFor.offers.availableChannel');
+        throw new factory.errors.NotFound('reservationFor.offers.itemOffered.id');
     }
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
         const issuedThrough = {

package/lib/chevre/service/assetTransaction/reserve/start.js

@@ -244,8 +244,10 @@ function searchEventSeatOffers(params) {
         const eventOffers = params.event.offers;
         const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            // const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            // const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = params.event.location.branchCode;
+            const movieTheaterBranchCode = params.event.superEvent.location.branchCode;
             // reimplement using projectSeatsByScreeningRoom
             const seats = await repos.seat.projectSeatsByScreeningRoom({
                 project: { id: { $eq: params.event.project.id } },

package/lib/chevre/service/offer.js

@@ -45,13 +45,15 @@ function searchEventSeatOffersWithPaging(params) {
         const { includeSectionCodeOnlyFirstElement, useDefaultSection } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
-        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer']);
+        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer', 'location', 'superEvent']);
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
         const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            // const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            // const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = event.location.branchCode;
+            const movieTheaterBranchCode = event.superEvent.location.branchCode;
             let defaultSectionCode;
             if (useDefaultSection) {
                 const defaultSection = (await repos.section.findSectionsByRoom({
@@ -159,7 +161,7 @@ function findEventSeatOffersBySection(params) {
             organizer: { id: { $eq: sellerId } },
             id: { $eq: eventId },
             typeOf: factory.eventType.ScreeningEvent
-        }, ['startDate', 'offers.itemOffered'])).shift();
+        }, ['startDate', 'offers.itemOffered', 'location', 'superEvent'])).shift();
         if (event === undefined) {
             throw new factory.errors.NotFound(factory.eventType.ScreeningEvent);
         }
@@ -167,8 +169,10 @@ function findEventSeatOffersBySection(params) {
         const eventOffers = event.offers;
         const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            // const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            // const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = event.location.branchCode;
+            const movieTheaterBranchCode = event.superEvent.location.branchCode;
             const seats = await repos.seat.projectSeatsByScreeningRoom({
                 limit,
                 page,

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": "6.0.0-alpha.4",
+    "@chevre/factory": "6.0.0-alpha.5",
     "@cinerino/sdk": "13.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.42"
+  "version": "24.0.0-alpha.44"
 }