@chevre/domain 21.8.0-alpha.39 → 21.8.0-alpha.40

package/example/src/chevre/searchOffersByCatalog.ts

@@ -5,21 +5,27 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
     const { offers } = await offerRepo.findOffersByOfferCatalogId({
-        ids: ['al96nqj7z', 'xxx', '1001'],
+        limit: 100,
+        page: 1,
+        // ids: ['aldzf0vrk', 'xxx', '1001'],
         // ids: ['xx', 'xxx'],
         offerCatalog: {
-            id: '0001'
+            id: 'bllroybre'
             // id: 'xxx'
         },
         excludeAppliesToMovieTicket: false
     });
-    console.log(offers.map((o) => o.id));
+    // console.log(offers);
+    console.log(offers.map((offer) => {
+        return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id}`;
+    }));
     console.log(offers.length);
+    console.log('USE_AGGREGATE_OFFERS_AS_PRIMARY:', process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY);
 }
 
 main()

package/lib/chevre/repo/offer.js

@@ -830,7 +830,8 @@ class MongoRepository {
                             }
                             : undefined)
                     }, onlyValid: params.onlyValid === true }), (typeof params.limit === 'number' && typeof params.page === 'number')
-                    ? { sort: { _id: factory.sortType.Ascending } }
+                    // 明示的なソート指定を調整(決して重複しない属性が相応)(2023-09-07~)
+                    ? { sort: { identifier: factory.sortType.Ascending } }
                     : undefined), (typeof params.limit === 'number') ? { limit: params.limit } : undefined), (typeof params.page === 'number') ? { page: params.page } : undefined);
                 // USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG対応(2023-09-06~)
                 offers = yield this.search(searchOffersConditions, params.projection, settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG);
@@ -926,11 +927,13 @@ class MongoRepository {
                 query.limit(params.limit)
                     .skip(params.limit * (page - 1));
             }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price']) === 'number') {
-                query.sort(Object.assign({ 'priceSpecification.price': params.sort['priceSpecification.price'] }, (typeof ((_b = params.sort) === null || _b === void 0 ? void 0 : _b.identifier) === 'number')
-                    ? { identifier: params.sort.identifier }
+            const sortByPrice = (_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price'];
+            const sortByIdentifier = (_b = params.sort) === null || _b === void 0 ? void 0 : _b.identifier;
+            if (typeof sortByPrice === 'number' || typeof sortByIdentifier === 'number') {
+                query.sort(Object.assign(Object.assign({}, (typeof sortByPrice === 'number')
+                    ? { 'priceSpecification.price': sortByPrice }
+                    : undefined), (typeof sortByIdentifier === 'number')
+                    ? { identifier: sortByIdentifier }
                     : undefined));
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
@@ -1479,6 +1482,8 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = MongoRepository.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
             const projectStage = MongoRepository.CREATE_AGGREGATE_OFFERS_PROJECTION(Object.assign({}, projection));
+            const sortByPrice = (_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price'];
+            const sortByIdentifier = (_b = params.sort) === null || _b === void 0 ? void 0 : _b.identifier;
             const aggregate = this.aggregateOfferModel.aggregate([
                 {
                     $unwind: {
@@ -1487,11 +1492,13 @@ class MongoRepository {
                     }
                 },
                 ...matchStages,
-                ...(typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price']) === 'number')
+                ...(typeof sortByPrice === 'number' || typeof sortByIdentifier === 'number')
                     ? [
                         {
-                            $sort: Object.assign({ 'offers.priceSpecification.price': params.sort['priceSpecification.price'] }, (typeof ((_b = params.sort) === null || _b === void 0 ? void 0 : _b.identifier) === 'number')
-                                ? { 'offers.identifier': params.sort.identifier }
+                            $sort: Object.assign(Object.assign({}, (typeof sortByPrice === 'number')
+                                ? { 'offers.priceSpecification.price': sortByPrice }
+                                : undefined), (typeof sortByIdentifier === 'number')
+                                ? { 'offers.identifier': sortByIdentifier }
                                 : undefined)
                         }
                     ]

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.39"
+  "version": "21.8.0-alpha.40"
 }