@chevre/domain 22.11.0-alpha.2 → 22.11.0-alpha.3

package/example/src/chevre/orders/searchWithUnwoundAcceptedOffers.ts

@@ -0,0 +1,73 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const formatter = new Intl.NumberFormat('ja-JP');
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    let startTime: [number, number] = process.hrtime();
+    let diff: [number, number] = process.hrtime(startTime);
+
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
+
+    startTime = process.hrtime();
+    const result = await acceptedOfferRepo.searchWithUnwoundAcceptedOffers(
+        {
+            project: { id: { $eq: project.id } },
+            limit: 20,
+            page: 12,
+            sort: {
+                orderDate: chevre.factory.sortType.Descending
+            },
+            orderStatuses: [chevre.factory.orderStatus.OrderDelivered],
+            orderDate: {
+                $gte: new Date('2025-06-07T15:00:00.000Z'),
+                $lte: new Date('2025-07-08T01:42:34.654Z')
+            },
+            acceptedOffers: {
+                itemOffered: {
+                    issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.EventService } },
+                    reservationFor: {
+                        inSessionFrom: new Date('2025-07-07T15:00:00.000Z'),
+                        inSessionThrough: new Date('2025-07-08T15:00:00.000Z'),
+                        superEvent: {
+                            location: { branchCodes: ['p006'] }
+                        }
+                    }
+                }
+            },
+            seller: { ids: ['62568df4138ef5000b18c8c0'] },
+            provider: { id: { $eq: '62568df4138ef5000b18c8c0' } }
+            // // req.seller.idを考慮(2023-07-19~)
+            // ...(typeof req.seller?.id === 'string') ? { provider: { id: { $eq: req.seller.id } } } : undefined
+        },
+        {
+            confirmationNumber: 1,
+            customer: 1,
+            dateReturned: 1,
+            orderDate: 1,
+            orderNumber: 1,
+            orderStatus: 1,
+            paymentMethods: 1,
+            price: 1,
+            priceCurrency: 1,
+            project: 1,
+            seller: 1
+        },
+        { useLimitAfterSkip: false }
+        // { useLimitAfterSkip: true }
+    );
+    diff = process.hrtime(startTime);
+    console.log(result.map(({ orderNumber, orderDate }) => `${orderDate} ${orderNumber}`));
+    console.log(result.length);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -20,7 +20,9 @@ export declare class AcceptedOfferRepo {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffers): Promise<factory.order.IOrder[]>;
+    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection: IProjection4searchWithUnwoundAcceptedOffers, options: {
+        useLimitAfterSkip: boolean;
+    }): Promise<factory.order.IOrder[]>;
     aggreateOwnershipInfosByOrder(filter: {
         orderNumber: {
             $eq: string;

package/lib/chevre/repo/acceptedOffer.js

@@ -24,9 +24,10 @@ class AcceptedOfferRepo {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffers(params, projection) {
+    searchWithUnwoundAcceptedOffers(params, projection, options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const { useLimitAfterSkip } = options;
             const conditions = order_2.OrderRepo.CREATE_MONGO_CONDITIONS(params);
             const aggregate = this.orderModel.aggregate();
             // pipelineの順序に注意
@@ -43,8 +44,15 @@ class AcceptedOfferRepo {
             aggregate.project(Object.assign(Object.assign({}, projection), { acceptedOffers: ['$acceptedOffers'] }));
             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));
+                // support skip -> limit(2025-07-09~)
+                if (useLimitAfterSkip) {
+                    aggregate.skip(params.limit * (page - 1))
+                        .limit(params.limit);
+                }
+                else {
+                    aggregate.limit(params.limit * page)
+                        .skip(params.limit * (page - 1));
+                }
             }
             return aggregate
                 // .allowDiskUse(true) // false化(2023-11-30~)

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.2"
+  "version": "22.11.0-alpha.3"
 }