@chevre/domain 20.11.0-alpha.1 → 20.11.0-alpha.3

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

@@ -2,28 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const factory = require("../../../factory");
-const order_1 = require("../../../factory/order");
+// import { createMaskedCustomer } from '../../../factory/order';
 function createPayActions(params) {
     var _a;
     const payActions = [];
     const payObject = createPayObject(params);
     const informPaymentActions = createInformPaymentActions(params);
     if (payObject !== undefined) {
-        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
-        const simpleOrder = {
+        // const maskedCustomer = createMaskedCustomer(params.order);
+        // const simpleOrder: factory.order.ISimpleOrder = {
+        //     typeOf: params.order.typeOf,
+        //     seller: params.order.seller,
+        //     // mask
+        //     customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+        //     orderNumber: params.order.orderNumber,
+        //     price: params.order.price,
+        //     priceCurrency: params.order.priceCurrency,
+        //     orderDate: params.order.orderDate
+        // };
+        const payPurpose = {
             typeOf: params.order.typeOf,
-            seller: params.order.seller,
-            // mask
-            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-            orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
+            confirmationNumber: params.order.confirmationNumber,
+            orderNumber: params.order.orderNumber
         };
         const payAction = Object.assign({ project: params.transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: params.transaction.project, potentialActions: {
                 add2report: true,
                 informPayment: informPaymentActions
-            }, purpose: simpleOrder, recipient: {
+            }, 
+            // optimize(2023-03-20~)
+            // purpose: simpleOrder,
+            purpose: payPurpose, recipient: {
                 id: params.transaction.recipient.id,
                 name: params.transaction.recipient.name,
                 typeOf: params.transaction.recipient.typeOf
@@ -135,6 +143,7 @@ function createPayObjectServiceOutput(params) {
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
     var _a, _b;
     let ticketToken;
+    let reservationNumber = '';
     let priceComponents4invoice = [];
     // Orderから対象予約を取得
     const reservationOffer = (_a = order === null || order === void 0 ? void 0 : order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
@@ -176,6 +185,7 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
         if (typeof ticketTokenByReservationOffer === 'string' && ticketTokenByReservationOffer.length > 0) {
             ticketToken = ticketTokenByReservationOffer;
         }
+        reservationNumber = reservationOffer.itemOffered.reservationNumber;
         const priceComponent = (_b = reservationOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent;
         if (Array.isArray(priceComponent)) {
             priceComponents4invoice = priceComponent.map((component) => {
@@ -200,7 +210,9 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
     return Object.assign({ priceSpecification: {
             typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
             priceComponent: priceComponents4invoice
-        } }, (typeof ticketToken === 'string')
+        }, 
+        // add reservationNumber(2023-03-20~)
+        reservationNumber }, (typeof ticketToken === 'string')
         ? { reservedTicket: { ticketToken } }
         : undefined);
 }

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,46 @@ 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 offerIds: string[] = (Array.isArray(params.object.acceptedOffer))
+        //     ? [...new Set(params.object.acceptedOffer.map((o) => o.id))]
+        //     : [];
+        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 (offerIds.length > 0) {
+        //     availableUnitPriceOffers = await repos.offer.search({
+        //         id: { $in: offerIds },
+        //         project: { id: { $eq: params.project.id } }
+        //     });
+        // }
+        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 +314,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.304.0",
-    "@cinerino/sdk": "3.150.0",
+    "@chevre/factory": "4.306.0",
+    "@cinerino/sdk": "3.151.0-alpha.1",
     "@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.1"
+  "version": "20.11.0-alpha.3"
 }