@chevre/domain 25.2.0-alpha.3 → 25.2.0-alpha.5

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

@@ -174,7 +174,7 @@ function acceptedOffers2programMembershipUsed(params) {
 }
 function acceptedOffers2authorizeResult(params) {
     const { acceptedOffers4result, noOfferSpecified, ticketOffers } = params;
-    const priceCurrency = factory_1.factory.priceCurrency.JPY; // fix(2024-07-03~)
+    // const priceCurrency = factory.priceCurrency.JPY; // fix(2024-07-03~)
     let offers;
     let price;
     let programMembershipUsed = [];
@@ -213,8 +213,8 @@ function acceptedOffers2authorizeResult(params) {
     }
     return {
         typeOf: factory_1.factory.offerType.AggregateOffer,
-        priceCurrency,
-        amount: [],
+        // priceCurrency, // discontinue(2026-07-06~)
+        // amount: [], // discontinue(2026-07-06~)
         itemOffered: {
             serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
         },

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

@@ -109,8 +109,8 @@ function authorize(params, options) {
             result = {
                 typeOf: factory_2.factory.offerType.AggregateOffer, // add(2024-06-18~)
                 price: price,
-                priceCurrency: factory_2.factory.priceCurrency.JPY,
-                amount: []
+                // priceCurrency: factory.priceCurrency.JPY, // discontinue(2026-07-06~)
+                // amount: [] // discontinue(2026-07-06~)
             };
             await (0, any_1.acceptOffer)({
                 project: transaction.project,

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

@@ -133,7 +133,7 @@ function changeOffers(params) {
         const actionResult = {
             ...authorizeAction.result,
             price: price,
-            amount: []
+            // amount: [] // discontinue(2026-07-06~)
         };
         // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
         await repos.action.reStart({ id: authorizeAction.id, typeOf: authorizeAction.typeOf });

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

@@ -32,7 +32,7 @@ function acceptedOffers2authorizeResult(params) {
         };
     });
     return {
-        amount: [],
+        // amount: [], // discontinue(2026-07-06~)
         itemOffered: {
             serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
         },
@@ -93,7 +93,7 @@ function prepareUnitPriceOfferConditions(params) {
                 id: authorizeEventServiceOfferAction.id,
                 result: {
                     typeOf: authorizeEventServiceOfferAction.result.typeOf,
-                    priceCurrency: authorizeEventServiceOfferAction.result.priceCurrency,
+                    // priceCurrency: authorizeEventServiceOfferAction.result.priceCurrency,
                     price: authorizeEventServiceOfferAction.result.price,
                     ...acceptedOffers2authorizeResult({
                         acceptedOffers4result: acceptedOffers4action,
@@ -106,9 +106,9 @@ function prepareUnitPriceOfferConditions(params) {
         for (const authorizeEventServiceOfferAction of params.authorizeEventServiceOfferActions) {
             const conditionExpected = conditions.find(({ id }) => id === authorizeEventServiceOfferAction.id);
             const resultMatched = (0, util_1.isDeepStrictEqual)(conditionExpected?.result, authorizeEventServiceOfferAction.result);
-            console.log('resultMatched?', resultMatched, authorizeEventServiceOfferAction.id, authorizeEventServiceOfferAction.instrument.transactionNumber);
+            console.log('resultMatched?', resultMatched, params.project.id, authorizeEventServiceOfferAction.id, authorizeEventServiceOfferAction.instrument.transactionNumber);
             if (!resultMatched) {
-                console.log(conditionExpected?.result, authorizeEventServiceOfferAction.result);
+                console.log('conditionExpected not matched!', params.project.id, authorizeEventServiceOfferAction.id, conditionExpected?.result, authorizeEventServiceOfferAction.result);
             }
         }
         return conditions;

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

@@ -29,8 +29,8 @@ eventReservationAcceptedOffers, payTransactions, customer) {
     (0, validatePrice_1.validatePrice)(authorizePaymentActions, authorizeEventServiceOfferActions);
     // 請求のreferencesOrder検証(2025-11-23~)
     (0, validateInvoiceReferencesOrder_1.validateInvoiceReferencesOrder)(authorizePaymentActions, eventReservationAcceptedOffers);
-    // 利用可能な通貨単位に対して取引検証
-    validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOfferActions);
+    // // 利用可能な通貨単位に対して取引検証
+    // validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOfferActions); // discontinue(2026-07-06~)
     // 利用可能なMovieTicketIF決済方法タイプに対して動的にコーディング
     const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentActions, eventReservationAcceptedOffers);
     debug('processing validateMovieTicket... movieTicketPaymentMethodTypes:', movieTicketPaymentMethodTypes);
@@ -148,63 +148,63 @@ function validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActio
         }
     }
 }
-/**
- * JPY以外の通貨について取引を検証する
- */
-function validateMonetaryAmount(_authorizePaymentActions, authorizeEventServiceOfferActions) {
-    // PaymentCard決済を廃止したので、JPY以外の通貨に対しての承認はありえない(2026-04-18~)
-    const authorizeMonetaryAmountActions = [];
-    // const authorizeMonetaryAmountActions = authorizePaymentActions.filter(({ result }) => {
-    //     const resultAsInvoice = (Array.isArray(result))
-    //         // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-    //         ? result[0]
-    //         : undefined;
-    //     // JPY以外の通貨に対して承認可能なのはPaymentServiceType.PaymentCardのみ
-    //     return resultAsInvoice?.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.PaymentCard
-    //         && resultAsInvoice.totalPaymentDue?.currency !== factory.priceCurrency.JPY;
-    // });
-    const requiredMonetaryAmountByCurrencyType = [];
-    authorizeEventServiceOfferActions.forEach((a) => {
-        const amount = a.result?.amount;
-        if (Array.isArray(amount)) {
-            amount.forEach((monetaryAmount) => {
-                if (typeof monetaryAmount.value === 'number') {
-                    requiredMonetaryAmountByCurrencyType.push({ currency: monetaryAmount.currency, value: monetaryAmount.value });
-                }
-            });
-        }
-    }, 0);
-    const requiredCurrencyTypes = [...new Set(requiredMonetaryAmountByCurrencyType.map((m) => m.currency))];
-    const authorizedCurrencyTypes = [...new Set(authorizeMonetaryAmountActions.map(({ result }) => {
-            const resultAsInvoice = (Array.isArray(result))
-                // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-                ? result[0]
-                : undefined;
-            return resultAsInvoice?.totalPaymentDue?.currency;
-        }))];
-    if (requiredCurrencyTypes.length !== authorizedCurrencyTypes.length) {
-        throw new factory_1.factory.errors.Argument('Transaction', 'MonetaryAmount account types not matched');
-    }
-    const requireMonetaryAmountSatisfied = requiredCurrencyTypes.every((currencyType) => {
-        const requiredMonetaryAmount = requiredMonetaryAmountByCurrencyType
-            .filter((m) => m.currency === currencyType)
-            .reduce((a, b) => a + b.value, 0);
-        let authorizedMonetaryAmount = 0;
-        authorizeMonetaryAmountActions.forEach(({ result }) => {
-            const resultAsInvoice = (Array.isArray(result))
-                // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-                ? result[0]
-                : undefined;
-            if (resultAsInvoice?.totalPaymentDue?.currency === currencyType) {
-                authorizedMonetaryAmount += resultAsInvoice.totalPaymentDue.value;
-            }
-        });
-        return requiredMonetaryAmount === authorizedMonetaryAmount;
-    });
-    if (!requireMonetaryAmountSatisfied) {
-        throw new factory_1.factory.errors.Argument('Transaction', 'Required MonetaryAmount not satisfied');
-    }
-}
+// JPY以外の通貨決済はひとまず廃止(2026-07-06~)
+// /**
+//  * JPY以外の通貨について取引を検証する
+//  */
+// function validateMonetaryAmount(
+//     _authorizePaymentActions: IAuthorizePaymentAction[],
+//     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'result'>[]
+// ) {
+//     // PaymentCard決済を廃止したので、JPY以外の通貨に対しての承認はありえない(2026-04-18~)
+//     const authorizeMonetaryAmountActions: IAuthorizePaymentAction[] = [];
+//     const requiredMonetaryAmountByCurrencyType: {
+//         currency: string;
+//         value: number;
+//     }[] = [];
+//     authorizeEventServiceOfferActions.forEach(
+//         (a) => {
+//             const amount = a.result?.amount;
+//             if (Array.isArray(amount)) {
+//                 amount.forEach((monetaryAmount) => {
+//                     if (typeof monetaryAmount.value === 'number') {
+//                         requiredMonetaryAmountByCurrencyType.push({ currency: monetaryAmount.currency, value: monetaryAmount.value });
+//                     }
+//                 });
+//             }
+//         },
+//         0
+//     );
+//     const requiredCurrencyTypes = [...new Set(requiredMonetaryAmountByCurrencyType.map((m) => m.currency))];
+//     const authorizedCurrencyTypes = [...new Set(authorizeMonetaryAmountActions.map(({ result }) => {
+//         const resultAsInvoice = (Array.isArray(result))
+//             ? result[0]
+//             : undefined;
+//         return resultAsInvoice?.totalPaymentDue?.currency as string;
+//     }
+//     ))];
+//     if (requiredCurrencyTypes.length !== authorizedCurrencyTypes.length) {
+//         throw new factory.errors.Argument('Transaction', 'MonetaryAmount account types not matched');
+//     }
+//     const requireMonetaryAmountSatisfied = requiredCurrencyTypes.every((currencyType) => {
+//         const requiredMonetaryAmount = requiredMonetaryAmountByCurrencyType
+//             .filter((m) => m.currency === currencyType)
+//             .reduce((a, b) => a + b.value, 0);
+//         let authorizedMonetaryAmount = 0;
+//         authorizeMonetaryAmountActions.forEach(({ result }) => {
+//             const resultAsInvoice = (Array.isArray(result))
+//                 ? result[0]
+//                 : undefined;
+//             if (resultAsInvoice?.totalPaymentDue?.currency === currencyType) {
+//                 authorizedMonetaryAmount += resultAsInvoice.totalPaymentDue.value;
+//             }
+//         });
+//         return requiredMonetaryAmount === authorizedMonetaryAmount;
+//     });
+//     if (!requireMonetaryAmountSatisfied) {
+//         throw new factory.errors.Argument('Transaction', 'Required MonetaryAmount not satisfied');
+//     }
+// }
 /**
  * 注文オファー数検証
  */

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

@@ -41,6 +41,11 @@ interface IConfirmOptions {
      * 注文における最大CreditCardIF決済方法数
      */
     maxNumCreditCardPaymentMethod: number;
+    /**
+     * 2026-07-06~
+     * 実験的に
+     */
+    usePrepareUnitPriceOfferConditions?: boolean;
 }
 type IConfirmParams = PlaceOrderFactory.IConfirmParams;
 interface IConfirmResult {

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

@@ -116,7 +116,8 @@ function confirm(params, options) {
         }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // 単価オファーの全適用条件を検証するために、単価オファーを参照(2026-07-06~)
-        if (transaction.project.id === 'cinerino') {
+        const { usePrepareUnitPriceOfferConditions } = options;
+        if (usePrepareUnitPriceOfferConditions === true) {
             await (0, prepareUnitPriceOfferConditions_1.prepareUnitPriceOfferConditions)({
                 project: { id: transaction.project.id, },
                 acceptedOffers,

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": "9.5.0-alpha.2",
+    "@chevre/factory": "9.5.0-alpha.3",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.3"
+  "version": "25.2.0-alpha.5"
 }