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

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

@@ -230,21 +230,25 @@ function aggregateReservationByOffer(params) {
         let reservationCount4offer;
         let attendeeCount4offer;
         let checkInCount4offer;
+        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] } },
@@ -397,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]
         });
@@ -428,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/delivery/factory.js

@@ -22,6 +22,7 @@ function createOwnershipInfosFromOrder(params) {
         const ownedBy = createOwnedby(params);
         const itemOfferedType = itemOffered.typeOf;
         switch (itemOfferedType) {
+            case factory.reservationType.BusReservation:
             case factory.reservationType.EventReservation:
                 ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
                     project: params.order.project,

package/lib/chevre/service/offer/event/factory.js

@@ -211,7 +211,7 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
  */
 // tslint:disable-next-line:max-func-body-length
 function createReservation(params) {
-    var _a;
+    var _a, _b, _c, _d;
     const itemOffered = params.itemOffered;
     const event = params.event;
     let reservationItem;
@@ -243,16 +243,36 @@ function createReservation(params) {
                 .toDate(),
             // 最適化(2022-05-31~)
             superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, kanaName: event.superEvent.kanaName, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
-            // 廃止(superEvent.workPerformedへ完全移行)
-            // workPerformed: {},
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor: reservationFor, reservedTicket: reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+            reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
     }
     else if (itemOffered.typeOf === factory.reservationType.BusReservation
         && event.typeOf === factory.eventType.Event) {
-        throw new factory.errors.NotImplemented(`${itemOffered.typeOf} not impelemented`);
+        const tripByEvent = (_c = (_b = event.offers) === null || _b === void 0 ? void 0 : _b.itemOffered.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservationFor;
+        if (typeof (tripByEvent === null || tripByEvent === void 0 ? void 0 : tripByEvent.typeOf) !== 'string') {
+            throw new factory.errors.NotFound('event.offers.itemOffered.serviceOutput.reservationFor');
+        }
+        const reservationFor = {
+            typeOf: tripByEvent.typeOf,
+            id: event.id,
+            arrivalBusStop: tripByEvent.arrivalBusStop,
+            departureBusStop: tripByEvent.departureBusStop,
+            name: event.name,
+            departureTime: moment(tripByEvent.departureTime)
+                .toDate(),
+            arrivalTime: moment(tripByEvent.arrivalTime)
+                .toDate(),
+            busName: tripByEvent.busName,
+            busNumber: tripByEvent.busNumber,
+            identifier: tripByEvent.identifier
+        };
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+            reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+            ? { programMembershipUsed: itemOffered.programMembershipUsed }
+            : undefined);
     }
     else {
         throw new factory.errors.Argument('itemOffered');

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/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -35,37 +35,52 @@ function createReservationAcceptedOffers(params) {
 }
 exports.createReservationAcceptedOffers = createReservationAcceptedOffers;
 function reservationOffers2orderedItem(params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const reservationFor = params.reservationFor;
     const issuedThrough = params.issuedThrough;
-    if (reservationFor.typeOf !== factory.eventType.ScreeningEvent) {
-        throw new factory.errors.NotImplemented(`reservationFor.typeOf '${reservationFor.typeOf}' not implemented`);
-    }
-    const reservationFor4orderedItem = {
-        location: {
-            branchCode: (_a = reservationFor.location) === null || _a === void 0 ? void 0 : _a.branchCode,
-            name: (_b = reservationFor.location) === null || _b === void 0 ? void 0 : _b.name,
+    if (reservationFor.typeOf === factory.eventType.ScreeningEvent
+        && issuedThrough.typeOf === factory.product.ProductType.EventService) {
+        const reservationFor4orderedItem = {
+            location: {
+                branchCode: (_a = reservationFor.location) === null || _a === void 0 ? void 0 : _a.branchCode,
+                name: (_b = reservationFor.location) === null || _b === void 0 ? void 0 : _b.name,
+                // 不要なので廃止(2022-12-19~)
+                // project: reservationFor.location?.project,
+                typeOf: (_c = reservationFor.location) === null || _c === void 0 ? void 0 : _c.typeOf
+            },
             // 不要なので廃止(2022-12-19~)
-            // project: reservationFor.location?.project,
-            typeOf: (_c = reservationFor.location) === null || _c === void 0 ? void 0 : _c.typeOf
-        },
-        // 不要なので廃止(2022-12-19~)
-        // project: reservationFor.project,
-        typeOf: reservationFor.typeOf,
-        id: reservationFor.id,
-        name: reservationFor.name,
-        startDate: reservationFor.startDate,
-        endDate: reservationFor.endDate
-    };
-    if (issuedThrough.typeOf !== factory.product.ProductType.EventService) {
-        throw new factory.errors.NotImplemented(`issuedThrough.typeOf '${issuedThrough.typeOf}' not implemented`);
+            // project: reservationFor.project,
+            typeOf: reservationFor.typeOf,
+            id: reservationFor.id,
+            name: reservationFor.name,
+            startDate: reservationFor.startDate,
+            endDate: reservationFor.endDate
+        };
+        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf }, (typeof ((_d = issuedThrough.serviceType) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
+            ? { serviceType: issuedThrough.serviceType }
+            : undefined), { serviceOutput: {
+                typeOf: factory.reservationType.EventReservation,
+                reservationFor: reservationFor4orderedItem
+            } });
+    }
+    else if (reservationFor.typeOf === factory.tripType.BusTrip
+        && issuedThrough.typeOf === factory.product.ProductType.Transportation) {
+        const reservationFor4orderedItem = {
+            typeOf: reservationFor.typeOf,
+            id: reservationFor.id,
+            departureTime: reservationFor.departureTime,
+            arrivalTime: reservationFor.arrivalTime
+        };
+        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf }, (typeof ((_e = issuedThrough.serviceType) === null || _e === void 0 ? void 0 : _e.typeOf) === 'string')
+            ? { serviceType: issuedThrough.serviceType }
+            : undefined), { serviceOutput: {
+                typeOf: factory.reservationType.ReservationPackage,
+                reservationFor: reservationFor4orderedItem
+            } });
+    }
+    else {
+        throw new factory.errors.ServiceUnavailable('unexpected params on reservationOffers2orderedItem');
     }
-    return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf }, (typeof ((_d = issuedThrough.serviceType) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
-        ? { serviceType: issuedThrough.serviceType }
-        : undefined), { serviceOutput: {
-            typeOf: factory.reservationType.EventReservation,
-            reservationFor: reservationFor4orderedItem
-        } });
 }
 function createProductItems(params) {
     const acceptedOffers = [];

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.281.0-alpha.2",
-    "@cinerino/sdk": "3.135.0-alpha.6",
+    "@chevre/factory": "4.281.0-alpha.3",
+    "@cinerino/sdk": "3.135.0-alpha.7",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -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.7"
+  "version": "20.2.0-alpha.9"
 }