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

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.43"
 }