@chevre/domain 24.1.0-alpha.13 → 24.1.0-alpha.14

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

@@ -36,7 +36,6 @@ export declare class AcceptedOfferRepo {
     searchAcceptedOffersByOrderNumber(filter: {
         limit?: number;
         page?: number;
-        $slice?: [number, number];
         orderNumber: {
             $eq: string;
         };
@@ -53,9 +52,6 @@ export declare class AcceptedOfferRepo {
                 id?: {
                     $eq?: string;
                 };
-                typeOf?: {
-                    $in?: factory.order.IItemOffered['typeOf'][];
-                };
                 reservationFor?: {
                     id?: {
                         $in?: string[];

package/lib/chevre/repo/acceptedOffer.js

@@ -53,14 +53,14 @@ class AcceptedOfferRepo {
     }
     async aggreateOwnershipInfosByOrder(filter) {
         const aggregate = this.orderModel.aggregate([
+            { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
+            { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } },
             {
                 $unwind: {
                     path: '$acceptedOffers',
                     includeArrayIndex: 'acceptedOfferIndex'
                 }
             },
-            { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
-            { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } },
             {
                 $project: {
                     _id: 0,
@@ -82,21 +82,32 @@ class AcceptedOfferRepo {
      * 注文オファーを展開して検索する
      */
     async searchAcceptedOffersByOrderNumber(filter, inclusion) {
-        const matchStages = [
+        /**
+         * unwind前に1ドキュメントを特定するためのstage
+         */
+        const matchStagesOneDocument = [
             { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
             { $match: { 'project.id': { $eq: filter.project.id.$eq } } },
             { $match: { typeOf: { $eq: factory_1.factory.order.OrderType.Order } } }
         ];
+        /**
+         * unwind後にオファー内容で絞るstage
+         */
+        const matchStages = [
+        // { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } }, // matchStagesOneDocumentへ移行(2026-05-12~)
+        // { $match: { 'project.id': { $eq: filter.project.id.$eq } } }, // matchStagesOneDocumentへ移行(2026-05-12~)
+        // { $match: { typeOf: { $eq: factory.order.OrderType.Order } } } // matchStagesOneDocumentへ移行(2026-05-12~)
+        ];
         const itemOfferedIdEq = filter.acceptedOffers?.itemOffered?.id?.$eq;
         if (typeof itemOfferedIdEq === 'string') {
             matchStages.push({ $match: { 'acceptedOffers.itemOffered.id': { $exists: true, $eq: itemOfferedIdEq } } });
         }
-        const itemOfferedTypeOfIn = filter.acceptedOffers?.itemOffered?.typeOf?.$in;
-        if (Array.isArray(itemOfferedTypeOfIn)) {
-            matchStages.push({
-                $match: { 'acceptedOffers.itemOffered.typeOf': { $exists: true, $in: itemOfferedTypeOfIn } }
-            });
-        }
+        // const itemOfferedTypeOfIn = filter.acceptedOffers?.itemOffered?.typeOf?.$in;
+        // if (Array.isArray(itemOfferedTypeOfIn)) {
+        //     matchStages.push({
+        //         $match: { 'acceptedOffers.itemOffered.typeOf': { $exists: true, $in: itemOfferedTypeOfIn } }
+        //     });
+        // }
         const resevationForIdIn = filter.acceptedOffers?.itemOffered?.reservationFor?.id?.$in;
         if (Array.isArray(resevationForIdIn)) {
             matchStages.push({
@@ -114,9 +125,7 @@ class AcceptedOfferRepo {
             });
         }
         const aggregate = this.orderModel.aggregate([
-            // if (typeof params.sort?.orderDate === 'number') {
-            //     aggregate.sort({ orderDate: params.sort.orderDate });
-            // }
+            ...matchStagesOneDocument,
             {
                 $unwind: {
                     path: '$acceptedOffers'
@@ -148,8 +157,11 @@ class AcceptedOfferRepo {
         }
         if (typeof filter.limit === 'number' && filter.limit > 0) {
             const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
-            aggregate.limit(filter.limit * page)
-                .skip(filter.limit * (page - 1));
+            // support skip -> limit(2026-05-12~)
+            // aggregate.limit(filter.limit * page)
+            //     .skip(filter.limit * (page - 1));
+            aggregate.skip(filter.limit * (page - 1))
+                .limit(filter.limit);
         }
         return aggregate
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })

package/lib/chevre/service/order/deleteOrder.js

@@ -94,7 +94,7 @@ function deleteReservationsByOrder(order) {
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
             acceptedOffers: {
-                itemOffered: { typeOf: { $in: [factory_2.factory.reservationType.EventReservation] } }
+            // itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
             }
         });
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));

package/lib/chevre/service/reserve/searchByOrder.js

@@ -11,14 +11,18 @@ function searchByOrder(params) {
             page: params.page,
             project: { id: { $eq: params.project.id } },
             orderNumber: { $eq: params.orderNumber },
-            acceptedOffers: { itemOffered: { typeOf: { $in: [reservationType] } } }
+            acceptedOffers: {
+                itemOffered: {
+                // typeOf: { $in: [reservationType] }
+                }
+            }
         }, ['itemOffered']);
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {
                 return offer.itemOffered.id;
             }
             else {
-                // 検索条件にreservationTypeを含めているので、ありえないケース
+                // EventReservationしか存在しないので、ありえないケース
                 throw new factory_1.factory.errors.Internal(`unexpected itemOffered.typeOf ${offer.itemOffered.typeOf}`);
             }
         });

package/lib/chevre/service/task/payment/payByTask.js

@@ -71,7 +71,7 @@ function fixOrderAsPurpose(params, transaction) {
                 project: { id: { $eq: transaction.project.id } },
                 acceptedOffers: {
                     itemOffered: {
-                        typeOf: { $in: [factory_1.factory.reservationType.EventReservation] },
+                        // typeOf: { $in: [factory.reservationType.EventReservation] }, // EventReservationしか存在しないので不要(2026-05-12~)
                         // movieTicketsに結合されたイベントID,座席コードで絞る
                         reservationFor: { id: { $in: [reservationForId] } },
                         reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }

package/package.json

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