@chevre/domain 22.2.0-alpha.2 → 22.2.0-alpha.4

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

@@ -137,15 +137,31 @@ function acceptedOffers2amount(params) {
     return amount;
 }
 exports.acceptedOffers2amount = acceptedOffers2amount;
+function acceptedOffers2programMembershipUsed(params) {
+    const programMembershipUsed = [];
+    const permitIdentifiers = [];
+    params.acceptedOffers.forEach(({ itemOffered }) => {
+        var _a;
+        if (((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.permit.PermitType.Permit) {
+            // メンバーシップコードに対してユニークに集計
+            if (!permitIdentifiers.includes(itemOffered.programMembershipUsed.identifier)) {
+                permitIdentifiers.push(itemOffered.programMembershipUsed.identifier);
+                programMembershipUsed.push(itemOffered.programMembershipUsed);
+            }
+        }
+    });
+    return programMembershipUsed;
+}
 function acceptedOffers2authorizeResult(params) {
     const { acceptedOffers, acceptedOffers4result, noOfferSpecified, ticketOffers } = params;
-    // const priceCurrency = acceptedOffers[0]?.priceSpecification?.priceCurrency;
     const priceCurrency = factory.priceCurrency.JPY; // fix(2024-07-03~)
     // redefine as typeOf: AggregateOffer(2024-06-18~)
     let offers;
     let price;
+    let programMembershipUsed = [];
     if (!noOfferSpecified) {
         price = acceptedOffers2amount({ acceptedOffers: acceptedOffers4result }); // オファー指定の場合のみ金額計算(2023-11-27~)
+        programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
         // オファーIDごとに集計
         const offerIds = [...new Set(acceptedOffers.map((o) => o.id))];
         offers = offerIds.map((offerId) => {
@@ -153,10 +169,6 @@ function acceptedOffers2authorizeResult(params) {
             if (acceptedOffer === undefined) {
                 throw new factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
             }
-            // const acceptedOffer = acceptedOffers.find(({ id }) => id === offerId);
-            // if (acceptedOffer === undefined) {
-            //     throw new factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
-            // }
             const amountOfThisGood = acceptedOffers.filter(({ id }) => id === offerId).length;
             const { acceptedPaymentMethod, priceSpecification } = acceptedOffer;
             const unitPriceSpec = priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
@@ -169,7 +181,9 @@ function acceptedOffers2authorizeResult(params) {
             return Object.assign({ id: offerId, includesObject: { amountOfThisGood }, typeOf: factory.offerType.Offer, priceSpecification: Object.assign(Object.assign({}, (eligibleQuantity !== undefined) ? { eligibleQuantity } : undefined), (eligibleTransactionVolume !== undefined) ? { eligibleTransactionVolume } : undefined) }, (acceptedPaymentMethod !== undefined) ? { acceptedPaymentMethod } : undefined);
         });
     }
-    return Object.assign(Object.assign({ typeOf: factory.offerType.AggregateOffer, priceCurrency, amount: [] }, (typeof price === 'number') ? { price } : undefined), (Array.isArray(offers)) ? { offers } : undefined);
+    return Object.assign(Object.assign({ typeOf: factory.offerType.AggregateOffer, priceCurrency, amount: [], itemOffered: {
+            serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
+        } }, (typeof price === 'number') ? { price } : undefined), (Array.isArray(offers)) ? { offers } : undefined);
 }
 exports.acceptedOffers2authorizeResult = acceptedOffers2authorizeResult;
 function responseBody2acceptedOffers4result(params) {

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -41,7 +41,7 @@ export declare function validatePaymentMethods(params: {
  * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'price'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'instrument' | 'object' | 'result'>[];
 }): void;

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -350,11 +350,12 @@ exports.validatePaymentMethods = validatePaymentMethods;
 // tslint:disable-next-line:max-func-body-length
 function validateEventOffers(params) {
     var _a, _b;
-    const firstCreditCardPaymentMethodIdentifier = (_b = (_a = params.paymentMethods.find((referenceInvoice) => {
+    const { paymentMethods } = params;
+    const firstCreditCardPaymentMethodIdentifier = (_b = (_a = paymentMethods.find((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     })) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
-    const numCreditCardOrFaceToFacePaymentMethod = params.paymentMethods.filter((referenceInvoice) => {
+    const numCreditCardOrFaceToFacePaymentMethod = paymentMethods.filter((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     }).length;
@@ -411,5 +412,38 @@ function validateEventOffers(params) {
             });
         }
     });
+    // check programMembershipUsed(2024-08-15~)
+    const programMembershipRequired = params.authorizeEventServiceOfferActions.reduce((a, b) => {
+        var _a, _b;
+        const programMembershipUsedfromResult = (_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput.programMembershipUsed;
+        if (Array.isArray(programMembershipUsedfromResult)) {
+            a.push(...programMembershipUsedfromResult);
+        }
+        return a;
+    }, []);
+    const satisfyProgramMembershipRequirement = programMembershipRequired.every(({ identifier, issuedThrough }) => {
+        let satisfyThisRequirement = false;
+        switch (issuedThrough.typeOf) {
+            case factory.product.ProductType.MembershipService:
+                // 検証の必要なし
+                satisfyThisRequirement = true;
+                break;
+            case factory.service.paymentService.PaymentServiceType.CreditCard:
+                satisfyThisRequirement = paymentMethods.some((paymentMethod) => paymentMethod.paymentMethodId === identifier
+                    && paymentMethod.issuedThrough.id === issuedThrough.id
+                    && paymentMethod.issuedThrough.typeOf === issuedThrough.typeOf);
+                break;
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                satisfyThisRequirement = paymentMethods.some((paymentMethod) => paymentMethod.paymentMethodId === identifier
+                    && paymentMethod.issuedThrough.typeOf === issuedThrough.typeOf);
+                break;
+            default:
+            // no op
+        }
+        return satisfyThisRequirement;
+    });
+    if (!satisfyProgramMembershipRequirement) {
+        throw new factory.errors.Argument('Transaction', `programMembershipUsed requirement not satisfied`);
+    }
 }
 exports.validateEventOffers = validateEventOffers;

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -293,7 +293,7 @@ function createResult(params, options) {
         price
     });
     (0, validation_1.validateEventOffers)({
-        order: orderAsResult,
+        order: { price },
         paymentMethods,
         authorizeEventServiceOfferActions: params.authorizeEventServiceOfferActions
     });

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.3",
-    "@cinerino/sdk": "10.5.0-alpha.0",
+    "@chevre/factory": "4.381.0-alpha.4",
+    "@cinerino/sdk": "10.5.0-alpha.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.2"
+  "version": "22.2.0-alpha.4"
 }