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

package/lib/chevre/repo/mongoose/schemas/action.js

@@ -221,15 +221,16 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'object.event.id': 1, startDate: -1 },
-        {
-            name: 'searchByObjectEventId',
-            partialFilterExpression: {
-                'object.event.id': { $exists: true }
-            }
-        }
-    ],
+    // 承認アクションのobject.event廃止につき検索条件も廃止(2026-07-07~)
+    // [
+    //     { 'object.event.id': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByObjectEventId',
+    //         partialFilterExpression: {
+    //             'object.event.id': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'about.id': 1, startDate: -1 },
         {

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

@@ -5,6 +5,11 @@ type IOrderAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'o
 export declare function createAuthorizeOfferResultsExpected(params: {
     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
 }): Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
+/**
+ * 注文ドキュメントと予約取引ドキュメントを参照することによって生成した、単価オファー検証条件
+ * 元々オファー承認アクションのresultに保管されていた
+ */
+type IPreparedUnitPriceOfferConditions = Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>;
 declare function prepareUnitPriceOfferConditions(params: {
     project: {
         id: string;
@@ -13,5 +18,5 @@ declare function prepareUnitPriceOfferConditions(params: {
     authorizeEventServiceOfferActions: IAuthorizeEventServiceOffer[];
 }): (repos: {
     offer: OfferRepo;
-}) => Promise<Pick<IAuthorizeEventServiceOffer, "id" | "result">[]>;
-export { prepareUnitPriceOfferConditions };
+}) => Promise<IPreparedUnitPriceOfferConditions[]>;
+export { IPreparedUnitPriceOfferConditions, prepareUnitPriceOfferConditions };

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAuthorizeOfferResultsExpected = createAuthorizeOfferResultsExpected;
 exports.prepareUnitPriceOfferConditions = prepareUnitPriceOfferConditions;
-const util_1 = require("util");
 const factory_1 = require("../../../../factory");
 function acceptedOffers2authorizeResult(params) {
     const { acceptedOffers4result, unitPriceOffers } = params;
@@ -102,15 +101,6 @@ 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, params.project.id, authorizeEventServiceOfferAction.id, authorizeEventServiceOfferAction.instrument.transactionNumber);
-            if (!resultMatched) {
-                console.log('conditionExpected not matched!', params.project.id, authorizeEventServiceOfferAction.id, conditionExpected?.result, authorizeEventServiceOfferAction.result);
-            }
-        }
         return conditions;
     };
 }

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

@@ -1,5 +1,6 @@
 import { factory } from '../../../../factory';
 import { PlaceOrderFactory } from '../../../../factory/transaction';
+import { IPreparedUnitPriceOfferConditions } from './prepareUnitPriceOfferConditions';
 import { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IPayTransaction } from './validation/factory';
 export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IPayTransaction };
 /**
@@ -35,6 +36,9 @@ export declare function validatePaymentMethods(params: {
  * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
+    project: {
+        id: string;
+    };
     order: {
         price: number;
     };
@@ -42,5 +46,6 @@ export declare function validateEventOffers(params: {
     /**
      * 承認アクションのresultに条件が保管されているはず(2026-07-06時点で)
      */
-    authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
+    authorizeOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
+    unitPriceOfferConditions?: IPreparedUnitPriceOfferConditions[];
 }): void;

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

@@ -17,13 +17,11 @@ const factory_1 = require("../../../../factory");
 const validateInvoiceReferencesOrder_1 = require("./validation/validateInvoiceReferencesOrder");
 const validateMovieTicket_1 = require("./validation/validateMovieTicket");
 const validatePrice_1 = require("./validation/validatePrice");
-const debug = (0, debug_1.default)('chevre-domain:service:transaction');
+const debug = (0, debug_1.default)('chevre-domain:service:transaction:placeOrder:confirm:validation');
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, 
-// authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[],
-eventReservationAcceptedOffers, payTransactions, customer) {
+function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, eventReservationAcceptedOffers, payTransactions, customer) {
     // validateProfile(transaction);
     validateProfile({ customer });
     (0, validatePrice_1.validatePrice)(authorizePaymentActions, authorizeEventServiceOfferActions);
@@ -33,7 +31,6 @@ eventReservationAcceptedOffers, payTransactions, customer) {
     // validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOfferActions); // discontinue(2026-07-06~)
     // 利用可能なMovieTicketIF決済方法タイプに対して動的にコーディング
     const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentActions, eventReservationAcceptedOffers);
-    debug('processing validateMovieTicket... movieTicketPaymentMethodTypes:', movieTicketPaymentMethodTypes);
     if (Array.isArray(movieTicketPaymentMethodTypes) && movieTicketPaymentMethodTypes.length > 0) {
         movieTicketPaymentMethodTypes.forEach((paymentMethodType) => {
             const authorizeMovieTicketActions = authorizePaymentActions.filter((a) => {
@@ -59,7 +56,6 @@ eventReservationAcceptedOffers, payTransactions, customer) {
                     authorizedMovieTickets.push(...object.paymentMethod.movieTickets);
                 }
             });
-            debug(authorizedMovieTickets.length, 'movie tickets authorized', 'transaction:', transaction.id);
             // validateMovieTicket(paymentMethodType, { id: transaction.id }, authorizePaymentActions, eventReservationAcceptedOffers);
             (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, { id: transaction.id }, authorizedMovieTickets, eventReservationAcceptedOffers);
         });
@@ -95,18 +91,6 @@ function findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentAction
     // ];
     return [...new Set(paymentMethodTypes)];
 }
-// function validateProfile(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'object'>) {
-//     // object.customerで検証(2022-05-26~)
-//     const profile = transaction.object.customer;
-//     const profileSatisfied = typeof profile?.typeOf === 'string' && profile.typeOf.length > 0
-//         && typeof profile.email === 'string' && profile.email.length > 0
-//         && typeof profile.familyName === 'string' && profile.familyName.length > 0
-//         && typeof profile.givenName === 'string' && profile.givenName.length > 0
-//         && typeof profile.telephone === 'string' && profile.telephone.length > 0;
-//     if (!profileSatisfied) {
-//         throw new factory.errors.Argument('Transaction', 'Customer Profile Required');
-//     }
-// }
 function validateProfile(params) {
     const profile = params.customer;
     const profileSatisfied = typeof profile?.typeOf === 'string' && profile.typeOf.length > 0
@@ -257,7 +241,6 @@ function validateAcceptedOffers(params) {
     });
     if (ticketIdentifiers.length > 0) {
         ticketIdentifiers = [...new Set(ticketIdentifiers)];
-        debug('ticketIdentifiers unique?', ticketIdentifiers.join(' '), 'numAcceptedOffers:', numAcceptedOffers);
         // チケット識別子が注文内ユニークなので、注文オファー数に一致するはず
         if (ticketIdentifiers.length !== numAcceptedOffers) {
             throw new factory_1.factory.errors.Argument('Transaction', 'ticketIdentifiers must be unique');
@@ -274,7 +257,6 @@ function validateAcceptedOffers(params) {
     });
     if (ticketNumbers.length > 0) {
         ticketNumbers = [...new Set(ticketNumbers)];
-        debug('ticketNumbers unique?', ticketNumbers.join(' '), 'numAcceptedOffers:', numAcceptedOffers);
         // チケット識別子が注文内ユニークなので、注文オファー数に一致するはず
         if (ticketNumbers.length !== numAcceptedOffers) {
             throw new factory_1.factory.errors.Argument('Transaction', 'ticketNumbers must be unique');
@@ -313,6 +295,34 @@ function validatePaymentMethods(params, options) {
  * 興行オファー適用条件確認
  */
 function validateEventOffers(params) {
+    const { unitPriceOfferConditions } = params;
+    /**
+     * 以下処理で検証に使用するアクション結果リスト
+     */
+    let validatingAuthorizeOfferActions;
+    // 承認アクションと比較する
+    if (Array.isArray(unitPriceOfferConditions)) {
+        const everyActionsMatched = unitPriceOfferConditions.length === params.authorizeOfferActions.length
+            && params.authorizeOfferActions.every((authorizeEventServiceOfferAction) => {
+                const conditionExpected = unitPriceOfferConditions.find(({ id }) => id === authorizeEventServiceOfferAction.id);
+                const resultMatched = (0, util_1.isDeepStrictEqual)(conditionExpected?.result, authorizeEventServiceOfferAction.result);
+                debug('validateEventOffers: unitPriceOfferConditions: resultMatched?', resultMatched, params.project.id, authorizeEventServiceOfferAction.id);
+                if (!resultMatched) {
+                    console.error('validateEventOffers: unitPriceOfferConditions not matched!', params.project.id, authorizeEventServiceOfferAction.id, conditionExpected?.result, authorizeEventServiceOfferAction.result);
+                }
+                return resultMatched;
+            });
+        // 全アクションについて結果が一致していればunitPriceOfferConditionsを採用する(2026-07-07~)
+        if (everyActionsMatched) {
+            validatingAuthorizeOfferActions = [...unitPriceOfferConditions];
+        }
+        else {
+            validatingAuthorizeOfferActions = [...params.authorizeOfferActions];
+        }
+    }
+    else {
+        validatingAuthorizeOfferActions = [...params.authorizeOfferActions];
+    }
     const { paymentMethods } = params;
     const firstCreditCardPaymentMethodIdentifier = paymentMethods.find((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.CreditCard
@@ -322,7 +332,7 @@ function validateEventOffers(params) {
         return referenceInvoice.issuedThrough.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.FaceToFace;
     }).length;
-    params.authorizeEventServiceOfferActions.forEach((a) => {
+    validatingAuthorizeOfferActions.forEach((a) => {
         // support result.offers(2024-06-18~)
         const acceptedOffersInResult = a.result?.offers;
         if (Array.isArray(acceptedOffersInResult) && acceptedOffersInResult.length > 0) {
@@ -348,20 +358,18 @@ function validateEventOffers(params) {
                 // }
                 // 適用数量検証(全興行オファー承認アクションについて)(2023-11-15~)
                 // 適用数量要件を満たしていなければエラー
-                const numAcceptedOffersByOfferId = params.authorizeEventServiceOfferActions.reduce((previousNumOffer, { result }) => {
+                const numAcceptedOffersByOfferId = validatingAuthorizeOfferActions.reduce((previousNumOffer, { result }) => {
                     const numOfferOnCurrentAction = result?.offers?.find(({ id }) => id === offerId)?.includesObject.amountOfThisGood;
                     return previousNumOffer + ((typeof numOfferOnCurrentAction === 'number') ? numOfferOnCurrentAction : 0);
                 }, 0);
                 const eligibleQuantityMaxValue = unitPriceSpec?.eligibleQuantity?.maxValue;
                 if (typeof eligibleQuantityMaxValue === 'number') {
-                    debug('validateEventOffers: numAcceptedOffersByOfferId > eligibleQuantityMaxValue?', numAcceptedOffersByOfferId, eligibleQuantityMaxValue);
                     if (numAcceptedOffersByOfferId > eligibleQuantityMaxValue) {
                         throw new factory_1.factory.errors.Argument('Transaction', `Number of offer:${offerId} must be less than or equal to ${eligibleQuantityMaxValue}`);
                     }
                 }
                 const eligibleQuantityMinValue = unitPriceSpec?.eligibleQuantity?.minValue;
                 if (typeof eligibleQuantityMinValue === 'number') {
-                    debug('validateEventOffers: numAcceptedOffersByOfferId < eligibleQuantityMinValue?', numAcceptedOffersByOfferId, eligibleQuantityMinValue);
                     if (numAcceptedOffersByOfferId < eligibleQuantityMinValue) {
                         throw new factory_1.factory.errors.Argument('Transaction', `Number of offer:${offerId} must be more than or equal to ${eligibleQuantityMinValue}`);
                     }
@@ -372,7 +380,6 @@ function validateEventOffers(params) {
                     const satisfyAcceptedPaymentMethod = numCreditCardOrFaceToFacePaymentMethod === 1
                         && typeof firstCreditCardPaymentMethodIdentifier === 'string'
                         && acceptedPaymentMethodTypes.includes(firstCreditCardPaymentMethodIdentifier);
-                    debug('validateEventOffers: satisfyAcceptedPaymentMethod?', JSON.stringify(acceptedPaymentMethodTypes));
                     if (!satisfyAcceptedPaymentMethod) {
                         throw new factory_1.factory.errors.Argument('Transaction', `acceptedPaymentMethod requirement not satisfied`);
                     }
@@ -381,7 +388,7 @@ function validateEventOffers(params) {
         }
     });
     // check programMembershipUsed(2024-08-15~)
-    const programMembershipRequired = params.authorizeEventServiceOfferActions.reduce((a, b) => {
+    const programMembershipRequired = validatingAuthorizeOfferActions.reduce((a, b) => {
         const programMembershipUsedfromResult = b.result?.itemOffered?.serviceOutput.programMembershipUsed;
         if (Array.isArray(programMembershipUsedfromResult)) {
             a.push(...programMembershipUsedfromResult);

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

@@ -116,9 +116,10 @@ function confirm(params, options) {
         }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // 単価オファーの全適用条件を検証するために、単価オファーを参照(2026-07-06~)
+        let unitPriceOfferConditions;
         const { usePrepareUnitPriceOfferConditions } = options;
         if (usePrepareUnitPriceOfferConditions === true) {
-            await (0, prepareUnitPriceOfferConditions_1.prepareUnitPriceOfferConditions)({
+            unitPriceOfferConditions = await (0, prepareUnitPriceOfferConditions_1.prepareUnitPriceOfferConditions)({
                 project: { id: transaction.project.id, },
                 acceptedOffers,
                 authorizeEventServiceOfferActions
@@ -144,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') {
@@ -329,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)({
@@ -400,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,
@@ -433,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.3",
+    "@chevre/factory": "9.5.0-alpha.4",
     "@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.5"
+  "version": "25.2.0-alpha.7"
 }