@chevre/domain 20.11.0-alpha.2 → 20.11.0

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

@@ -22,7 +22,7 @@ export declare function responseBody2acceptedOffers4result(params: {
     responseBody: factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.COA>;
     object: factory.action.authorize.offer.seatReservation.IObject<factory.service.webAPI.Identifier.COA>;
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
-    seller: factory.transaction.placeOrder.ISeller;
+    seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;
     totalPrice: number;
 }): IResultAcceptedOffer[];

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

@@ -71,11 +71,11 @@ exports.offers2resultPrice = offers2resultPrice;
 function responseBody2acceptedOffers4result(params) {
     const acceptedOffers4result = [];
     const event = params.event;
-    const updTmpReserveSeatResult = params.responseBody;
+    const reservationNumber = String(params.responseBody.tmpReserveNum);
     // 座席仮予約からオファー情報を生成する
     // tslint:disable-next-line:max-func-body-length
-    acceptedOffers4result.push(...updTmpReserveSeatResult.listTmpReserve.map((tmpReserve, index) => {
-        var _a, _b, _c, _d, _e;
+    acceptedOffers4result.push(...params.responseBody.listTmpReserve.map((tmpReserve, index) => {
+        var _a, _b, _c, _d;
         const requestedOffer = params.object.acceptedOffer.find((o) => {
             var _a, _b, _c, _d;
             return ((_d = (_c = (_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber) === tmpReserve.seatNum
@@ -84,14 +84,7 @@ function responseBody2acceptedOffers4result(params) {
         if (requestedOffer === undefined) {
             throw new factory.errors.Argument('offers', '要求された供給情報と仮予約結果が一致しません');
         }
-        let coaInfo;
-        if (event.coaInfo !== undefined) {
-            coaInfo = event.coaInfo;
-        }
-        else {
-            const coaInfoProperty = (_a = event.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === 'coaInfo');
-            coaInfo = (coaInfoProperty !== undefined) ? JSON.parse(coaInfoProperty.value) : undefined;
-        }
+        const coaInfo = event.coaInfo;
         if (coaInfo === undefined) {
             throw new factory.errors.NotFound('Event COA Info');
         }
@@ -100,11 +93,10 @@ function responseBody2acceptedOffers4result(params) {
             coaInfo.theaterCode,
             coaInfo.dateJouei,
             // tslint:disable-next-line:no-magic-numbers
-            (`00000000${updTmpReserveSeatResult.tmpReserveNum}`).slice(-8),
+            (`00000000${reservationNumber}`).slice(-8),
             // tslint:disable-next-line:no-magic-numbers
             (`000${index + 1}`).slice(-3)
         ].join('');
-        const reservationNumber = String(updTmpReserveSeatResult.tmpReserveNum);
         const reservationId = `${reservationNumber}-${index.toString()}`;
         const workPerformed = {
             id: event.superEvent.workPerformed.id,
@@ -159,8 +151,8 @@ function responseBody2acceptedOffers4result(params) {
                 name: requestedOffer.name
             }
         };
-        const additionalProperty = (_c = (_b = requestedOffer.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.additionalProperty;
-        const additionalTicketText = (_e = (_d = requestedOffer.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.additionalTicketText;
+        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;
         const issuedThrough = {
             typeOf: factory.product.ProductType.EventService,
             id: '',

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.d.ts

@@ -15,7 +15,7 @@ declare function validateAcceptedOffers(params: {
     project: {
         id: string;
     };
-    screeningEvent: Pick<factory.event.screeningEvent.IEvent, 'id' | 'superEvent'>;
+    screeningEvent: Pick<factory.event.screeningEvent.IEvent, 'id' | 'superEvent' | 'coaInfo'>;
     availablePaymentMethodTypes: factory.categoryCode.ICategoryCode[];
     seatingTypes: factory.categoryCode.ICategoryCode[];
     videoFormatTypes: factory.categoryCode.ICategoryCode[];

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

@@ -245,29 +245,37 @@ function createPriceComponent(params) {
 /**
  * 受け入れらたオファーの内容を検証
  */
+// tslint:disable-next-line:max-func-body-length
 function validateAcceptedOffers(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const offerIds = (Array.isArray(params.object.acceptedOffer))
-            ? [...new Set(params.object.acceptedOffer.map((o) => o.id))]
+        var _a;
+        const theaterCode = String((_a = params.screeningEvent.coaInfo) === null || _a === void 0 ? void 0 : _a.theaterCode);
+        const offerIdentifiers = (Array.isArray(params.object.acceptedOffer))
+            ? [...new Set((params.object.acceptedOffer).map((o) => {
+                    return `COA-${theaterCode}-${String(o.ticketInfo.ticketCode)}`;
+                }))]
             : [];
         let availableUnitPriceOffers = [];
         // 指定された単価オファーを検索
-        if (offerIds.length > 0) {
+        // ticketCodeで検索(2023-03-22~)
+        if (offerIdentifiers.length > 0) {
             availableUnitPriceOffers = yield repos.offer.search({
-                id: { $in: offerIds },
+                identifier: { $in: offerIdentifiers },
                 project: { id: { $eq: params.project.id } }
             });
         }
         const acceptedOffers = params.object.acceptedOffer.map((acceptedOffer) => {
-            var _a, _b, _c, _d, _e, _f;
-            const availableUnitPriceOffer = availableUnitPriceOffers.find((unitPriceOffer) => unitPriceOffer.id === acceptedOffer.id);
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            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;
+                return ticketCodeByUnitPriceOffer === acceptedOffer.ticketInfo.ticketCode;
+            });
             if (availableUnitPriceOffer === undefined) {
-                throw new factory.errors.NotFound(factory.offerType.Offer, `${acceptedOffer.id} not found`);
+                throw new factory.errors.NotFound(factory.offerType.Offer, `${acceptedOffer.ticketInfo.ticketCode} not found`);
             }
             const { additionalProperty, itemOffered, name, ticketInfo } = acceptedOffer;
-            // if (priceSpecification === undefined) {
-            //     throw new factory.errors.NotFound('priceSpecification');
-            // }
             // priceComponentを再生成(2023-03-14~)
             const { priceComponent, eligibleMonetaryAmount } = createPriceComponent({
                 project: { id: params.project.id },
@@ -297,20 +305,23 @@ function validateAcceptedOffers(params) {
                 ticketInfo.addGlasses,
                 ticketInfo.spseatAdd1
             ].reduce((a, b) => a + b, 0);
+            const usePointValue = (_b = (_a = availableUnitPriceOffer.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === 'usePoint')) === null || _b === void 0 ? void 0 : _b.value;
             return Object.assign(Object.assign({ additionalProperty,
                 itemOffered,
                 name,
                 price,
-                priceSpecification, ticketInfo: Object.assign(Object.assign({}, ticketInfo), { salePrice // COAに渡す販売金額を上書き(2023-03-20~)
+                priceSpecification, ticketInfo: Object.assign(Object.assign({}, ticketInfo), { 
+                    // usePointを自動設定(2023-03-22~)
+                    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: (_c = (_b = (_a = itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) === null || _c === void 0 ? void 0 : _c.seatNumber,
+                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: (_f = (_e = (_d = itemOffered.serviceOutput) === null || _d === void 0 ? void 0 : _d.reservedTicket) === null || _e === void 0 ? void 0 : _e.ticketedSeat) === null || _f === void 0 ? void 0 : _f.seatSection
+                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
             });
         });
         return { acceptedOffers };

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.305.0",
-    "@cinerino/sdk": "3.151.0-alpha.1",
+    "@chevre/factory": "4.306.0",
+    "@cinerino/sdk": "3.151.0-alpha.2",
     "@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.11.0-alpha.2"
+  "version": "20.11.0"
 }