@chevre/domain 25.2.0-alpha.40 → 25.2.0-alpha.41

package/lib/chevre/repo/offer/unitPriceInCatalog.d.ts

@@ -138,7 +138,11 @@ export declare class OfferRepo implements OfferInCatalogReadOnlyRepo {
         unacceptedPaymentMethod: string[];
     }): Promise<boolean>;
     count(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
+    /**
+     * @deprecated use findUnitPriceOffers
+     */
     search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<IOfferInCatalog[]>;
+    findUnitPriceOffers(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<IOfferInCatalog[]>;
     /**
      * サブカタログから集計オファーIDリストを検索する
      */

package/lib/chevre/repo/offer/unitPriceInCatalog.js

@@ -384,6 +384,9 @@ class OfferRepo {
             .exec();
         return (result.length > 0) ? result[0].offerCount : 0;
     }
+    /**
+     * @deprecated use findUnitPriceOffers
+     */
     async search(params, projection) {
         const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(params);
         const projectStage = OfferRepo.CREATE_AGGREGATE_OFFERS_PROJECTION({ ...projection });
@@ -421,6 +424,43 @@ class OfferRepo {
         }
         return aggregate.exec();
     }
+    async findUnitPriceOffers(params, projection) {
+        const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(params);
+        const projectStage = OfferRepo.CREATE_AGGREGATE_OFFERS_PROJECTION({ ...projection });
+        const sortByPrice = params.sort?.['priceSpecification.price'];
+        const sortByIdentifier = params.sort?.identifier;
+        const aggregate = this.aggregateOfferModel.aggregate([
+            ...matchStages, // match -> unwind(2026-07-23~)
+            {
+                $unwind: {
+                    path: '$offers',
+                    includeArrayIndex: OFFERS_ARRAY_INDEX_NAME
+                }
+            },
+            ...(typeof sortByPrice === 'number' || typeof sortByIdentifier === 'number')
+                ? [
+                    {
+                        $sort: {
+                            ...(typeof sortByPrice === 'number')
+                                ? { 'offers.priceSpecification.price': sortByPrice }
+                                : undefined,
+                            ...(typeof sortByIdentifier === 'number')
+                                ? { 'offers.identifier': sortByIdentifier }
+                                : undefined
+                        }
+                    }
+                ]
+                : [],
+            { $project: projectStage }
+        ]);
+        /* istanbul ignore else */
+        if (typeof params.limit === 'number' && params.limit > 0) {
+            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            aggregate.limit(params.limit * page)
+                .skip(params.limit * (page - 1));
+        }
+        return aggregate.exec();
+    }
     /**
      * サブカタログから集計オファーIDリストを検索する
      */

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

@@ -310,7 +310,8 @@ function validateAcceptedOffers(params) {
         // 指定された単価オファーを検索
         // ticketCodeで検索(2023-03-22~)
         if (offerIdentifiers.length > 0) {
-            availableUnitPriceOffers = await repos.offer.search({
+            // availableUnitPriceOffers = await repos.offer.search({
+            availableUnitPriceOffers = await repos.offer.findUnitPriceOffers({
                 identifier: { $in: offerIdentifiers },
                 project: { id: { $eq: params.project.id } }
             });

package/lib/chevre/service/task/onResourceUpdated/onAggregateOfferUpdated.js

@@ -11,7 +11,7 @@ function createInformOfferTasks(params, setting) {
         }
         // const informResources = settings.onResourceUpdated.informResource;
         const informResources = setting?.onResourceUpdated?.informResource;
-        const offers = await repos.offer.search({
+        const offers = await repos.offer.findUnitPriceOffers({
             id: { $in: params.ids }
         }, { typeOf: 1, name: 1, priceSpecification: 1, additionalProperty: 1, identifier: 1, project: 1 });
         const offers4inform = offers.map(({ id, typeOf, name, priceSpecification, additionalProperty, identifier, project }) => {

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

@@ -88,7 +88,7 @@ function prepareUnitPriceOfferConditions(params) {
         }
         const conditions = [];
         const offerIds = [...new Set(params.acceptedOffers.map((o) => String(o.id)))];
-        const unitPriceOffers = await repos.offer.search({
+        const unitPriceOffers = await repos.offer.findUnitPriceOffers({
             id: { $in: offerIds }
         }, {
             acceptedPaymentMethod: 1,

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -28,7 +28,7 @@ function preStart(params) {
         await validateOrder({ orders })();
         let offers = [];
         if (offerIds.length > 0) {
-            offers = await repos.offer.search({
+            offers = await repos.offer.findUnitPriceOffers({
                 id: { $in: offerIds }
             });
         }

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.40"
+  "version": "25.2.0-alpha.41"
 }