@chevre/domain 21.16.0 → 21.17.0-alpha.0

package/lib/chevre/repo/offer.js

@@ -405,6 +405,7 @@ class MongoRepository {
             description: '$offers.description',
             category: '$offers.category',
             color: '$offers.color',
+            acceptedPaymentMethod: '$offers.acceptedPaymentMethod',
             additionalProperty: '$offers.additionalProperty',
             advanceBookingRequirement: '$offers.advanceBookingRequirement',
             alternateName: '$offers.alternateName',

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

@@ -276,7 +276,7 @@ function validateAcceptedOffers(params) {
             if (numAcceptedOffersByOfferId % referenceQuantityValue !== 0) {
                 throw new factory.errors.Argument('acceptedOffers', `Offer ${offerId} requires reference quantity value ${referenceQuantityValue}`);
             }
-            // 適用アイテム数要件を満たしていなければエラー
+            // 適用数量要件を満たしていなければエラー
             const maxValue = (_b = unitPriceSpec.eligibleQuantity) === null || _b === void 0 ? void 0 : _b.maxValue;
             if (typeof maxValue === 'number') {
                 if (numAcceptedOffersByOfferId > maxValue) {
@@ -326,23 +326,18 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                     : undefined);
             })
             : [];
-        const acceptedOffer = {
+        const acceptedOffer = Object.assign({ 
             // オファーの中身を最適化する(必要最低限の情報のみに)
-            id: String(offer.id),
-            identifier: offer.identifier,
-            priceSpecification,
-            typeOf: offer.typeOf,
-            priceCurrency: offer.priceCurrency,
-            itemOffered: Object.assign({ typeOf: factory.product.ProductType.EventService, serviceOutput: (offerWithoutDetail.itemOffered !== undefined && offerWithoutDetail.itemOffered !== null)
+            id: String(offer.id), identifier: offer.identifier, priceSpecification, typeOf: offer.typeOf, priceCurrency: offer.priceCurrency, itemOffered: Object.assign({ typeOf: factory.product.ProductType.EventService, serviceOutput: (offerWithoutDetail.itemOffered !== undefined && offerWithoutDetail.itemOffered !== null)
                     ? offerWithoutDetail.itemOffered.serviceOutput
-                    : undefined }, (pointAward !== undefined) ? { pointAward } : undefined),
-            addOn: acceptedAddOns,
+                    : undefined }, (pointAward !== undefined) ? { pointAward } : undefined), addOn: acceptedAddOns, 
             // 追加属性をマージ
             additionalProperty: [
                 ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
                 ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
-            ]
-        };
+            ] }, (Array.isArray(offer.acceptedPaymentMethod))
+            ? { acceptedPaymentMethod: offer.acceptedPaymentMethod } // add(2023-11-15~)
+            : undefined);
         let offeredThrough = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.offeredThrough;
         if (typeof (offeredThrough === null || offeredThrough === void 0 ? void 0 : offeredThrough.typeOf) !== 'string') {
             offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };

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

@@ -76,8 +76,8 @@ function createCompoundPriceSpec4event(params) {
         priceComponent
     };
     // 必要な属性のみに限定(2023-02-24~)
-    const { name, description, alternateName, color, typeOf, id, availability, availableAtOrFrom, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex, parentOffer } = params.offer;
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
+    const { acceptedPaymentMethod, name, description, alternateName, color, typeOf, id, availability, availableAtOrFrom, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex, parentOffer } = params.offer;
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
         category,
         eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
         priceCurrency,
@@ -86,6 +86,6 @@ function createCompoundPriceSpec4event(params) {
         ? {
             availableAtOrFrom // 最適化(2023-09-10~)
         }
-        : undefined), (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined), (typeof (parentOffer === null || parentOffer === void 0 ? void 0 : parentOffer.id) === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined);
+        : undefined), (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined), (typeof (parentOffer === null || parentOffer === void 0 ? void 0 : parentOffer.id) === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined), (Array.isArray(acceptedPaymentMethod)) ? { acceptedPaymentMethod } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -41,7 +41,7 @@ export declare function validatePaymentMethods(params: {
     order: factory.order.IOrder;
 }): void;
 /**
- * イベントオファー適用条件確認
+ * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js

@@ -254,32 +254,73 @@ function validatePaymentMethods(params) {
 }
 exports.validatePaymentMethods = validatePaymentMethods;
 /**
- * イベントオファー適用条件確認
+ * 興行オファー適用条件確認
  */
 function validateEventOffers(params) {
+    var _a, _b;
+    const firstOrderPaymentMethodIdentifier = (_b = (_a = params.order.paymentMethods[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+    const numCreditCardOrFaceToFacePaymentMethod = params.order.paymentMethods.filter((referenceInvoice) => {
+        return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+            || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
+    }).length;
     const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     seatReservationAuthorizeActions.forEach((a) => {
-        const acceptedOffers = a.object.acceptedOffer;
         // オファーIDごとにオファー適用条件を確認
-        const offerIds = [...new Set(acceptedOffers.map((o) => o.id))];
+        const offerIds = [...new Set(a.object.acceptedOffer.map((o) => o.id))];
         offerIds.forEach((offerId) => {
-            var _a, _b;
-            const acceptedOffersByOfferId = acceptedOffers.filter((o) => o.id === offerId);
-            let acceptedOffer = acceptedOffersByOfferId[0];
+            var _a, _b, _c, _d;
             let unitPriceSpec;
-            if (acceptedOffer.priceSpecification !== undefined) {
+            if (a.instrument.identifier === factory.service.webAPI.Identifier.Chevre) {
+                const acceptedOffersByOfferId = a.object.acceptedOffer.filter((o) => o.id === offerId);
+                const acceptedOffer = acceptedOffersByOfferId[0];
                 // Chevre予約の場合、priceSpecificationに複合価格仕様が含まれるので、そこから単価仕様を取り出す
-                acceptedOffer = acceptedOffer;
-                unitPriceSpec = acceptedOffer.priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification);
-            }
-            // 適用金額要件を満たしていなければエラー
-            const eligibleTransactionVolumePrice = (_a = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleTransactionVolume) === null || _a === void 0 ? void 0 : _a.price;
-            const eligibleTransactionVolumePriceCurrency = (_b = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleTransactionVolume) === null || _b === void 0 ? void 0 : _b.priceCurrency;
-            if (typeof eligibleTransactionVolumePrice === 'number') {
-                if (params.order.price < eligibleTransactionVolumePrice) {
-                    throw new factory.errors.Argument('Transaction', (0, util_1.format)('Transaction volume must be more than or equal to %s %s for offer:%s', eligibleTransactionVolumePrice, eligibleTransactionVolumePriceCurrency, offerId));
+                // acceptedOffer = <factory.action.authorize.offer.seatReservation.IAcceptedOffer4chevre>acceptedOffer;
+                unitPriceSpec = acceptedOffer.priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
+                    && (!Array.isArray(spec.appliesToAddOn)) // アドオン単価ではない
+                );
+                // if (acceptedOffer.priceSpecification !== undefined) {
+                //     // Chevre予約の場合、priceSpecificationに複合価格仕様が含まれるので、そこから単価仕様を取り出す
+                //     acceptedOffer = <factory.action.authorize.offer.seatReservation.IAcceptedOffer4chevre>acceptedOffer;
+                //     unitPriceSpec = <IUnitPriceSpecification>acceptedOffer.priceSpecification.priceComponent.find(
+                //         (spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
+                //     );
+                // }
+                // 適用金額要件を満たしていなければエラー
+                const eligibleTransactionVolumePrice = (_a = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleTransactionVolume) === null || _a === void 0 ? void 0 : _a.price;
+                const eligibleTransactionVolumePriceCurrency = (_b = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleTransactionVolume) === null || _b === void 0 ? void 0 : _b.priceCurrency;
+                if (typeof eligibleTransactionVolumePrice === 'number') {
+                    if (params.order.price < eligibleTransactionVolumePrice) {
+                        throw new factory.errors.Argument('Transaction', (0, util_1.format)('Transaction volume must be more than or equal to %s %s for offer:%s', eligibleTransactionVolumePrice, eligibleTransactionVolumePriceCurrency, offerId));
+                    }
+                }
+                // 適用数量検証(全興行オファー承認アクションについて)(2023-11-15~)
+                // 適用数量要件を満たしていなければエラー
+                const numAcceptedOffersByOfferId = seatReservationAuthorizeActions.reduce((previousNumOffer, currentAction) => {
+                    return previousNumOffer + currentAction.object.acceptedOffer.filter((o) => o.id === offerId).length;
+                }, 0);
+                const eligibleQuantityMaxValue = (_c = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleQuantity) === null || _c === void 0 ? void 0 : _c.maxValue;
+                if (typeof eligibleQuantityMaxValue === 'number') {
+                    if (numAcceptedOffersByOfferId > eligibleQuantityMaxValue) {
+                        throw new factory.errors.Argument('Transaction', `Number of offer:${offerId} must be less than or equal to ${eligibleQuantityMaxValue}`);
+                    }
+                }
+                const eligibleQuantityMinValue = (_d = unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.eligibleQuantity) === null || _d === void 0 ? void 0 : _d.minValue;
+                if (typeof eligibleQuantityMinValue === 'number') {
+                    if (numAcceptedOffersByOfferId < eligibleQuantityMinValue) {
+                        throw new factory.errors.Argument('Transaction', `Number of offer:${offerId} must be more than or equal to ${eligibleQuantityMinValue}`);
+                    }
+                }
+                // 利用可能決済方法検証(2023-11-15~)
+                if (Array.isArray(acceptedOffer.acceptedPaymentMethod)) {
+                    const acceptedPaymentMethodTypes = acceptedOffer.acceptedPaymentMethod.map((paymentMethod) => paymentMethod.identifier);
+                    const satisfyAcceptedPaymentMethod = numCreditCardOrFaceToFacePaymentMethod === 1
+                        && typeof firstOrderPaymentMethodIdentifier === 'string'
+                        && acceptedPaymentMethodTypes.includes(firstOrderPaymentMethodIdentifier);
+                    if (!satisfyAcceptedPaymentMethod) {
+                        throw new factory.errors.Argument('Transaction', `acceptedPaymentMethod requirement not satisfied`);
+                    }
                 }
             }
         });

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.342.0",
+    "@chevre/factory": "4.343.0-alpha.0",
     "@cinerino/sdk": "5.0.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.16.0"
+  "version": "21.17.0-alpha.0"
 }