@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.62

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OfferRepo = void 0;
 const mongoose_1 = require("mongoose");
@@ -21,6 +12,9 @@ const OFFERS_ARRAY_INDEX_NAME = 'offerIndex';
  * 単価オファー読取リポジトリ
  */
 class OfferRepo {
+    aggregateOfferModel;
+    offerCatalogModel;
+    offerCatalogItemModel;
     constructor(connection) {
         this.aggregateOfferModel = connection.model(aggregateOffer_2.modelName, (0, aggregateOffer_2.createSchema)());
         this.offerCatalogModel = connection.model(offerCatalog_1.modelName, (0, offerCatalog_1.createSchema)());
@@ -108,387 +102,411 @@ class OfferRepo {
      * カタログIDで単価オファーを全て検索する
      * 必ずカタログデータから単価オファーIDを参照する
      */
-    searchAllByOfferCatalogId(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
-                id: params.subOfferCatalog.id,
-                isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
-            });
-            let offers = [];
-            if (sortedOfferIds.length > 0) {
-                const searchOffersConditions = {
-                    parentOffer: { id: { $in: sortedOfferIds } }
-                };
-                offers = yield this.search(searchOffersConditions, params.projection);
-            }
-            return { offers };
+    async searchAllByOfferCatalogId(params) {
+        const sortedOfferIds = await this.searchAggregateOfferIdsBySubOfferCatalog({
+            id: params.subOfferCatalog.id,
+            isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
         });
+        let offers = [];
+        if (sortedOfferIds.length > 0) {
+            const searchOffersConditions = {
+                parentOffer: { id: { $in: sortedOfferIds } }
+            };
+            offers = await this.search(searchOffersConditions, params.projection);
+        }
+        return { offers };
     }
     /**
      * 単価オファーIDとカタログIDで単価オファーを全て検索する
      * 単価オファーIDを一定数指定する想定なのでpagingは不要
      */
-    searchAllByIdsAndOfferCatalogId(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (!Array.isArray(params.ids) || params.ids.length === 0) {
-                throw new factory.errors.ArgumentNull('offer.ids');
-            }
-            // 解釈を集計オファーIDに変更する必要がある(2023-09-11~)
-            // 単価オファーIDリスト→集計オファーIDに変換→カタログ条件にセット
-            const aggregateOfferIds = yield this.aggregateOfferModel.distinct('_id', 
-            // { 'offers.id': { $in: params.ids } }
-            { _id: { $in: params.ids } } // _idに変更(2023-12-22~)
-            )
-                .exec();
-            if (aggregateOfferIds.length === 0) {
-                throw new factory.errors.NotFound(factory.offerType.AggregateOffer);
-            }
-            const aggregateOfferIdsInDataCatalog = yield this.searchAggregateOfferIdsBySubOfferCatalogs({
-                id: params.includedInDataCatalog.id,
-                isOfferCatalogItem: params.includedInDataCatalog.isOfferCatalogItem,
-                itemListElementIds: aggregateOfferIds
-            });
-            let offers = [];
-            if (aggregateOfferIdsInDataCatalog.length > 0) {
-                const searchOffersConditions = Object.assign({ 
-                    // aggregateOffer.idで検索する(2023-09-09~)
-                    parentOffer: { id: { $in: aggregateOfferIdsInDataCatalog } }, id: { $in: params.ids }, priceSpecification: {
-                        appliesToMovieTicket: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
+    async searchAllByIdsAndOfferCatalogId(params) {
+        if (!Array.isArray(params.ids) || params.ids.length === 0) {
+            throw new factory.errors.ArgumentNull('offer.ids');
+        }
+        // 解釈を集計オファーIDに変更する必要がある(2023-09-11~)
+        // 単価オファーIDリスト→集計オファーIDに変換→カタログ条件にセット
+        const aggregateOfferIds = await this.aggregateOfferModel.distinct('_id', 
+        // { 'offers.id': { $in: params.ids } }
+        { _id: { $in: params.ids } } // _idに変更(2023-12-22~)
+        )
+            .exec();
+        if (aggregateOfferIds.length === 0) {
+            throw new factory.errors.NotFound(factory.offerType.AggregateOffer);
+        }
+        const aggregateOfferIdsInDataCatalog = await this.searchAggregateOfferIdsBySubOfferCatalogs({
+            id: params.includedInDataCatalog.id,
+            isOfferCatalogItem: params.includedInDataCatalog.isOfferCatalogItem,
+            itemListElementIds: aggregateOfferIds
+        });
+        let offers = [];
+        if (aggregateOfferIdsInDataCatalog.length > 0) {
+            const searchOffersConditions = {
+                // aggregateOffer.idで検索する(2023-09-09~)
+                parentOffer: { id: { $in: aggregateOfferIdsInDataCatalog } },
+                id: { $in: params.ids },
+                priceSpecification: {
+                    appliesToMovieTicket: {
+                        // 利用不可決済方法区分条件を追加(2023-02-21~)
+                        ...(Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
                             ? {
                                 serviceOutput: {
                                     typeOf: { $nin: params.unacceptedPaymentMethod }
                                 }
                             }
-                            : undefined), (params.excludeAppliesToMovieTicket)
+                            : undefined,
+                        // MovieTicket除外条件を追加(2023-02-21~)
+                        ...(params.excludeAppliesToMovieTicket)
                             ? {
                                 serviceType: { $exists: false }
                             }
-                            : undefined)
-                    }, onlyValid: params.onlyValid === true }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                            : undefined
+                    }
+                },
+                onlyValid: params.onlyValid === true,
+                ...(typeof params.availableAtOrFrom?.id === 'string')
                     ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } } // store.idでのフィルターをmongoで処理(2023-01-27~)
-                    : undefined);
-                offers = yield this.search(searchOffersConditions, params.projection);
-            }
-            return offers;
-        });
+                    : undefined
+            };
+            offers = await this.search(searchOffersConditions, params.projection);
+        }
+        return offers;
     }
     /**
      * カタログに含まれるオファーを検索する(カタログ内ソートは保証しない)
      * カタログ内ソートインデックスはsortedOfferIdsで判断する
      */
-    searchByOfferCatalogIdWithSortIndex(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
-                id: params.offerCatalog.id,
-                isOfferCatalogItem: params.offerCatalog.isOfferCatalogItem
-            });
-            let offers = [];
-            if (sortedOfferIds.length > 0) {
-                const appliesToMovieTicketServiceOutputTypeOfEq = (_d = (_c = (_b = (_a = params.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.typeOf) === null || _d === void 0 ? void 0 : _d.$eq;
-                const appliesToMovieTicketServiceOutputTypeOfAll = (_h = (_g = (_f = (_e = params.priceSpecification) === null || _e === void 0 ? void 0 : _e.appliesToMovieTicket) === null || _f === void 0 ? void 0 : _f.serviceOutput) === null || _g === void 0 ? void 0 : _g.typeOf) === null || _h === void 0 ? void 0 : _h.$all;
-                const appliesToMovieTicketServiceTypeExists = (_l = (_k = (_j = params.priceSpecification) === null || _j === void 0 ? void 0 : _j.appliesToMovieTicket) === null || _k === void 0 ? void 0 : _k.serviceType) === null || _l === void 0 ? void 0 : _l.$exists;
-                // 適用決済カード条件なしのみを検索するかどうか
-                const onlyNoAppliesToMovieTicket = params.excludeAppliesToMovieTicket || (appliesToMovieTicketServiceTypeExists === false);
-                const onlyAppliesToMovieTicket = !params.excludeAppliesToMovieTicket && (appliesToMovieTicketServiceTypeExists === true);
-                const priceSpecificationConditions = {
-                    appliesToMovieTicket: Object.assign(Object.assign({ serviceOutput: {
-                            typeOf: Object.assign(Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
+    async searchByOfferCatalogIdWithSortIndex(params) {
+        const sortedOfferIds = await this.searchAggregateOfferIdsBySubOfferCatalog({
+            id: params.offerCatalog.id,
+            isOfferCatalogItem: params.offerCatalog.isOfferCatalogItem
+        });
+        let offers = [];
+        if (sortedOfferIds.length > 0) {
+            const appliesToMovieTicketServiceOutputTypeOfEq = params.priceSpecification?.appliesToMovieTicket?.serviceOutput?.typeOf?.$eq;
+            const appliesToMovieTicketServiceOutputTypeOfAll = params.priceSpecification?.appliesToMovieTicket?.serviceOutput?.typeOf?.$all;
+            const appliesToMovieTicketServiceTypeExists = params.priceSpecification?.appliesToMovieTicket?.serviceType?.$exists;
+            // 適用決済カード条件なしのみを検索するかどうか
+            const onlyNoAppliesToMovieTicket = params.excludeAppliesToMovieTicket || (appliesToMovieTicketServiceTypeExists === false);
+            const onlyAppliesToMovieTicket = !params.excludeAppliesToMovieTicket && (appliesToMovieTicketServiceTypeExists === true);
+            const priceSpecificationConditions = {
+                appliesToMovieTicket: {
+                    serviceOutput: {
+                        typeOf: {
+                            ...(Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
                                 // 利用不可決済方法区分条件を追加(2023-02-21~)
                                 ? { $nin: params.unacceptedPaymentMethod }
-                                : undefined), (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string')
+                                : undefined,
+                            ...(typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string')
                                 ? { $eq: appliesToMovieTicketServiceOutputTypeOfEq }
-                                : undefined), (Array.isArray(appliesToMovieTicketServiceOutputTypeOfAll))
+                                : undefined,
+                            ...(Array.isArray(appliesToMovieTicketServiceOutputTypeOfAll))
                                 ? { $all: appliesToMovieTicketServiceOutputTypeOfAll }
-                                : undefined)
-                        } }, (onlyNoAppliesToMovieTicket)
+                                : undefined
+                        }
+                    },
+                    ...(onlyNoAppliesToMovieTicket)
                         ? { serviceType: { $exists: false } }
-                        : undefined), (onlyAppliesToMovieTicket)
+                        : undefined,
+                    ...(onlyAppliesToMovieTicket)
                         ? { serviceType: { $exists: true } }
-                        : undefined)
-                };
-                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ priceSpecification: priceSpecificationConditions, onlyValid: params.onlyValid === true }, (params.useIncludeInDataCatalog)
+                        : undefined
+                }
+            };
+            const searchOffersConditions = {
+                priceSpecification: priceSpecificationConditions,
+                onlyValid: params.onlyValid === true,
+                // aggregateOffer.idで検索する(2023-09-09~)
+                ...(params.useIncludeInDataCatalog)
                     ? { includedInDataCatalog: { id: { $in: [params.offerCatalog.id] } } }
-                    : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_m = params.availableAtOrFrom) === null || _m === void 0 ? void 0 : _m.id) === 'string')
+                    : { parentOffer: { id: { $in: sortedOfferIds } } },
+                ...(typeof params.availableAtOrFrom?.id === 'string')
                     ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } } // store.idでのフィルターをmongoで処理(2023-01-27~)
-                    : undefined), (typeof params.limit === 'number' && typeof params.page === 'number')
+                    : undefined,
+                ...(typeof params.limit === 'number' && typeof params.page === 'number')
                     // 明示的なソート指定を調整(決して重複しない属性が相応)(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);
-                offers = yield this.search(searchOffersConditions, params.projection);
-            }
-            return { offers, sortedOfferIds };
-        });
+                    : undefined,
+                ...(typeof params.limit === 'number') ? { limit: params.limit } : undefined,
+                ...(typeof params.page === 'number') ? { page: params.page } : undefined
+            };
+            offers = await this.search(searchOffersConditions, params.projection);
+        }
+        return { offers, sortedOfferIds };
     }
     /**
      * カタログに記載されたオファーにおいて利用可能な決済方法区分を検索する
      */
-    searchAvaialbleAppliesToMovieTicketByOfferCatalogId(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { useIncludeInDataCatalog } = params;
-            // カタログのみ対応でよい?
-            let offerIds;
-            if (!useIncludeInDataCatalog) {
-                if (params.subOfferCatalog.isOfferCatalogItem) {
-                    const offerCatalog = yield this.offerCatalogItemModel.findOne({ _id: { $eq: params.subOfferCatalog.id } }, { _id: 0, itemListElement: 1 })
-                        .lean()
-                        .exec();
-                    offerIds = offerCatalog === null || offerCatalog === void 0 ? void 0 : offerCatalog.itemListElement.map(({ id }) => id);
-                }
-                else {
-                    const offerCatalog = yield this.offerCatalogModel.findOne({ _id: { $eq: params.subOfferCatalog.id } }, { _id: 0, itemListElement: 1 })
-                        .lean()
-                        .exec();
-                    offerIds = offerCatalog === null || offerCatalog === void 0 ? void 0 : offerCatalog.itemListElement.map(({ id }) => id);
-                }
-                if (!Array.isArray(offerIds) || offerIds.length === 0) {
-                    return [];
-                }
+    async searchAvaialbleAppliesToMovieTicketByOfferCatalogId(params) {
+        const { useIncludeInDataCatalog } = params;
+        // カタログのみ対応でよい?
+        let offerIds;
+        if (!useIncludeInDataCatalog) {
+            if (params.subOfferCatalog.isOfferCatalogItem) {
+                const offerCatalog = await this.offerCatalogItemModel.findOne({ _id: { $eq: params.subOfferCatalog.id } }, { _id: 0, itemListElement: 1 })
+                    .lean()
+                    .exec();
+                offerIds = offerCatalog?.itemListElement.map(({ id }) => id);
             }
-            // support useIncludeInDataCatalog(2025-05-08~)
-            const searchOffersConditions = Object.assign(Object.assign(Object.assign({}, (Array.isArray(offerIds))
+            else {
+                const offerCatalog = await this.offerCatalogModel.findOne({ _id: { $eq: params.subOfferCatalog.id } }, { _id: 0, itemListElement: 1 })
+                    .lean()
+                    .exec();
+                offerIds = offerCatalog?.itemListElement.map(({ id }) => id);
+            }
+            if (!Array.isArray(offerIds) || offerIds.length === 0) {
+                return [];
+            }
+        }
+        // support useIncludeInDataCatalog(2025-05-08~)
+        const searchOffersConditions = {
+            ...(Array.isArray(offerIds))
                 ? { parentOffer: { id: { $in: offerIds } } }
-                : { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }), (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                : { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } },
+            ...(typeof params.availableAtOrFrom?.id === 'string')
                 ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
-                : undefined), { priceSpecification: {
-                    appliesToMovieTicket: Object.assign({ 
-                        // 基本は適用決済カード区分有のみ検索
-                        serviceType: { $exists: (!params.excludeAppliesToMovieTicket === true) } }, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
+                : undefined,
+            priceSpecification: {
+                appliesToMovieTicket: {
+                    // 基本は適用決済カード区分有のみ検索
+                    serviceType: { $exists: (!params.excludeAppliesToMovieTicket === true) },
+                    // 利用不可決済方法区分を指定されれば除外
+                    ...(Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
                         ? { serviceOutput: { typeOf: { $nin: params.unacceptedPaymentMethod } } }
-                        : undefined)
-                }, onlyValid: params.onlyValid === true });
-            const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(searchOffersConditions);
-            const aggregate = this.aggregateOfferModel.aggregate([
-                { $unwind: { path: '$offers' } },
-                { $unwind: { path: '$offers.priceSpecification.appliesToMovieTicket' } },
-                ...matchStages,
-                {
-                    $group: {
-                        _id: '$offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf',
-                        appliesToMovieTicket: { $first: '$offers.priceSpecification.appliesToMovieTicket' }
-                    }
-                },
-                { $sort: { _id: factory.sortType.Ascending } },
-                {
-                    $project: {
-                        _id: 0,
-                        serviceOutput: { typeOf: '$_id' }
-                    }
+                        : undefined
+                }
+            },
+            onlyValid: params.onlyValid === true
+        };
+        const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(searchOffersConditions);
+        const aggregate = this.aggregateOfferModel.aggregate([
+            { $unwind: { path: '$offers' } },
+            { $unwind: { path: '$offers.priceSpecification.appliesToMovieTicket' } },
+            ...matchStages,
+            {
+                $group: {
+                    _id: '$offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf',
+                    appliesToMovieTicket: { $first: '$offers.priceSpecification.appliesToMovieTicket' }
+                }
+            },
+            { $sort: { _id: factory.sortType.Ascending } },
+            {
+                $project: {
+                    _id: 0,
+                    serviceOutput: { typeOf: '$_id' }
                 }
-            ]);
-            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();
-        });
+        ]);
+        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();
     }
     /**
      * クライアントの利用可能カタログを検索する
      */
-    searchAvailableCatalogs(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { unacceptedPaymentMethod } = params;
-            const aggregate = this.aggregateOfferModel.aggregate([
-                { $unwind: { path: '$offers' } },
-                { $unwind: { path: '$includedInDataCatalog' } },
-                {
-                    $match: Object.assign({ 'project.id': { $eq: params.project.id }, 'includedInDataCatalog.id': { $exists: true, $in: params.includedInDataCatalog.id }, 'offers.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id } }, (Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length > 0)
+    async searchAvailableCatalogs(params) {
+        const { unacceptedPaymentMethod } = params;
+        const aggregate = this.aggregateOfferModel.aggregate([
+            { $unwind: { path: '$offers' } },
+            { $unwind: { path: '$includedInDataCatalog' } },
+            {
+                $match: {
+                    'project.id': { $eq: params.project.id },
+                    'includedInDataCatalog.id': { $exists: true, $in: params.includedInDataCatalog.id },
+                    'offers.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id },
+                    // 利用不可決済方法区分を考慮(2024-09-26~)
+                    ...(Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length > 0)
                         ? {
                             'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
                                 $nin: unacceptedPaymentMethod
                             }
                         }
-                        : undefined)
-                },
-                {
-                    $group: {
-                        _id: '$includedInDataCatalog.id'
-                    }
-                },
-                {
-                    $project: {
-                        _id: 0,
-                        id: '$_id'
-                    }
+                        : undefined
                 }
-            ]);
-            return aggregate.exec();
-        });
+            },
+            {
+                $group: {
+                    _id: '$includedInDataCatalog.id'
+                }
+            },
+            {
+                $project: {
+                    _id: 0,
+                    id: '$_id'
+                }
+            }
+        ]);
+        return aggregate.exec();
     }
     /**
      * サブカタログがクライアントで利用可能かどうか
      */
-    isCatalogAvailable(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { unacceptedPaymentMethod } = params;
-            // サブカタログのみ対応でよい
-            const offerCatalogItem = yield this.offerCatalogItemModel.findOne({ _id: { $eq: params.includedInDataCatalog.id } }, { _id: 0, itemListElement: 1 })
-                .lean()
-                .exec();
-            const offerIds = offerCatalogItem === null || offerCatalogItem === void 0 ? void 0 : offerCatalogItem.itemListElement.map(({ id }) => id);
-            if (!Array.isArray(offerIds) || offerIds.length === 0) {
-                return false;
-            }
-            const doc = yield this.aggregateOfferModel.findOne(Object.assign({ 
-                // 'project.id': { $eq: params.project.id },
-                _id: { $in: offerIds }, 'offers.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id } }, (Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length > 0)
+    async isCatalogAvailable(params) {
+        const { unacceptedPaymentMethod } = params;
+        // サブカタログのみ対応でよい
+        const offerCatalogItem = await this.offerCatalogItemModel.findOne({ _id: { $eq: params.includedInDataCatalog.id } }, { _id: 0, itemListElement: 1 })
+            .lean()
+            .exec();
+        const offerIds = offerCatalogItem?.itemListElement.map(({ id }) => id);
+        if (!Array.isArray(offerIds) || offerIds.length === 0) {
+            return false;
+        }
+        const doc = await this.aggregateOfferModel.findOne({
+            // 'project.id': { $eq: params.project.id },
+            _id: { $in: offerIds }, // includedInDataCatalog.idには依存しない
+            'offers.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id },
+            // 利用不可決済方法区分を考慮(2024-09-26~)
+            ...(Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length > 0)
                 ? {
                     'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': {
                         $nin: unacceptedPaymentMethod
                     }
                 }
-                : undefined), {
-                _id: 1
-            })
-                .lean()
-                .exec();
-            return doc !== null;
-        });
+                : undefined
+        }, {
+            _id: 1
+        })
+            .lean()
+            .exec();
+        return doc !== null;
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(params);
-            const result = yield this.aggregateOfferModel.aggregate([
-                {
-                    $unwind: { path: '$offers' }
-                },
-                ...matchStages,
-                {
-                    $count: 'offerCount'
-                }
-            ])
-                .exec();
-            return (result.length > 0) ? result[0].offerCount : 0;
-        });
+    async count(params) {
+        const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(params);
+        const result = await this.aggregateOfferModel.aggregate([
+            {
+                $unwind: { path: '$offers' }
+            },
+            ...matchStages,
+            {
+                $count: 'offerCount'
+            }
+        ])
+            .exec();
+        return (result.length > 0) ? result[0].offerCount : 0;
     }
-    search(params, projection) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(params);
-            const projectStage = OfferRepo.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: {
-                        path: '$offers',
-                        includeArrayIndex: OFFERS_ARRAY_INDEX_NAME
-                    }
-                },
-                ...matchStages,
-                ...(typeof sortByPrice === 'number' || typeof sortByIdentifier === 'number')
-                    ? [
-                        {
-                            $sort: Object.assign(Object.assign({}, (typeof sortByPrice === 'number')
+    async search(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([
+            {
+                $unwind: {
+                    path: '$offers',
+                    includeArrayIndex: OFFERS_ARRAY_INDEX_NAME
+                }
+            },
+            ...matchStages,
+            ...(typeof sortByPrice === 'number' || typeof sortByIdentifier === 'number')
+                ? [
+                    {
+                        $sort: {
+                            ...(typeof sortByPrice === 'number')
                                 ? { 'offers.priceSpecification.price': sortByPrice }
-                                : undefined), (typeof sortByIdentifier === 'number')
+                                : undefined,
+                            ...(typeof sortByIdentifier === 'number')
                                 ? { 'offers.identifier': sortByIdentifier }
-                                : undefined)
+                                : undefined
                         }
-                    ]
-                    : [],
-                { $project: projectStage }
-            ]);
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* 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();
-        });
+                    }
+                ]
+                : [],
+            { $project: projectStage }
+        ]);
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* 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リストを検索する
      */
-    searchAggregateOfferIdsBySubOfferCatalog(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let itemListElements;
-            if (params.isOfferCatalogItem) {
-                const matchStages = [{ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.id) } } }]; // ObjectIdなので注意
-                itemListElements = yield this.offerCatalogItemModel.aggregate([
-                    { $unwind: '$itemListElement' },
-                    ...matchStages,
-                    {
-                        $project: {
-                            _id: 0,
-                            id: '$itemListElement.id'
-                        }
+    async searchAggregateOfferIdsBySubOfferCatalog(params) {
+        let itemListElements;
+        if (params.isOfferCatalogItem) {
+            const matchStages = [{ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.id) } } }]; // ObjectIdなので注意
+            itemListElements = await this.offerCatalogItemModel.aggregate([
+                { $unwind: '$itemListElement' },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        id: '$itemListElement.id'
                     }
-                ])
-                    .exec();
-            }
-            else {
-                const matchStages = [{ $match: { _id: { $eq: params.id } } }];
-                itemListElements = yield this.offerCatalogModel.aggregate([
-                    { $unwind: '$itemListElement' },
-                    ...matchStages,
-                    {
-                        $project: {
-                            _id: 0,
-                            id: '$itemListElement.id'
-                        }
+                }
+            ])
+                .exec();
+        }
+        else {
+            const matchStages = [{ $match: { _id: { $eq: params.id } } }];
+            itemListElements = await this.offerCatalogModel.aggregate([
+                { $unwind: '$itemListElement' },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        id: '$itemListElement.id'
                     }
-                ])
-                    .exec();
-            }
-            return (Array.isArray(itemListElements))
-                ? itemListElements.map((element) => element.id)
-                : [];
-        });
+                }
+            ])
+                .exec();
+        }
+        return (Array.isArray(itemListElements))
+            ? itemListElements.map((element) => element.id)
+            : [];
     }
     /**
      * 複数サブカタログから集計オファーIDリストを検索する
      */
-    searchAggregateOfferIdsBySubOfferCatalogs(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!Array.isArray(params.itemListElementIds) || params.itemListElementIds.length === 0) {
-                throw new factory.errors.ArgumentNull('itemListElementIds');
+    async searchAggregateOfferIdsBySubOfferCatalogs(params) {
+        if (!Array.isArray(params.itemListElementIds) || params.itemListElementIds.length === 0) {
+            throw new factory.errors.ArgumentNull('itemListElementIds');
+        }
+        let itemListElements;
+        if (params.isOfferCatalogItem) {
+            const matchStages = [
+                { $match: { _id: { $in: params.id.map((id) => new mongoose_1.Types.ObjectId(id)) } } }, // ObjectIdなので注意
+                { $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } }
+            ];
+            itemListElements = await this.offerCatalogItemModel.aggregate([
+                { $unwind: '$itemListElement' },
+                ...matchStages,
+                {
+                    $group: { _id: '$itemListElement.id' }
+                }
+            ])
+                .exec();
+        }
+        else {
+            // 1カタログしかありえないはず
+            if (params.id.length !== 1) {
+                throw new factory.errors.Argument('id', 'length must be 1');
             }
-            let itemListElements;
-            if (params.isOfferCatalogItem) {
-                const matchStages = [
-                    { $match: { _id: { $in: params.id.map((id) => new mongoose_1.Types.ObjectId(id)) } } }, // ObjectIdなので注意
-                    { $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } }
-                ];
-                itemListElements = yield this.offerCatalogItemModel.aggregate([
-                    { $unwind: '$itemListElement' },
-                    ...matchStages,
-                    {
-                        $group: { _id: '$itemListElement.id' }
+            const matchStages = [
+                { $match: { _id: { $in: params.id } } },
+                { $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } }
+            ];
+            itemListElements = await this.offerCatalogModel.aggregate([
+                { $unwind: '$itemListElement' },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: '$itemListElement.id'
                     }
-                ])
-                    .exec();
-            }
-            else {
-                // 1カタログしかありえないはず
-                if (params.id.length !== 1) {
-                    throw new factory.errors.Argument('id', 'length must be 1');
                 }
-                const matchStages = [
-                    { $match: { _id: { $in: params.id } } },
-                    { $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } }
-                ];
-                itemListElements = yield this.offerCatalogModel.aggregate([
-                    { $unwind: '$itemListElement' },
-                    ...matchStages,
-                    {
-                        $project: {
-                            _id: '$itemListElement.id'
-                        }
-                    }
-                ])
-                    .exec();
-            }
-            return (Array.isArray(itemListElements))
-                ? itemListElements.map((element) => element._id)
-                : [];
-        });
+            ])
+                .exec();
+        }
+        return (Array.isArray(itemListElements))
+            ? itemListElements.map((element) => element._id)
+            : [];
     }
 }
 exports.OfferRepo = OfferRepo;