@chevre/domain 22.8.0-alpha.2 → 22.8.0-alpha.3

package/lib/chevre/service/event.js

@@ -646,7 +646,9 @@ function createScreeningEventSeriesFromCOA(params) {
     });
     const { additionalProperty, coaInfo } = createScreeningEventSeriesAdditionalPropertyFromCOA(params);
     const { unacceptedPaymentMethod } = createScreeningEventSeriesUnacceptedPaymentMethodFromCOA(params);
-    const workPerformed = Object.assign({ id: `${params.movieTheater.branchCode}-${params.filmFromCOA.titleCode}`, identifier: params.filmFromCOA.titleCode, name: {
+    const workPerformed = Object.assign({ 
+        // id: `${params.movieTheater.branchCode}-${params.filmFromCOA.titleCode}`, // discontinue(2025-01-03~)
+        identifier: params.filmFromCOA.titleCode, name: {
             ja: params.filmFromCOA.titleNameOrig
         }, duration: moment.duration(params.filmFromCOA.showTime, 'm')
             .toISOString(), contentRating: params.eirinKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEirin)[0], typeOf: factory.creativeWorkType.Movie }, (typeof params.filmFromCOA.titleBranchNum === 'string' && params.filmFromCOA.titleBranchNum.length > 0)

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

@@ -58,10 +58,18 @@ function coaTicket2offer(params) {
             typeOf: factory.product.ProductType.EventService
         }, priceSpecification: unitPriceSpec }, (Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined), (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), { additionalProperty: [
             { name: 'theaterCode', value: params.theaterCode },
-            ...Object.keys(params.ticketResult)
-                .map((key) => {
-                return { name: String(key), value: String(params.ticketResult[key]) };
-            })
+            { name: 'ticketCode', value: String(params.ticketResult.ticketCode) },
+            { name: 'ticketName', value: String(params.ticketResult.ticketName) },
+            { name: 'ticketNameEng', value: String(params.ticketResult.ticketNameEng) },
+            { name: 'ticketNameKana', value: String(params.ticketResult.ticketNameKana) },
+            { name: 'usePoint', value: String(params.ticketResult.usePoint) },
+            ...(params.ticketResult.flgMember !== undefined)
+                ? [{ name: 'flgMember', value: String(params.ticketResult.flgMember) }]
+                : []
+            // ...Object.keys(params.ticketResult)
+            //     .map((key) => {
+            //         return { name: String(key), value: String((<any>params.ticketResult)[key]) };
+            //     })
         ] });
 }
 exports.coaTicket2offer = coaTicket2offer;

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -8,7 +8,6 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptAction: {
         id: string;
     };
-    acceptedOffers: factory.action.accept.coaOffer.IAcceptedOffer4COA[];
     event: {
         id: string;
         typeOf: factory.eventType.ScreeningEvent;
@@ -23,7 +22,7 @@ export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
     price: number;
     eligibleMonetaryAmount: factory.offer.IEligibleMonetaryAmount[];
 };
-type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IReservation>;
+type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IEventReservation>;
 /**
  * COA仮予約結果から注文アイテムを生成する
  */
@@ -32,7 +31,7 @@ export declare function responseBody2acceptedOffers4result(params: {
         id: string;
     };
     responseBody: IResponseBody;
-    acceptedOffer: factory.action.accept.coaOffer.IAcceptedOffer4COA[];
+    acceptedOffer: IAcceptedOffer4COA[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
     seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;

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

@@ -104,13 +104,10 @@ function responseBody2acceptedOffers4result(params) {
         // reimplement id(2024-12-31~)
         // const reservationId = `${reservationNumber}-${index.toString()}`;
         const reservationId = `${params.project.id}:${ticketToken}`;
-        const workPerformed = {
-            id: event.superEvent.workPerformed.id,
-            identifier: event.superEvent.workPerformed.identifier,
-            name: event.superEvent.workPerformed.name,
-            duration: event.superEvent.workPerformed.duration,
-            typeOf: event.superEvent.workPerformed.typeOf
-        };
+        const workPerformed = Object.assign({ identifier: event.superEvent.workPerformed.identifier, name: event.superEvent.workPerformed.name, duration: event.superEvent.workPerformed.duration, typeOf: event.superEvent.workPerformed.typeOf }, (typeof event.superEvent.workPerformed.id === 'string')
+            ? { id: event.superEvent.workPerformed.id }
+            : undefined // redefine(2025-01-03~)
+        );
         const reservationFor = Object.assign(Object.assign({ typeOf: event.typeOf, coaInfo: event.coaInfo }, (event.doorTime !== undefined)
             ? {
                 doorTime: moment(event.doorTime)
@@ -136,28 +133,30 @@ function responseBody2acceptedOffers4result(params) {
                 coaInfo: event.superEvent.coaInfo
             }, id: event.id });
         const ticketNumber = util.format('%s:%s:%s', reservationFor.id, tmpReserve.seatSection, tmpReserve.seatNum);
+        const ticketedSeat = {
+            typeOf: factory.placeType.Seat,
+            seatNumber: tmpReserve.seatNum,
+            seatRow: '',
+            seatSection: tmpReserve.seatSection
+        };
+        const ticketType = {
+            typeOf: factory.offerType.Offer,
+            id: requestedOffer.id,
+            identifier: requestedOffer.identifier,
+            name: requestedOffer.name
+        };
         const reservedTicket = {
             typeOf: 'Ticket',
             coaTicketInfo: requestedOffer.ticketInfo,
             // 予約取引確定パラメータ生成のためcoaReserveAmountを追加(2022-05-24~)
             coaReserveAmount: params.totalPrice,
             dateIssued: params.bookingTime,
-            ticketedSeat: {
-                typeOf: factory.placeType.Seat,
-                seatNumber: tmpReserve.seatNum,
-                seatRow: '',
-                seatSection: tmpReserve.seatSection
-            },
+            ticketedSeat,
             identifier: ticketNumber,
             // ticketNumber: ticketToken,
             ticketNumber,
             ticketToken: ticketToken,
-            ticketType: {
-                typeOf: factory.offerType.Offer,
-                id: requestedOffer.id,
-                identifier: String(requestedOffer.identifier),
-                name: requestedOffer.name
-            }
+            ticketType
         };
         const additionalProperty = (_b = (_a = requestedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.additionalProperty;
         const additionalTicketText = (_d = (_c = requestedOffer.itemOffered) === null || _c === void 0 ? void 0 : _c.serviceOutput) === null || _d === void 0 ? void 0 : _d.additionalTicketText;
@@ -179,9 +178,7 @@ function responseBody2acceptedOffers4result(params) {
                 }
             }
         };
-        const reservation = Object.assign(Object.assign(Object.assign({ typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
-            // numSeats: 1, // 廃止(2022-08-18~)
-            reservationFor: reservationFor, reservationNumber: reservationNumber, reservedTicket: reservedTicket });
+        const reservation = Object.assign(Object.assign(Object.assign({ typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { reservationFor: reservationFor, reservationNumber: reservationNumber, reservedTicket: reservedTicket });
         if (requestedOffer.priceSpecification === undefined) {
             throw new factory.errors.NotFound('acceptedOffer.priceSpecification');
         }

package/lib/chevre/service/offer/eventServiceByCOA/authorize/validateAcceptedOffers.js

@@ -316,7 +316,7 @@ function validateAcceptedOffers(params) {
             });
         }
         const acceptedOffers = params.object.acceptedOffer.map((acceptedOffer) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b;
             const availableUnitPriceOffer = availableUnitPriceOffers.find((unitPriceOffer) => {
                 var _a, _b;
                 const ticketCodeByUnitPriceOffer = (_b = (_a = unitPriceOffer.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === 'ticketCode')) === null || _b === void 0 ? void 0 : _b.value;
@@ -365,13 +365,11 @@ function validateAcceptedOffers(params) {
                     usePoint: (typeof usePointValue === 'string') ? Number(usePointValue) : 0, salePrice // COAに渡す販売金額を上書き(2023-03-20~)
                  }), 
                 // 以下属性については単価オファーから読む(2023-03-09~)
-                priceCurrency: availableUnitPriceOffer.priceCurrency, id: String(availableUnitPriceOffer.id), identifier: String(availableUnitPriceOffer.identifier), typeOf: availableUnitPriceOffer.typeOf }, (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO itemOfferedに完全置き換え
-                seatNumber: (_e = (_d = (_c = itemOffered.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservedTicket) === null || _d === void 0 ? void 0 : _d.ticketedSeat) === null || _e === void 0 ? void 0 : _e.seatNumber,
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO itemOfferedに完全置き換え
-                seatSection: (_h = (_g = (_f = itemOffered.serviceOutput) === null || _f === void 0 ? void 0 : _f.reservedTicket) === null || _g === void 0 ? void 0 : _g.ticketedSeat) === null || _h === void 0 ? void 0 : _h.seatSection
+                priceCurrency: availableUnitPriceOffer.priceCurrency, id: availableUnitPriceOffer.id, identifier: availableUnitPriceOffer.identifier, typeOf: availableUnitPriceOffer.typeOf }, (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), {
+            // discontinue(2025-01-03~)
+            // seatNumber: itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber,
+            // discontinue(2025-01-03~)
+            // seatSection: itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatSection
             });
         });
         return { acceptedOffers };

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

@@ -79,7 +79,7 @@ function authorize(params) {
             // アクション開始前に例外がthrowされてもCOA仮予約を取り消す機会をつくるためにFailedアクションを作成する(2023-09-12~)
             const failedActionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
                 acceptAction: params.object.acceptAction,
-                acceptedOffers: [],
+                // acceptedOffers: [],
                 event: { id: params.object.event.id, typeOf: factory.eventType.ScreeningEvent },
                 transaction,
                 pendingTransaction
@@ -92,7 +92,7 @@ function authorize(params) {
         // 承認アクションを開始
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
             acceptAction: params.object.acceptAction,
-            acceptedOffers,
+            // acceptedOffers,
             event: { id: screeningEvent.id, typeOf: screeningEvent.typeOf },
             transaction,
             pendingTransaction

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": "4.392.0-alpha.2",
+    "@chevre/factory": "4.392.0-alpha.3",
     "@cinerino/sdk": "10.19.0-alpha.3",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.8.0-alpha.2"
+  "version": "22.8.0-alpha.3"
 }