@chevre/domain 20.1.0-alpha.34 → 20.1.0-alpha.36

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

@@ -131,10 +131,10 @@ function createReservedTicket(params) {
     }
     const ticketType = createTicketType({ availableOffer: params.availableOffer });
     const issuedBy = createIssuedBy({ acceptedOffer: params.acceptedOffer, availableOffer: params.availableOffer });
-    return Object.assign({ dateIssued: params.dateIssued, issuedBy, priceCurrency: factory.priceCurrency.JPY, ticketType, typeOf: 'Ticket', underName: {
-            typeOf: params.transaction.agent.typeOf,
-            name: params.transaction.agent.name
-        } }, (ticketedSeat !== undefined)
+    return Object.assign({ dateIssued: params.dateIssued, issuedBy,
+        // 不要なので廃止(2022-12-19~)
+        // priceCurrency: factory.priceCurrency.JPY,
+        ticketType, typeOf: 'Ticket' }, (ticketedSeat !== undefined)
         ? { ticketedSeat: ticketedSeat }
         : {});
 }
@@ -344,7 +344,13 @@ function createAdditionalTicketText(params) {
 }
 exports.createAdditionalTicketText = createAdditionalTicketText;
 function createReservationFor(params) {
-    return Object.assign({ endDate: params.endDate, eventStatus: params.eventStatus, id: params.id, location: params.location, name: params.name, project: params.project, startDate: params.startDate, 
+    return Object.assign({ endDate: params.endDate, 
+        // 不要なので廃止(2022-12-19~)
+        // eventStatus: params.eventStatus,
+        id: params.id, location: params.location, name: params.name, 
+        // 不要なので廃止(2022-12-19~)
+        // project: params.project,
+        startDate: params.startDate, 
         // 最適化(2022-05-31~)
         superEvent: optimizeReservationSuperEvent(params), typeOf: params.typeOf }, (params.doorTime instanceof Date)
         ? { doorTime: params.doorTime }
@@ -355,7 +361,10 @@ function optimizeReservationSuperEvent(params) {
     const superEvent = params.superEvent;
     return Object.assign(Object.assign({ additionalProperty: (Array.isArray(superEvent.additionalProperty))
             ? superEvent.additionalProperty
-            : [], id: superEvent.id, kanaName: superEvent.kanaName, location: superEvent.location, name: superEvent.name, project: superEvent.project, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.description !== undefined)
+            : [], id: superEvent.id, kanaName: superEvent.kanaName, location: superEvent.location, name: superEvent.name, 
+        // 不要なので廃止(2022-12-19~)
+        // project: superEvent.project,
+        soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.description !== undefined)
         ? { description: superEvent.description }
         : undefined), (superEvent.headline !== undefined)
         ? { headline: superEvent.headline }
@@ -394,9 +403,24 @@ function createReservation(params) {
         }
         : undefined;
     const issuedThrough = Object.assign(Object.assign({ typeOf: factory.product.ProductType.EventService }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined), (typeof eventOffers.itemOffered.id === 'string') ? { id: eventOffers.itemOffered.id } : undefined);
-    return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, issuedThrough, additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, 
-        // reservationFor,
-        reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, underName: params.agent, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation)) ? { subReservation: params.subReservation } : undefined), (typeof ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_c = params.programMembershipUsed) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
+    return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, issuedThrough, additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, 
+        // 最適化(2022-12-19~)
+        // underName: params.agent,
+        underName: {
+            typeOf: params.agent.typeOf,
+            name: params.agent.name
+        }, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
+        ? {
+            subReservation: params.subReservation.map((r) => {
+                return {
+                    reservedTicket: {
+                        ticketedSeat: r.reservedTicket.ticketedSeat,
+                        typeOf: 'Ticket'
+                    }
+                };
+            })
+        }
+        : undefined), (typeof ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_c = params.programMembershipUsed) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
         ? { programMembershipUsed: params.programMembershipUsed }
         : undefined);
 }
@@ -432,7 +456,8 @@ function createPotentialActions(params) {
         if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
             const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
             eventReservation.underName = ordre2reservationUnderNameResult.underName;
-            eventReservation.reservedTicket.underName = ordre2reservationUnderNameResult.underName;
+            // 不要なので廃止(2022-12-19~)
+            // eventReservation.reservedTicket.underName = ordre2reservationUnderNameResult.underName;
             eventReservation.reservedTicket.issuedBy = ordre2reservationUnderNameResult.issuedBy;
         }
         const acceptedOffer4reservation = (_b = transaction.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.find((o) => { var _a, _b; return ((_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id) === reservation.id; });

package/lib/chevre/service/event.js

@@ -419,7 +419,8 @@ function createScreeningEventFromCOA(params) {
             .toDate();
     }
     const offers = {
-        project: { typeOf: params.project.typeOf, id: params.project.id },
+        // 不要なので廃止(2022-12-19~)
+        // project: { typeOf: params.project.typeOf, id: params.project.id },
         typeOf: factory.offerType.Offer,
         offeredThrough: {
             typeOf: 'WebAPI',
@@ -437,7 +438,8 @@ function createScreeningEventFromCOA(params) {
         eventStatus: factory.eventStatusType.EventScheduled,
         workPerformed: params.superEvent.workPerformed,
         location: {
-            project: { typeOf: params.project.typeOf, id: params.project.id },
+            // 不要なので廃止(2022-12-19~)
+            // project: { typeOf: params.project.typeOf, id: params.project.id },
             typeOf: params.screenRoom.typeOf,
             branchCode: params.screenRoom.branchCode,
             name: params.screenRoom.name
@@ -529,7 +531,8 @@ function createScreeningEventSeriesFromCOA(params) {
         kanaName: params.filmFromCOA.titleNameKana,
         alternativeHeadline: params.filmFromCOA.titleNameShort,
         location: {
-            project: { typeOf: params.project.typeOf, id: params.project.id },
+            // 不要なので廃止(2022-12-19~)
+            // project: { typeOf: params.project.typeOf, id: params.project.id },
             id: (params.movieTheater.id !== undefined) ? params.movieTheater.id : '',
             branchCode: params.movieTheater.branchCode,
             name: params.movieTheater.name,
@@ -544,7 +547,8 @@ function createScreeningEventSeriesFromCOA(params) {
         videoFormat: params.eizouKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEizou)[0],
         soundFormat: [],
         workPerformed: {
-            project: { typeOf: params.project.typeOf, id: params.project.id },
+            // 不要なので廃止(2022-12-19~)
+            // project: { typeOf: params.project.typeOf, id: params.project.id },
             id: `${params.movieTheater.branchCode}-${params.filmFromCOA.titleCode}`,
             identifier: params.filmFromCOA.titleCode,
             // 多言語化(2022-07-26~)

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

@@ -213,15 +213,20 @@ function createReservation(params) {
     var _a;
     const itemOffered = params.itemOffered;
     const event = params.event;
-    const workPerformed = Object.assign({ project: event.superEvent.workPerformed.project, typeOf: event.superEvent.workPerformed.typeOf, id: event.superEvent.workPerformed.id, identifier: event.superEvent.workPerformed.identifier, name: event.superEvent.workPerformed.name }, (typeof event.superEvent.workPerformed.duration === 'string')
+    const workPerformed = Object.assign({ 
+        // 不要なので廃止(2022-12-19~)
+        // project: event.superEvent.workPerformed.project,
+        typeOf: event.superEvent.workPerformed.typeOf, id: event.superEvent.workPerformed.id, identifier: event.superEvent.workPerformed.identifier, name: event.superEvent.workPerformed.name }, (typeof event.superEvent.workPerformed.duration === 'string')
         ? { duration: event.superEvent.workPerformed.duration }
         : undefined);
     const reservationFor = {
-        project: event.project,
+        // 不要なので廃止(2022-12-19~)
+        // project: event.project,
         typeOf: event.typeOf,
         // 予約のreservationForは最適化されているので、additionalPropertyは存在しない
         // additionalProperty: itemOffered.reservationFor.additionalProperty,
-        eventStatus: event.eventStatus,
+        // 不要なので廃止(2022-12-19~)
+        // eventStatus: event.eventStatus,
         id: event.id,
         location: event.location,
         name: event.name,
@@ -232,7 +237,10 @@ function createReservation(params) {
         startDate: moment(event.startDate)
             .toDate(),
         // 最適化(2022-05-31~)
-        superEvent: Object.assign(Object.assign({ project: event.superEvent.project, 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: Object.assign(Object.assign({ 
+            // 不要なので廃止(2022-12-19~)
+            // project: event.superEvent.project,
+            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: {},
     };

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

@@ -100,7 +100,8 @@ function responseBody2acceptedOffers4result(params) {
         const reservationNumber = String(updTmpReserveSeatResult.tmpReserveNum);
         const reservationId = `${reservationNumber}-${index.toString()}`;
         const workPerformed = {
-            project: event.superEvent.workPerformed.project,
+            // 不要なので廃止(2022-12-19~)
+            // project: event.superEvent.workPerformed.project,
             id: event.superEvent.workPerformed.id,
             identifier: event.superEvent.workPerformed.identifier,
             name: event.superEvent.workPerformed.name,
@@ -113,16 +114,24 @@ function responseBody2acceptedOffers4result(params) {
                     .toDate()
             }
             : undefined), { endDate: moment(event.endDate)
-                .toDate(), eventStatus: event.eventStatus, identifier: event.identifier, location: {
-                project: event.location.project,
+                .toDate(), 
+            // 不要なので廃止(2022-12-19~)
+            // eventStatus: event.eventStatus,
+            identifier: event.identifier, location: {
+                // 不要なので廃止(2022-12-19~)
+                // project: event.location.project,
                 typeOf: event.location.typeOf,
                 branchCode: event.location.branchCode,
                 name: event.location.name
-            }, name: event.name, project: event.project, startDate: moment(event.startDate)
+            }, name: event.name, 
+            // 不要なので廃止(2022-12-19~)
+            // project: event.project,
+            startDate: moment(event.startDate)
                 .toDate(), 
             // 最適化(2022-05-31~)
             superEvent: {
-                project: event.superEvent.project,
+                // 不要なので廃止(2022-12-19~)
+                // project: event.superEvent.project,
                 typeOf: event.superEvent.typeOf,
                 id: event.superEvent.id,
                 identifier: event.superEvent.identifier,

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -35,25 +35,29 @@ function createReservationAcceptedOffers(params) {
 }
 exports.createReservationAcceptedOffers = createReservationAcceptedOffers;
 function reservationOffers2orderedItem(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const reservationFor = params.reservationFor;
     const issuedThrough = params.issuedThrough;
     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,
-            project: (_c = reservationFor.location) === null || _c === void 0 ? void 0 : _c.project,
-            typeOf: (_d = reservationFor.location) === null || _d === void 0 ? void 0 : _d.typeOf
+            // 不要なので廃止(2022-12-19~)
+            // project: reservationFor.location?.project,
+            typeOf: (_c = reservationFor.location) === null || _c === void 0 ? void 0 : _c.typeOf
         },
-        project: reservationFor.project,
+        // 不要なので廃止(2022-12-19~)
+        // project: reservationFor.project,
         typeOf: reservationFor.typeOf,
         id: reservationFor.id,
         name: reservationFor.name,
         startDate: reservationFor.startDate,
         endDate: reservationFor.endDate
-        // eventStatus: reservationFor.eventStatus
     };
-    return Object.assign(Object.assign({ project: reservationFor.project, typeOf: issuedThrough.typeOf }, (typeof ((_e = issuedThrough.serviceType) === null || _e === void 0 ? void 0 : _e.typeOf) === 'string')
+    return Object.assign(Object.assign({ 
+        // 不要なので廃止(2022-12-19~)
+        // project: reservationFor.project,
+        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,

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.280.0-alpha.6",
-    "@cinerino/sdk": "3.135.0-alpha.2",
+    "@chevre/factory": "4.280.0-alpha.8",
+    "@cinerino/sdk": "3.135.0-alpha.4",
     "@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.1.0-alpha.34"
+  "version": "20.1.0-alpha.36"
 }