@chevre/domain 21.8.0-alpha.31 → 21.8.0-alpha.33

package/example/src/chevre/searchOffersFromAggregateOffer.ts

@@ -5,144 +5,154 @@ import { chevre } from '../../../lib/index';
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
-    const offers = await offerRepo.searchFromAggregateOffer({
-        limit: 5,
-        page: 1,
-        sort: { 'priceSpecification.price': 1 },
-        project: { id: { $eq: String(process.env.PROJECT_ID) } },
-        availability: { $eq: chevre.factory.itemAvailability.InStock },
-        addOn: {
-            itemOffered: {
+    const offers = await offerRepo.searchFromAggregateOffer(
+        {
+            limit: 5,
+            page: 1,
+            sort: { 'priceSpecification.price': 1 },
+            project: { id: { $eq: String(process.env.PROJECT_ID) } },
+            availability: { $eq: chevre.factory.itemAvailability.InStock },
+            addOn: {
+                itemOffered: {
+                    /**
+                     * アドオンプロダクトID
+                     */
+                    id: {
+                        // $eq: ''
+                    }
+                }
+            },
+            availableAtOrFrom: {
+                id: {
+                    // $eq: ''
+                    // $in: string[]
+                }
+            },
+            eligibleMembershipType: {
                 /**
-                 * アドオンプロダクトID
+                 * 適用メンバーシップ区分
                  */
+                codeValue: {
+                    // $eq: 'Permit'
+                }
+            },
+            eligibleMonetaryAmount: {
+                /**
+                 * 適用通貨区分
+                 */
+                currency: {
+                    // $eq: 'Point'
+                }
+            },
+            eligibleSeatingType: {
+                /**
+                 * 適用座席区分
+                 */
+                codeValue: {
+                    // $eq: ''
+                }
+            },
+            hasMerchantReturnPolicy: {
                 id: {
                     // $eq: ''
                 }
-            }
-        },
-        availableAtOrFrom: {
-            id: {
-                // $eq: ''
-                // $in: string[]
-            }
-        },
-        eligibleMembershipType: {
-            /**
-             * 適用メンバーシップ区分
-             */
-            codeValue: {
-                // $eq: 'Permit'
-            }
-        },
-        eligibleMonetaryAmount: {
-            /**
-             * 適用通貨区分
-             */
-            currency: {
-                // $eq: 'Point'
-            }
-        },
-        eligibleSeatingType: {
-            /**
-             * 適用座席区分
-             */
-            codeValue: {
-                // $eq: ''
-            }
-        },
-        hasMerchantReturnPolicy: {
+            },
             id: {
-                // $eq: ''
-            }
-        },
-        id: {
-            // $eq: '1001'
-            // $in: string[];
-        },
-        identifier: {
-            // $eq: '1001'
-            // $in: string[];
-            // $regex: '003'
-        },
-        name: {
-            // $regex: ''
-        },
-        priceSpecification: {
-            appliesToMovieTicket: {
-                /**
-                 * 適用決済カード区分
-                 */
-                serviceType: {
+                // $eq: '1001'
+                // $in: string[];
+            },
+            identifier: {
+                // $eq: '1001'
+                // $in: string[];
+                // $regex: '003'
+            },
+            name: {
+                // $regex: ''
+            },
+            priceSpecification: {
+                appliesToMovieTicket: {
                     /**
-                     * 適用決済カード区分が存在するかどうか
+                     * 適用決済カード区分
                      */
-                    // $exists: boolean;
-                    // $eq: '01'
+                    serviceType: {
+                        /**
+                         * 適用決済カード区分が存在するかどうか
+                         */
+                        // $exists: boolean;
+                        // $eq: '01'
+                    },
+                    serviceOutput: {
+                        /**
+                         * 適用決済方法タイプ
+                         */
+                        typeOf: {
+                            // $eq: ''
+                            // $nin: string[];
+                        }
+                    }
                 },
-                serviceOutput: {
-                    /**
-                     * 適用決済方法タイプ
-                     */
-                    typeOf: {
-                        // $eq: ''
-                        // $nin: string[];
+                price: {
+                    // $gte: 100,
+                    // $lte: 500
+                },
+                referenceQuantity: {
+                    value: {
+                        // $eq: 2
+                    }
+                },
+                accounting: {
+                    accountsReceivable: {
+                        // $gte: 1800,
+                        // $lte: 100
+                    },
+                    operatingRevenue: {
+                        codeValue: {
+                            // $eq: ''
+                            // $in: string[];
+                        }
                     }
                 }
             },
-            price: {
-                // $gte: 100,
-                // $lte: 500
+            category: {
+                codeValue: {
+                    // $in: ['1']
+                }
             },
-            referenceQuantity: {
-                value: {
-                    // $eq: 2
+            itemOffered: {
+                typeOf: {
+                    // $eq: chevre.factory.product.ProductType.Product
                 }
             },
-            accounting: {
-                accountsReceivable: {
-                    // $gte: 1800,
-                    // $lte: 100
-                },
-                operatingRevenue: {
-                    codeValue: {
-                        // $eq: ''
-                        // $in: string[];
+            /**
+             * 有効期間設定がない、あるいは、有効期間内
+             */
+            // onlyValid: true
+            additionalProperty: {
+                $all: [
+                    {
+                        $elemMatch: {
+                            // name: { $eq: 'nameForPrinting' },
+                            // value: { $in: ['General'] }
+                        }
                     }
-                }
-            }
-        },
-        category: {
-            codeValue: {
-                // $in: ['1']
+                ]
             }
         },
-        itemOffered: {
-            typeOf: {
-                // $eq: chevre.factory.product.ProductType.Product
-            }
-        },
-        /**
-         * 有効期間設定がない、あるいは、有効期間内
-         */
-        // onlyValid: true
-        additionalProperty: {
-            $all: [
-                {
-                    $elemMatch: {
-                        // name: { $eq: 'nameForPrinting' },
-                        // value: { $in: ['General'] }
-                    }
-                }
-            ]
+        {
+            id: 1,
+            identifier: 1,
+            name: 1,
+            alternateName: 1,
+            priceSpecification: 1
         }
-    });
+    );
+    console.log(offers);
     console.log(offers.map((offer) => {
-        return `${offer.project.id} ${offer.id} ${offer.identifier} ${offer.name.ja} ${offer.priceSpecification.price}`;
+        return `${offer.project?.id} ${offer.id} ${offer.identifier} ${offer.name?.ja} ${offer.priceSpecification?.price}`;
     }));
     console.log(offers.length);
 }

package/lib/chevre/repo/mongoose/schemas/aggregateOffer.js

@@ -52,3 +52,125 @@ schema.index({ 'offers.identifier': 1, 'project.id': 1 }, {
     name: 'uniqueOfferIdentifier',
     unique: true
 });
+schema.index({ 'offers.availability': 1, 'offers.priceSpecification.price': 1 }, { name: 'searchByOffersAvailability' });
+schema.index({ 'offers.itemOffered.typeOf': 1, 'offers.priceSpecification.price': 1 }, { name: 'searchByOffersItemOfferedTypeOf' });
+schema.index({ 'offers.identifier': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersIdentifier',
+    partialFilterExpression: {
+        'offers.identifier': { $exists: true }
+    }
+});
+schema.index({ 'offers.priceSpecification.referenceQuantity.value': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersPriceSpecificationReferenceQuantityValue',
+    partialFilterExpression: {
+        'offers.priceSpecification.referenceQuantity.value': { $exists: true }
+    }
+});
+schema.index({ 'offers.priceSpecification.accounting.accountsReceivable': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersPriceSpecificationAccountingAccountsReceivable',
+    partialFilterExpression: {
+        'offers.priceSpecification.accounting.accountsReceivable': { $exists: true }
+    }
+});
+schema.index({ 'offers.priceSpecification.accounting.operatingRevenue.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersPriceSpecificationAccountingOperatingRevenueCodeValue',
+    partialFilterExpression: {
+        'offers.priceSpecification.accounting.operatingRevenue.codeValue': { $exists: true }
+    }
+});
+schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceType': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceType',
+    partialFilterExpression: {
+        'offers.priceSpecification.appliesToMovieTicket.serviceType': { $exists: true }
+    }
+});
+schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceOutputTypeOf',
+    partialFilterExpression: {
+        'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': { $exists: true }
+    }
+});
+schema.index({ 'offers.name.ja': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersNameJa',
+    partialFilterExpression: {
+        'offers.name.ja': { $exists: true }
+    }
+});
+schema.index({ 'offers.name.en': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersNameEn',
+    partialFilterExpression: {
+        'offers.name.en': { $exists: true }
+    }
+});
+schema.index({ 'offers.alternateName': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersAlternateName',
+    partialFilterExpression: {
+        'offers.alternateName': { $exists: true }
+    }
+});
+schema.index({ 'offers.category.id': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchOffersCategoryId',
+    partialFilterExpression: {
+        'offers.category.id': { $exists: true }
+    }
+});
+schema.index({ 'offers.category.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersCategoryCodeValue',
+    partialFilterExpression: {
+        'offers.category.codeValue': { $exists: true }
+    }
+});
+schema.index({ 'offers.availableAtOrFrom.id': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersAvailableAtOrFromId',
+    partialFilterExpression: {
+        'offers.availableAtOrFrom.id': { $exists: true }
+    }
+});
+schema.index({ 'offers.eligibleMembershipType.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersEligibleMembershipTypeCodeValue',
+    partialFilterExpression: {
+        'offers.eligibleMembershipType.codeValue': { $exists: true }
+    }
+});
+schema.index({ 'offers.eligibleMonetaryAmount.currency': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersEligibleMonetaryAmountCurrency',
+    partialFilterExpression: {
+        'offers.eligibleMonetaryAmount.currency': { $exists: true }
+    }
+});
+schema.index({ 'offers.eligibleSeatingType.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersEligibleSeatingTypeCodeValue',
+    partialFilterExpression: {
+        'offers.eligibleSeatingType.codeValue': { $exists: true }
+    }
+});
+schema.index({ 'offers.addOn.itemOffered.id': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersAddOnItemOfferedId',
+    partialFilterExpression: {
+        'offers.addOn.itemOffered.id': { $exists: true }
+    }
+});
+schema.index({ 'offers.hasMerchantReturnPolicy.id': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersHasMerchantReturnPolicyId',
+    partialFilterExpression: {
+        'offers.hasMerchantReturnPolicy.id': { $exists: true }
+    }
+});
+schema.index({ 'offers.additionalProperty': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersAdditionalProperty',
+    partialFilterExpression: {
+        'offers.additionalProperty': { $exists: true }
+    }
+});
+schema.index({ 'offers.validFrom': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersValidFrom',
+    partialFilterExpression: {
+        'offers.validFrom': { $exists: true }
+    }
+});
+schema.index({ 'offers.validThrough': 1, 'offers.priceSpecification.price': 1 }, {
+    name: 'searchByOffersValidThrough',
+    partialFilterExpression: {
+        'offers.validThrough': { $exists: true }
+    }
+});

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

@@ -23,8 +23,9 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import { BulkWriteResult as BulkWriteOpResultObject } from 'mongodb';
-import { Connection, PipelineStage } from 'mongoose';
+import { AnyExpression, Connection, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
+type IMatchStage = PipelineStage.Match;
 interface IProjection {
     [key: string]: 0 | 1;
 }
@@ -38,7 +39,10 @@ export declare class MongoRepository {
     private readonly taskModel;
     constructor(connection: Connection);
     static CREATE_OFFER_MONGO_CONDITIONS(params: factory.unitPriceOffer.ISearchConditions): any[];
-    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: factory.unitPriceOffer.ISearchConditions): PipelineStage.Match[];
+    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: factory.unitPriceOffer.ISearchConditions): IMatchStage[];
+    static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): {
+        [field: string]: AnyExpression;
+    };
     /**
      * カタログに含まれるオファーを検索する
      * カタログに登録されたオファーの順序は保証される
@@ -65,6 +69,9 @@ export declare class MongoRepository {
         sortedOfferIds: string[];
     }>;
     findById(params: {
+        project: {
+            id: string;
+        };
         id: string;
     }): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
     findAggregateOfferById(params: {
@@ -74,8 +81,12 @@ export declare class MongoRepository {
         id: string;
     }): Promise<factory.aggregateOffer.IAggregateOffer>;
     count(params: factory.unitPriceOffer.ISearchConditions): Promise<number>;
-    search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
-    searchFromAggregateOffer(params: factory.unitPriceOffer.ISearchConditions, __?: IProjection): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
+    search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection, 
+    /**
+     * 強制的にoffersコレクションを使用する
+     */
+    useOffersAsPrimary?: boolean): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
+    searchFromAggregateOffer(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
     save(params: factory.unitPriceOffer.IUnitPriceOffer): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
     /**
      * sskts専用オファー保管

package/lib/chevre/repo/offer.js

@@ -29,6 +29,7 @@ const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
 const task_1 = require("./mongoose/schemas/task");
 const task_2 = require("../eventEmitter/task");
 const settings_1 = require("../settings");
+const OFFERS_ARRAY_INDEX_NAME = 'offerIndex';
 /**
  * オファーリポジトリ
  */
@@ -712,6 +713,64 @@ class MongoRepository {
         }
         return matchStages;
     }
+    static CREATE_AGGREGATE_OFFERS_PROJECTION(params) {
+        let projectStage = {
+            _id: 0,
+            offerIndex: `$${OFFERS_ARRAY_INDEX_NAME}`,
+            typeOf: '$offers.typeOf',
+            project: '$project',
+            id: '$offers.id',
+            identifier: '$offers.identifier',
+            name: '$offers.name',
+            description: '$offers.description',
+            category: '$offers.category',
+            color: '$offers.color',
+            additionalProperty: '$offers.additionalProperty',
+            advanceBookingRequirement: '$offers.advanceBookingRequirement',
+            alternateName: '$offers.alternateName',
+            addOn: '$offers.addOn',
+            availability: '$offers.availability',
+            availableAtOrFrom: '$offers.availableAtOrFrom',
+            hasMerchantReturnPolicy: '$offers.hasMerchantReturnPolicy',
+            itemOffered: '$offers.itemOffered',
+            priceCurrency: '$offers.priceCurrency',
+            priceSpecification: '$offers.priceSpecification',
+            eligibleCustomerType: '$offers.eligibleCustomerType',
+            eligibleDuration: '$offers.eligibleDuration',
+            eligibleMembershipType: '$offers.eligibleMembershipType',
+            eligibleMonetaryAmount: '$offers.eligibleMonetaryAmount',
+            eligibleQuantity: '$offers.eligibleQuantity',
+            eligibleRegion: '$offers.eligibleRegion',
+            eligibleSeatingType: '$offers.eligibleSeatingType',
+            eligibleSubReservation: '$offers.eligibleSubReservation',
+            settings: '$offers.settings',
+            validFrom: '$offers.validFrom',
+            validThrough: '$offers.validThrough',
+            validRateLimit: '$offers.validRateLimit'
+        };
+        const positiveProjectionFields = Object.keys(params)
+            .filter((key) => params[key] !== 0);
+        const negativeProjectionFields = Object.keys(params)
+            .filter((key) => params[key] === 0);
+        if (positiveProjectionFields.length > 0) {
+            projectStage = {
+                _id: 0,
+                offerIndex: `$${OFFERS_ARRAY_INDEX_NAME}`
+            };
+            positiveProjectionFields.forEach((field) => {
+                projectStage[field] = `$offers.${field}`;
+            });
+        }
+        else if (negativeProjectionFields.length > 0) {
+            negativeProjectionFields.forEach((field) => {
+                if (typeof projectStage[field] === 'string') {
+                    // tslint:disable-next-line:no-dynamic-delete
+                    delete projectStage[field];
+                }
+            });
+        }
+        return projectStage;
+    }
     /**
      * カタログに含まれるオファーを検索する
      * カタログに登録されたオファーの順序は保証される
@@ -759,7 +818,7 @@ class MongoRepository {
                     }, onlyValid: params.onlyValid === true }), (typeof params.limit === 'number' && typeof params.page === 'number')
                     ? { sort: { _id: factory.sortType.Ascending } }
                     : undefined), (typeof params.limit === 'number') ? { limit: params.limit } : undefined), (typeof params.page === 'number') ? { page: params.page } : undefined);
-                offers = yield this.search(searchOffersConditions, params.projection);
+                offers = yield this.search(searchOffersConditions, params.projection, true);
                 // 完全廃止(基本的にsortedOfferIdsと合わせて利用する想定)(2023-09-04~)
                 // if (params.sort) {
                 //     // sorting
@@ -771,17 +830,17 @@ class MongoRepository {
     }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.offerModel.findOne({ _id: params.id }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0,
-                availableAddOn: 0 // 廃止属性の残存が確認されたので(2023-09-04~)
-            })
-                .exec();
-            if (doc === null) {
+            const offers = yield this.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.project.id } },
+                id: { $eq: params.id }
+            });
+            const unitPriceOffer = offers.shift();
+            if (unitPriceOffer === undefined) {
                 throw new factory.errors.NotFound(this.offerModel.modelName);
             }
-            return doc.toObject();
+            return unitPriceOffer;
         });
     }
     findAggregateOfferById(params) {
@@ -809,9 +868,18 @@ class MongoRepository {
                 .exec();
         });
     }
-    search(params, projection) {
+    search(params, projection, 
+    /**
+     * 強制的にoffersコレクションを使用する
+     */
+    useOffersAsPrimary) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            // primaryコレクションをコントロール(2023-09-05~)
+            const useAggregateOfferAsPrimary = settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY && (useOffersAsPrimary !== true);
+            if (useAggregateOfferAsPrimary) {
+                return this.searchFromAggregateOffer(params, projection);
+            }
             const conditions = MongoRepository.CREATE_OFFER_MONGO_CONDITIONS(params);
             const positiveProjectionExists = (projection !== undefined && projection !== null)
                 ? Object.values(projection)
@@ -836,69 +904,23 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
-    // tslint:disable-next-line:max-func-body-length
-    searchFromAggregateOffer(params, __) {
+    searchFromAggregateOffer(params, projection) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = MongoRepository.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
-            // tslint:disable-next-line:no-suspicious-comment
-            // TODO implement projection
-            // const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
-            //     ? Object.values(projection)
-            //         .some((value) => value !== 0)
-            //     : false;
+            const projectStage = MongoRepository.CREATE_AGGREGATE_OFFERS_PROJECTION(Object.assign({}, projection));
             const aggregate = this.aggregateOfferModel.aggregate([
-                { $unwind: '$offers' },
+                {
+                    $unwind: {
+                        path: '$offers',
+                        includeArrayIndex: OFFERS_ARRAY_INDEX_NAME
+                    }
+                },
                 ...matchStages,
-                ...(((_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price']) !== undefined)
+                ...(typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price']) === 'number')
                     ? [{ $sort: { 'offers.priceSpecification.price': params.sort['priceSpecification.price'] } }]
                     : [],
-                {
-                    $project: {
-                        _id: 0,
-                        typeOf: '$offers.typeOf',
-                        project: '$project',
-                        id: '$offers.id',
-                        identifier: '$offers.identifier',
-                        name: '$offers.name',
-                        description: '$offers.description',
-                        category: '$offers.category',
-                        color: '$offers.color',
-                        additionalProperty: '$offers.additionalProperty',
-                        advanceBookingRequirement: '$offers.advanceBookingRequirement',
-                        alternateName: '$offers.alternateName',
-                        addOn: '$offers.addOn',
-                        availability: '$offers.availability',
-                        availableAtOrFrom: '$offers.availableAtOrFrom',
-                        hasMerchantReturnPolicy: '$offers.hasMerchantReturnPolicy',
-                        itemOffered: '$offers.itemOffered',
-                        priceCurrency: '$offers.priceCurrency',
-                        priceSpecification: '$offers.priceSpecification',
-                        eligibleCustomerType: '$offers.eligibleCustomerType',
-                        eligibleDuration: '$offers.eligibleDuration',
-                        eligibleMembershipType: '$offers.eligibleMembershipType',
-                        eligibleMonetaryAmount: '$offers.eligibleMonetaryAmount',
-                        eligibleQuantity: '$offers.eligibleQuantity',
-                        eligibleRegion: '$offers.eligibleRegion',
-                        eligibleSeatingType: '$offers.eligibleSeatingType',
-                        eligibleSubReservation: '$offers.eligibleSubReservation',
-                        settings: '$offers.settings',
-                        validFrom: '$offers.validFrom',
-                        validThrough: '$offers.validThrough',
-                        validRateLimit: '$offers.validRateLimit'
-                        // ...(searchConditions.$projection?.seatCount === 1)
-                        //     ? {
-                        //         seatCount: {
-                        //             $cond: {
-                        //                 if: { $isArray: '$containsPlace.containsPlace' },
-                        //                 then: { $size: '$containsPlace.containsPlace' },
-                        //                 else: 0
-                        //             }
-                        //         }
-                        //     }
-                        //     : undefined
-                    }
-                }
+                { $project: projectStage }
             ]);
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */

package/lib/chevre/settings.d.ts

@@ -43,6 +43,7 @@ export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const USE_CUSTOM_SENDER_EMAIL: boolean;
 export declare const USE_ORDER_PAYMENT_DUE_ON_PLACED: boolean;
 export declare const USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY: boolean;
+export declare const USE_AGGREGATE_OFFERS_AS_PRIMARY: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 /**
  * グローバル設定

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_CUSTOM_SENDER_EMAIL = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_CUSTOM_SENDER_EMAIL = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -75,6 +75,7 @@ exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1
 exports.USE_CUSTOM_SENDER_EMAIL = process.env.USE_CUSTOM_SENDER_EMAIL === '1';
 exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = process.env.USE_ORDER_PAYMENT_DUE_ON_PLACED === '1';
 exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = process.env.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY === '1';
+exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

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.31"
+  "version": "21.8.0-alpha.33"
 }