@chevre/domain 25.2.0-alpha.13 → 25.2.0-alpha.15

package/lib/chevre/repo/action.d.ts

@@ -10,6 +10,7 @@ export { ICancelActionAction };
 type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction | factory.actionType.AuthorizeAction | factory.actionType.PayAction | factory.actionType.RefundAction>;
 type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl | factory.recipe.RecipeCategory.checkMovieTicket | factory.recipe.RecipeCategory.acceptCOAOffer | factory.recipe.RecipeCategory.authorizeInvoice | factory.recipe.RecipeCategory.authorizeInvoice3ds | factory.recipe.RecipeCategory.payCreditCard | factory.recipe.RecipeCategory.payMovieTicket | factory.recipe.RecipeCategory.refundCreditCard | factory.recipe.RecipeCategory.refundMovieTicket>>;
 export interface IDeleteActionResult {
+    identifier: string;
     deletedCount?: number;
 }
 /**

package/lib/chevre/repo/action.js

@@ -325,35 +325,48 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
         }
         const filters = [
             {
-                'project.id': { $eq: project.id },
-                'object.orderNumber': { $exists: true, $eq: orderNumber }
+                identifier: 'byObject',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    'object.orderNumber': { $exists: true, $eq: orderNumber }
+                }
             },
             {
-                'project.id': { $eq: project.id },
-                'purpose.orderNumber': { $exists: true, $eq: orderNumber }
+                identifier: 'byPurpose',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    'purpose.orderNumber': { $exists: true, $eq: orderNumber }
+                }
             },
             {
-                'project.id': { $eq: project.id },
-                'about.orderNumber': { $exists: true, $eq: orderNumber }
+                identifier: 'byAbout',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    'about.orderNumber': { $exists: true, $eq: orderNumber }
+                }
             },
             {
-                'project.id': { $eq: project.id },
-                'instrument.orderNumber': { $exists: true, $eq: orderNumber }
+                identifier: 'byInstrument',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    'instrument.orderNumber': { $exists: true, $eq: orderNumber }
+                }
             },
         ];
-        const results = await Promise.all(filters.map(async (filter) => {
+        return Promise.all(filters.map(async ({ identifier, filter }) => {
             return this.actionModel.deleteMany(filter)
-                .exec();
+                .exec()
+                .then((result) => {
+                return {
+                    identifier,
+                    // n: result?.n,
+                    // opTime: result.opTime,
+                    // ok: result?.ok,
+                    // operationTime,
+                    deletedCount: result?.deletedCount
+                };
+            });
         }));
-        return results.map((result) => {
-            return {
-                // n: result?.n,
-                // opTime: result.opTime,
-                // ok: result?.ok,
-                // operationTime,
-                deletedCount: result?.deletedCount
-            };
-        });
     }
     async deleteByProject(params) {
         await this.actionModel.deleteMany({
@@ -408,32 +421,39 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
         }
         const filters = [
             {
-                'project.id': { $eq: project.id },
-                typeOf: { $in: params.typeOf.$in },
-                'purpose.id': { $exists: true, $eq: transaction.id },
-                'purpose.typeOf': { $exists: true, $eq: transaction.typeOf }
+                identifier: 'byPurpose',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    typeOf: { $in: params.typeOf.$in },
+                    'purpose.id': { $exists: true, $eq: transaction.id },
+                    'purpose.typeOf': { $exists: true, $eq: transaction.typeOf }
+                }
             },
             // instrumentによるアクション削除にも対応(2026-07-10~)
             {
-                'project.id': { $eq: project.id },
-                // typeOf: { $in: params.typeOf.$in }, // typOfでフィルターしない
-                'instrument.id': { $exists: true, $eq: transaction.id },
-                'instrument.typeOf': { $exists: true, $eq: transaction.typeOf }
+                identifier: 'byInstrument',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    // typeOf: { $in: params.typeOf.$in }, // typOfでフィルターしない
+                    'instrument.id': { $exists: true, $eq: transaction.id },
+                    'instrument.typeOf': { $exists: true, $eq: transaction.typeOf }
+                }
             }
         ];
-        const results = await Promise.all(filters.map(async (filter) => {
+        return Promise.all(filters.map(async ({ identifier, filter }) => {
             return this.actionModel.deleteMany(filter)
-                .exec();
+                .exec()
+                .then((result) => {
+                return {
+                    identifier,
+                    // n: result?.n,
+                    // opTime: result.opTime,
+                    // ok: result?.ok,
+                    // operationTime,
+                    deletedCount: result?.deletedCount
+                };
+            });
         }));
-        return results.map((result) => {
-            return {
-                // n: result?.n,
-                // opTime: result.opTime,
-                // ok: result?.ok,
-                // operationTime,
-                deletedCount: result?.deletedCount
-            };
-        });
     }
     getCursor(conditions, projection) {
         return this.actionModel.find(conditions, projection)

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -31,7 +31,11 @@ declare function acceptedOffers2authorizeResult(params: {
     acceptedOffers4result: IResultAcceptedOffer[];
     noOfferSpecified: boolean;
     ticketOffers: factory.product.ITicketOffer[];
-}): factory.action.authorize.offer.eventService.IResult;
+}, options: {
+    useLegacyAuthorizeOfferResult: boolean;
+}): factory.action.authorize.offer.eventService.IResult & {
+    onlyPrice?: boolean;
+};
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export type IResultAcceptedOffer = Omit<factory.order.IOptimizedAcceptedOffer, 'priceSpecification'> & {
     itemOffered: factory.order.IEventReservation;

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

@@ -172,7 +172,8 @@ function acceptedOffers2programMembershipUsed(params) {
     });
     return programMembershipUsed;
 }
-function acceptedOffers2authorizeResult(params) {
+function acceptedOffers2authorizeResult(params, options) {
+    const { useLegacyAuthorizeOfferResult } = options;
     const { acceptedOffers4result, noOfferSpecified, ticketOffers } = params;
     // const priceCurrency = factory.priceCurrency.JPY; // fix(2024-07-03~)
     let offers;
@@ -211,16 +212,25 @@ function acceptedOffers2authorizeResult(params) {
             };
         });
     }
-    return {
-        typeOf: factory_1.factory.offerType.AggregateOffer,
-        // priceCurrency, // discontinue(2026-07-06~)
-        // amount: [], // discontinue(2026-07-06~)
-        itemOffered: {
-            serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
-        },
-        ...(typeof price === 'number') ? { price } : undefined,
-        ...(Array.isArray(offers)) ? { offers } : undefined
-    };
+    if (useLegacyAuthorizeOfferResult) {
+        return {
+            typeOf: factory_1.factory.offerType.AggregateOffer,
+            // priceCurrency, // discontinue(2026-07-06~)
+            // amount: [], // discontinue(2026-07-06~)
+            itemOffered: {
+                serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
+            },
+            ...(typeof price === 'number') ? { price } : undefined,
+            ...(Array.isArray(offers)) ? { offers } : undefined
+        };
+    }
+    else {
+        return {
+            typeOf: factory_1.factory.offerType.AggregateOffer,
+            onlyPrice: true,
+            ...(typeof price === 'number') ? { price } : undefined,
+        };
+    }
 }
 function responseBody2acceptedOffers4result(params) {
     let acceptedOffers4result = [];

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -67,6 +67,10 @@ interface IAuthorizeOptions {
      * 2026-07-04~
      */
     useLegacyAuthorizeOfferObject: boolean;
+    /**
+     * 2026-07-10~
+     */
+    useLegacyAuthorizeOfferResult: boolean;
 }
 /**
  * 興行オファー承認

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

@@ -78,7 +78,7 @@ function authorize(params, options) {
             }
             throw error;
         }
-        const result = (0, factory_2.acceptedOffers2authorizeResult)({ acceptedOffers4result, noOfferSpecified, ticketOffers });
+        const result = (0, factory_2.acceptedOffers2authorizeResult)({ acceptedOffers4result, noOfferSpecified, ticketOffers }, options);
         await repos.authorizeOfferAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id, result };
     };

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

@@ -1,6 +1,10 @@
 import { factory } from '../../../../../factory';
 export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object' | 'result' | 'endDate'>;
-export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
+export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction & {
+    result?: factory.action.authorize.offer.eventService.IResult & {
+        onlyPrice?: boolean;
+    };
+};
 export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate'> & {
     object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf' | 'paymentMethodId'>;
     instrument?: never;

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

@@ -305,7 +305,15 @@ function validateEventOffers(params) {
         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);
+                let resultMatched;
+                // 承認アクションのresultが最適化済の場合,price以外を比較しても意味がないので比較しない(2026-07-10~)
+                if (authorizeEventServiceOfferAction.result?.onlyPrice === true) {
+                    resultMatched = typeof conditionExpected?.result?.price === 'number'
+                        && conditionExpected?.result.price === authorizeEventServiceOfferAction.result.price;
+                }
+                else {
+                    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);

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.13"
+  "version": "25.2.0-alpha.15"
 }