@chevre/domain 25.2.0-alpha.0 → 25.2.0-alpha.10

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

@@ -5,6 +5,7 @@ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MessageRepo } from '../../../repo/message';
+import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { ProjectRepo } from '../../../repo/project';
 import type { SettingRepo } from '../../../repo/setting';
@@ -19,6 +20,7 @@ interface IConfirmOperationRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     message: MessageRepo;
+    offer: OfferRepo;
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     orderInTransaction: OrderInTransactionRepo;
@@ -39,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

@@ -12,6 +12,7 @@ const factory_2 = require("../../order/placeOrder/factory");
 const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
 const result_1 = require("./confirm/factory/result");
 const potentialActions_1 = require("./confirm/potentialActions");
+const prepareUnitPriceOfferConditions_1 = require("./confirm/prepareUnitPriceOfferConditions");
 const publishCode_1 = require("./confirm/publishCode");
 const validation_1 = require("./confirm/validation");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
@@ -114,6 +115,16 @@ function confirm(params, options) {
             project: { id: transaction.project.id }
         }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
+        // 単価オファーの全適用条件を検証するために、単価オファーを参照(2026-07-06~)
+        let unitPriceOfferConditions;
+        const { usePrepareUnitPriceOfferConditions } = options;
+        if (usePrepareUnitPriceOfferConditions === true) {
+            unitPriceOfferConditions = await (0, prepareUnitPriceOfferConditions_1.prepareUnitPriceOfferConditions)({
+                project: { id: transaction.project.id, },
+                acceptedOffers,
+                authorizeEventServiceOfferActions
+            })({ offer: repos.offer });
+        }
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
         // 決済承認アクションのinstrument依存をobject依存へ変更(2025-12-14~)
@@ -134,22 +145,10 @@ function confirm(params, options) {
             orderNumber, transaction,
             acceptPayActions,
             authorizePaymentActions, authorizeEventServiceOfferActions,
-            // authorizeProductOfferActions,
             acceptedOffers, payTransactions, customer,
-            ...(typeof code === 'string') ? { code } : undefined
+            ...(typeof code === 'string') ? { code } : undefined,
+            ...((Array.isArray(unitPriceOfferConditions)) && { unitPriceOfferConditions })
         }, options);
-        // discontinue emailMessageRepo
-        // // デフォルトEメールメッセージを検索
-        // let emailMessageOnOrderSent: factory.creativeWork.message.email.ICreativeWork | undefined;
-        // if (repos.emailMessage !== undefined) {
-        //     const searchEmailMessagesResult = await repos.emailMessage.search({
-        //         limit: 1,
-        //         page: 1,
-        //         project: { id: { $eq: transaction.project.id } },
-        //         about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
-        //     });
-        //     emailMessageOnOrderSent = searchEmailMessagesResult.shift();
-        // }
         // ポストアクションを作成
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
@@ -319,17 +318,17 @@ function createResult(params, options) {
         }
     });
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.acceptPayActions, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, 
-    // params.authorizeProductOfferActions,
-    eventReservationAcceptedOffers, params.payTransactions, params.customer);
+    (0, validation_1.validateTransaction)(transaction, params.acceptPayActions, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, eventReservationAcceptedOffers, params.payTransactions, params.customer);
     const { paymentMethods, price } = (0, factory_2.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers
     });
     (0, validation_1.validateEventOffers)({
+        project: { id: transaction.project.id },
         order: { price },
         paymentMethods,
-        authorizeEventServiceOfferActions: params.authorizeEventServiceOfferActions
+        authorizeOfferActions: params.authorizeEventServiceOfferActions,
+        ...((Array.isArray(params.unitPriceOfferConditions)) && { unitPriceOfferConditions: params.unitPriceOfferConditions })
     });
     // 注文オファー検証
     (0, validation_1.validateAcceptedOffers)({
@@ -390,21 +389,6 @@ function createResult(params, options) {
 }
 function searchAcceptPayActions(params) {
     return async (repos) => {
-        // let acceptPayActions = <IAcceptPayAction[]>await repos.action.search(
-        //     {
-        //         project: { id: { $eq: params.project.id } },
-        //         typeOf: { $eq: factory.actionType.AcceptAction },
-        //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-        //         purpose: {
-        //             id: { $in: [params.id] },
-        //             typeOf: { $in: [factory.transactionType.PlaceOrder] }
-        //         },
-        //         object: {
-        //             typeOf: { $eq: factory.assetTransactionType.Pay }
-        //         }
-        //     },
-        //     ['object', 'endDate', 'result']
-        // );
         let acceptPayActions = await repos.acceptPayAction.findAcceptActionsByPurpose({
             project: { id: params.project.id },
             actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
@@ -423,15 +407,6 @@ function searchAcceptPayActions(params) {
 function searchAuthorizeActions(params) {
     return async (repos) => {
         // 取引に対する全ての承認アクションをマージ
-        // let authorizeActions = <IAuthorizeOfferOrPaymentAction[]>await repos.action.searchByPurpose({
-        //     typeOf: factory.actionType.AuthorizeAction,
-        //     purpose: {
-        //         typeOf: factory.transactionType.PlaceOrder,
-        //         id: params.id
-        //     },
-        //     // Completedに絞る(2023-05-16~)
-        //     actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
-        // });
         let authorizeActions = [
             ...await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodActionsByPurpose({
                 purpose: {

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.0",
+    "@chevre/factory": "9.5.0-alpha.5",
     "@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.0"
+  "version": "25.2.0-alpha.10"
 }