@chevre/domain 20.2.0-alpha.8 → 20.2.0-alpha.9

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -230,23 +230,25 @@ function aggregateReservationByOffer(params) {
         let reservationCount4offer;
         let attendeeCount4offer;
         let checkInCount4offer;
-        // tslint:disable-next-line:no-suspicious-comment
-        // TODO EventReservationを旅客対応
+        let reservationType = factory.reservationType.EventReservation;
+        if (params.event.typeOf === factory.eventType.Event) {
+            reservationType = factory.reservationType.BusReservation;
+        }
         reservationCount4offer = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
+            typeOf: reservationType,
             reservationFor: { ids: [params.event.id] },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } }
         });
         attendeeCount4offer = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
+            typeOf: reservationType,
             reservationFor: { ids: [params.event.id] },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } },
             attended: true
         });
         checkInCount4offer = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
+            typeOf: reservationType,
             reservationFor: { ids: [params.event.id] },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             reservedTicket: { ticketType: { ids: [params.offer.id] } },
@@ -399,8 +401,12 @@ function aggregateReservationByEvent(params) {
         let attendeeCount;
         let checkInCount;
         let reservationCount;
+        let reservationType = factory.reservationType.EventReservation;
+        if (params.event.typeOf === factory.eventType.Event) {
+            reservationType = factory.reservationType.BusReservation;
+        }
         reservationCount = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
+            typeOf: reservationType,
             reservationFor: { ids: [params.event.id] },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
         });
@@ -430,13 +436,13 @@ function aggregateReservationByEvent(params) {
             }
         }
         attendeeCount = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
+            typeOf: reservationType,
             reservationFor: { ids: [params.event.id] },
             // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             attended: true
         });
         checkInCount = yield repos.reservation.count({
-            typeOf: factory.reservationType.EventReservation,
+            typeOf: reservationType,
             reservationFor: { ids: [params.event.id] },
             // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             checkedIn: true

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -162,7 +162,8 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
                 }
             });
         }
-        return o.itemOffered.typeOf === factory.reservationType.EventReservation
+        return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+            || o.itemOffered.typeOf === factory.reservationType.BusReservation)
             && mvtkUnitPriceSpec !== undefined
             && o.itemOffered.reservationFor.id === movieTicket.serviceOutput.reservationFor.id
             && ((_d = o.itemOffered.reservedTicket.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber) === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -184,7 +184,8 @@ function createConfirmReservationActionObject4ChevreByOrder(params) {
     const chevreReservationNumbers = (Array.isArray(params.order.acceptedOffers))
         ? params.order.acceptedOffers.filter((o) => {
             var _a;
-            return o.itemOffered.typeOf === factory.reservationType.EventReservation
+            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
                 && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.Chevre;
         })
             .map((o) => {

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -271,7 +271,8 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
         // 注文アイテムから返却アクションを作成する
         const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
         for (const acceptedOffer of acceptedOffers) {
-            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation) {
+            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation
+                || acceptedOffer.itemOffered.typeOf === factory.reservationType.BusReservation) {
                 const reservation = acceptedOffer.itemOffered;
                 const reservationNumber = reservation.reservationNumber;
                 // 予約番号ごとに返却アクションを作成する

package/lib/chevre/service/order/placeOrder.js

@@ -41,6 +41,22 @@ function createOrder(params) {
                         : undefined) });
                 return Object.assign(Object.assign({}, o), { itemOffered });
             }
+            else if (o.itemOffered.typeOf === factory.reservationType.BusReservation) {
+                let itemOffered = o.itemOffered;
+                const reservationFor = itemOffered.reservationFor;
+                itemOffered = Object.assign(Object.assign({}, itemOffered), { reservationFor: Object.assign(Object.assign(Object.assign({}, reservationFor), (reservationFor.arrivalTime !== undefined)
+                        ? {
+                            arrivalTime: moment(reservationFor.arrivalTime)
+                                .toDate()
+                        }
+                        : undefined), (reservationFor.departureTime !== undefined)
+                        ? {
+                            departureTime: moment(reservationFor.departureTime)
+                                .toDate()
+                        }
+                        : undefined) });
+                return Object.assign(Object.assign({}, o), { itemOffered });
+            }
             else {
                 return o;
             }

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

@@ -37,7 +37,8 @@ function verifyToken4reservation(params) {
                 }
                 const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
                 const reservationExistsInOrder = acceptedOffers.some((offer) => {
-                    return offer.itemOffered.typeOf === factory.reservationType.EventReservation
+                    return (offer.itemOffered.typeOf === factory.reservationType.EventReservation
+                        || offer.itemOffered.typeOf === factory.reservationType.BusReservation)
                         && offer.itemOffered.id === params.reservationId;
                 });
                 if (!reservationExistsInOrder) {

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.8"
+  "version": "20.2.0-alpha.9"
 }