@chevre/domain 21.9.0-alpha.8 → 21.9.0

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

@@ -42,7 +42,6 @@ exports.schema = schema;
 schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ 'offers.priceSpecification.price': 1 }, { name: 'searchByOffersPriceSpecificationPrice' });
-schema.index({ 'project.id': 1, 'offers.priceSpecification.price': 1 }, { name: 'searchByProjectId' });
 // オファーIDはグローバルユニーク
 schema.index({ 'offers.id': 1 }, {
     name: 'uniqueOfferId',
@@ -59,130 +58,131 @@ schema.index({ 'includedInDataCatalog.id': 1 }, {
         'includedInDataCatalog.id': { $exists: true }
     }
 });
-schema.index({ 'offers.includedInDataCatalog.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersIncludedInDataCatalogId',
+schema.index({ 'offers.includedInDataCatalog.id': 1 }, {
+    name: 'searchByOffersIncludedInDataCatalogId-v2',
     partialFilterExpression: {
         'offers.includedInDataCatalog.id': { $exists: 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',
+schema.index({ 'project.id': 1 }, { name: 'searchByProjectId-v2' });
+schema.index({ 'offers.availability': 1 }, { name: 'searchByOffersAvailability-v2' });
+schema.index({ 'offers.itemOffered.typeOf': 1 }, { name: 'searchByOffersItemOfferedTypeOf-v2' });
+schema.index({ 'offers.identifier': 1 }, {
+    name: 'searchByOffersIdentifier-v2',
     partialFilterExpression: {
         'offers.identifier': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.referenceQuantity.value': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationReferenceQuantityValue',
+schema.index({ 'offers.priceSpecification.referenceQuantity.value': 1 }, {
+    name: 'searchByOffersPriceSpecificationReferenceQuantityValue-v2',
     partialFilterExpression: {
         'offers.priceSpecification.referenceQuantity.value': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.accounting.accountsReceivable': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationAccountingAccountsReceivable',
+schema.index({ 'offers.priceSpecification.accounting.accountsReceivable': 1 }, {
+    name: 'searchByOffersPriceSpecificationAccountingAccountsReceivable-v2',
     partialFilterExpression: {
         'offers.priceSpecification.accounting.accountsReceivable': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.accounting.operatingRevenue.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationAccountingOperatingRevenueCodeValue',
+schema.index({ 'offers.priceSpecification.accounting.operatingRevenue.codeValue': 1 }, {
+    name: 'searchByOffersPriceSpecificationAccountingOperatingRevenueCodeValue-v2',
     partialFilterExpression: {
         'offers.priceSpecification.accounting.operatingRevenue.codeValue': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceType': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceType',
+schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceType': 1 }, {
+    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceType-v2',
     partialFilterExpression: {
         'offers.priceSpecification.appliesToMovieTicket.serviceType': { $exists: true }
     }
 });
-schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceOutputTypeOf',
+schema.index({ 'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': 1 }, {
+    name: 'searchByOffersPriceSpecificationAppliesToMovieTicketServiceOutputTypeOf-v2',
     partialFilterExpression: {
         'offers.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf': { $exists: true }
     }
 });
-schema.index({ 'offers.name.ja': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersNameJa',
+schema.index({ 'offers.name.ja': 1 }, {
+    name: 'searchByOffersNameJa-v2',
     partialFilterExpression: {
         'offers.name.ja': { $exists: true }
     }
 });
-schema.index({ 'offers.name.en': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersNameEn',
+schema.index({ 'offers.name.en': 1 }, {
+    name: 'searchByOffersNameEn-v2',
     partialFilterExpression: {
         'offers.name.en': { $exists: true }
     }
 });
-schema.index({ 'offers.alternateName': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersAlternateName',
+schema.index({ 'offers.alternateName': 1 }, {
+    name: 'searchByOffersAlternateName-v2',
     partialFilterExpression: {
         'offers.alternateName': { $exists: true }
     }
 });
-schema.index({ 'offers.category.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchOffersCategoryId',
+schema.index({ 'offers.category.id': 1 }, {
+    name: 'searchOffersCategoryId-v2',
     partialFilterExpression: {
         'offers.category.id': { $exists: true }
     }
 });
-schema.index({ 'offers.category.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersCategoryCodeValue',
+schema.index({ 'offers.category.codeValue': 1 }, {
+    name: 'searchByOffersCategoryCodeValue-v2',
     partialFilterExpression: {
         'offers.category.codeValue': { $exists: true }
     }
 });
-schema.index({ 'offers.availableAtOrFrom.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersAvailableAtOrFromId',
+schema.index({ 'offers.availableAtOrFrom.id': 1 }, {
+    name: 'searchByOffersAvailableAtOrFromId-v2',
     partialFilterExpression: {
         'offers.availableAtOrFrom.id': { $exists: true }
     }
 });
-schema.index({ 'offers.eligibleMembershipType.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersEligibleMembershipTypeCodeValue',
+schema.index({ 'offers.eligibleMembershipType.codeValue': 1 }, {
+    name: 'searchByOffersEligibleMembershipTypeCodeValue-v2',
     partialFilterExpression: {
         'offers.eligibleMembershipType.codeValue': { $exists: true }
     }
 });
-schema.index({ 'offers.eligibleMonetaryAmount.currency': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersEligibleMonetaryAmountCurrency',
+schema.index({ 'offers.eligibleMonetaryAmount.currency': 1 }, {
+    name: 'searchByOffersEligibleMonetaryAmountCurrency-v2',
     partialFilterExpression: {
         'offers.eligibleMonetaryAmount.currency': { $exists: true }
     }
 });
-schema.index({ 'offers.eligibleSeatingType.codeValue': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersEligibleSeatingTypeCodeValue',
+schema.index({ 'offers.eligibleSeatingType.codeValue': 1 }, {
+    name: 'searchByOffersEligibleSeatingTypeCodeValue-v2',
     partialFilterExpression: {
         'offers.eligibleSeatingType.codeValue': { $exists: true }
     }
 });
-schema.index({ 'offers.addOn.itemOffered.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersAddOnItemOfferedId',
+schema.index({ 'offers.addOn.itemOffered.id': 1 }, {
+    name: 'searchByOffersAddOnItemOfferedId-v2',
     partialFilterExpression: {
         'offers.addOn.itemOffered.id': { $exists: true }
     }
 });
-schema.index({ 'offers.hasMerchantReturnPolicy.id': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersHasMerchantReturnPolicyId',
+schema.index({ 'offers.hasMerchantReturnPolicy.id': 1 }, {
+    name: 'searchByOffersHasMerchantReturnPolicyId-v2',
     partialFilterExpression: {
         'offers.hasMerchantReturnPolicy.id': { $exists: true }
     }
 });
-schema.index({ 'offers.additionalProperty': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersAdditionalProperty',
+schema.index({ 'offers.additionalProperty': 1 }, {
+    name: 'searchByOffersAdditionalProperty-v2',
     partialFilterExpression: {
         'offers.additionalProperty': { $exists: true }
     }
 });
-schema.index({ 'offers.validFrom': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersValidFrom',
+schema.index({ 'offers.validFrom': 1 }, {
+    name: 'searchByOffersValidFrom-v2',
     partialFilterExpression: {
         'offers.validFrom': { $exists: true }
     }
 });
-schema.index({ 'offers.validThrough': 1, 'offers.priceSpecification.price': 1 }, {
-    name: 'searchByOffersValidThrough',
+schema.index({ 'offers.validThrough': 1 }, {
+    name: 'searchByOffersValidThrough-v2',
     partialFilterExpression: {
         'offers.validThrough': { $exists: true }
     }

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

@@ -40,10 +40,10 @@ export declare class MongoRepository {
         offers: IUnitPriceOfferFromAggregateOffer[];
     }>;
     /**
-     * 単価オファーIDとカタログIDで単価オファーを検索する
-     * 必ずカタログデータから単価オファーIDを参照する
+     * 単価オファーIDとカタログIDで単価オファーを全て検索する
+     * 単価オファーIDを一定数指定する想定なのでpagingは不要
      */
-    searchByIdsAndOfferCatalogId(params: {
+    searchAllByIdsAndOfferCatalogId(params: {
         /**
          * 指定したIDの単価オファーだけ取得
          */
@@ -61,8 +61,6 @@ export declare class MongoRepository {
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
         onlyValid?: boolean;
-        limit?: number;
-        page?: number;
         projection?: IProjection;
     }): Promise<{
         offers: IUnitPriceOfferFromAggregateOffer[];
@@ -84,6 +82,10 @@ export declare class MongoRepository {
         };
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
+        /**
+         * 適用決済カード条件
+         */
+        priceSpecification: Pick<factory.unitPriceOffer.IPriceSpecificationSearchConditions, 'appliesToMovieTicket'>;
         onlyValid?: boolean;
         useIncludeInDataCatalog: boolean;
         limit?: number;
@@ -105,22 +107,34 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
+            isOfferCatalogItem: boolean;
         };
         availableAtOrFrom?: {
             id?: string;
         };
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
+        useIncludeInDataCatalog: boolean;
         onlyValid?: boolean;
         limit?: number;
         page?: number;
     }): Promise<Pick<factory.priceSpecification.unitPrice.IAppliesToMovieTicket, 'serviceOutput'>[]>;
-    findAggregateOfferById(params: {
+    /**
+     * クライアントの利用可能カタログを検索する
+     */
+    searchAvailableCatalogs(params: {
         project: {
             id: string;
         };
+        includedInDataCatalog: {
+            id: string[];
+        };
+        availableAtOrFrom: {
+            id: string;
+        };
+    }): Promise<{
         id: string;
-    }): Promise<factory.aggregateOffer.IAggregateOffer>;
+    }[]>;
     count(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
     search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<IUnitPriceOfferFromAggregateOffer[]>;
     save(params: factory.unitPriceOffer.IUnitPriceOffer & {
@@ -148,12 +162,6 @@ export declare class MongoRepository {
             };
         };
     }): Promise<import("mongodb").UpdateResult | undefined>;
-    deleteById(params: {
-        project: {
-            id: string;
-        };
-        id: string;
-    }): Promise<void>;
     /**
      * サブカタログから集計オファーIDリストを検索する
      */

package/lib/chevre/repo/offer.js

@@ -21,12 +21,14 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const createDebug = require("debug");
 const mongoose_1 = require("mongoose");
 const uniqid = require("uniqid");
 const factory = require("../factory");
 const aggregateOffer_1 = require("./mongoose/schemas/aggregateOffer");
 const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
 const offerCatalogItem_1 = require("./mongoose/schemas/offerCatalogItem");
+const debug = createDebug('chevre-domain:repo:offer');
 const OFFERS_ARRAY_INDEX_NAME = 'offerIndex';
 /**
  * 単価オファーリポジトリ
@@ -51,10 +53,25 @@ class MongoRepository {
         if (Array.isArray(parentOfferIdIn)) {
             matchStages.push({ $match: { _id: { $in: parentOfferIdIn } } });
         }
+        // aggregateOffer.includedInDataCatalogで検索する(2023-09-21~)
         const includedInDataCatalogIdIn = (_f = (_e = params.includedInDataCatalog) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
+        // if (Array.isArray(includedInDataCatalogIdIn)) {
+        //     matchStages.push({ $match: { 'offers.includedInDataCatalog.id': { $exists: true, $in: includedInDataCatalogIdIn } } });
+        // }
         if (Array.isArray(includedInDataCatalogIdIn)) {
-            matchStages.push({ $match: { 'offers.includedInDataCatalog.id': { $exists: true, $in: includedInDataCatalogIdIn } } });
+            matchStages.push({ $match: { 'includedInDataCatalog.id': { $exists: true, $in: includedInDataCatalogIdIn } } });
         }
+        // const includedInOfferCatalogItemIncludedInDataCatalogIdIn = params.includedInOfferCatalogItem?.includedInDataCatalog?.id?.$in;
+        // if (Array.isArray(includedInOfferCatalogItemIncludedInDataCatalogIdIn)) {
+        //     matchStages.push({
+        //         $match: {
+        //             'offers.includedInOfferCatalogItem.includedInDataCatalog.id': {
+        //                 $exists: true,
+        //                 $in: includedInOfferCatalogItemIncludedInDataCatalogIdIn
+        //             }
+        //         }
+        //     });
+        // }
         const idEq = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof idEq === 'string') {
             matchStages.push({
@@ -459,29 +476,33 @@ class MongoRepository {
         });
     }
     /**
-     * 単価オファーIDとカタログIDで単価オファーを検索する
-     * 必ずカタログデータから単価オファーIDを参照する
+     * 単価オファーIDとカタログIDで単価オファーを全て検索する
+     * 単価オファーIDを一定数指定する想定なのでpagingは不要
      */
-    searchByIdsAndOfferCatalogId(params) {
+    searchAllByIdsAndOfferCatalogId(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const unitPriceOfferIds = params.ids;
-            let aggregateOfferIds; // 集計オファーIDでフィルターする場合
-            if (Array.isArray(unitPriceOfferIds)) {
-                // 解釈を集計オファーIDに変更する必要がある(2023-09-11~)
-                // 単価オファーIDリスト→集計オファーIDに変換→カタログ条件にセット
-                const searchDistinctAggregateOfferIdsResult = yield this.aggregateOfferModel.distinct('_id', { 'offers.id': { $in: unitPriceOfferIds } })
-                    .exec();
-                aggregateOfferIds = searchDistinctAggregateOfferIdsResult;
+            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 } })
+                .exec();
+            if (aggregateOfferIds.length === 0) {
+                throw new factory.errors.NotFound(factory.offerType.AggregateOffer);
             }
-            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog(Object.assign({ id: params.subOfferCatalog.id, isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem }, (Array.isArray(aggregateOfferIds)) ? { itemListElementIds: aggregateOfferIds } : undefined));
+            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
+                id: params.subOfferCatalog.id,
+                isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem,
+                itemListElementIds: aggregateOfferIds
+            });
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ 
+                debug('searchAllByIdsAndOfferCatalogId:searching offers...,sortedOfferIds:', sortedOfferIds, 'ids:', params.ids);
+                const searchOffersConditions = Object.assign({ 
                     // aggregateOffer.idで検索する(2023-09-09~)
-                    parentOffer: { id: { $in: sortedOfferIds } } }, (Array.isArray(unitPriceOfferIds)) ? { id: { $in: unitPriceOfferIds } } : undefined), (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                    ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
-                    : undefined), { priceSpecification: {
+                    parentOffer: { id: { $in: sortedOfferIds } }, id: { $in: params.ids }, priceSpecification: {
                         appliesToMovieTicket: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
                             ? {
                                 serviceOutput: {
@@ -493,10 +514,16 @@ class MongoRepository {
                                 serviceType: { $exists: false }
                             }
                             : undefined)
-                    }, onlyValid: params.onlyValid === true }), (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);
+                    }, onlyValid: params.onlyValid === true }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                    ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } } // store.idでのフィルターをmongoで処理(2023-01-27~)
+                    : 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 };
@@ -507,7 +534,7 @@ class MongoRepository {
      * カタログ内ソートインデックスはsortedOfferIdsで判断する
      */
     searchByOfferCatalogIdWithSortIndex(params) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
             const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
                 id: params.subOfferCatalog.id,
@@ -515,23 +542,30 @@ class MongoRepository {
             });
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (params.useIncludeInDataCatalog)
+                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 appliesToMovieTicketServiceTypeExists = (_g = (_f = (_e = params.priceSpecification) === null || _e === void 0 ? void 0 : _e.appliesToMovieTicket) === null || _f === void 0 ? void 0 : _f.serviceType) === null || _g === void 0 ? void 0 : _g.$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({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
+                                // 利用不可決済方法区分条件を追加(2023-02-21~)
+                                ? { $nin: params.unacceptedPaymentMethod }
+                                : undefined), (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string')
+                                ? { $eq: appliesToMovieTicketServiceOutputTypeOfEq }
+                                : undefined)
+                        } }, (onlyNoAppliesToMovieTicket)
+                        ? { serviceType: { $exists: false } }
+                        : 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)
                     ? { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }
-                    : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                    : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_h = params.availableAtOrFrom) === null || _h === void 0 ? void 0 : _h.id) === 'string')
                     ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } } // store.idでのフィルターをmongoで処理(2023-01-27~)
-                    : undefined), { priceSpecification: {
-                        appliesToMovieTicket: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
-                            ? {
-                                serviceOutput: {
-                                    typeOf: { $nin: params.unacceptedPaymentMethod }
-                                }
-                            }
-                            : undefined), (params.excludeAppliesToMovieTicket)
-                            ? {
-                                serviceType: { $exists: false }
-                            }
-                            : undefined)
-                    }, onlyValid: params.onlyValid === true }), (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);
@@ -546,7 +580,17 @@ class MongoRepository {
     searchAvaialbleAppliesToMovieTicketByOfferCatalogId(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const searchOffersConditions = Object.assign(Object.assign({ includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+            let sortedOfferIds = [];
+            if (!params.useIncludeInDataCatalog) {
+                // useIncludeInDataCatalogでない場合のみ集計オファーIDリストを検索する
+                sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
+                    id: params.subOfferCatalog.id,
+                    isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
+                });
+            }
+            const searchOffersConditions = Object.assign(Object.assign(Object.assign({}, (params.useIncludeInDataCatalog)
+                ? { includedInDataCatalog: { id: { $in: [params.subOfferCatalog.id] } } }
+                : { parentOffer: { id: { $in: sortedOfferIds } } }), (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                 ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
                 : undefined), { priceSpecification: {
                     appliesToMovieTicket: Object.assign({ 
@@ -582,23 +626,62 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
-    findAggregateOfferById(params) {
+    /**
+     * クライアントの利用可能カタログを検索する
+     */
+    searchAvailableCatalogs(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.aggregateOfferModel.findOne({
-                _id: { $eq: params.id },
-                'project.id': { $eq: params.project.id }
-            }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.aggregateOfferModel.modelName);
-            }
-            return doc.toObject();
+            const aggregate = this.aggregateOfferModel.aggregate([
+                { $unwind: { path: '$offers' } },
+                // { $unwind: { path: '$offers.includedInDataCatalog' } },
+                { $unwind: { path: '$includedInDataCatalog' } },
+                {
+                    $match: {
+                        'project.id': { $eq: params.project.id },
+                        // 'offers.includedInDataCatalog.id': { $exists: true, $in: params.includedInDataCatalog.id },
+                        'includedInDataCatalog.id': { $exists: true, $in: params.includedInDataCatalog.id },
+                        'offers.availableAtOrFrom.id': { $exists: true, $eq: params.availableAtOrFrom.id }
+                    }
+                },
+                {
+                    $group: {
+                        // _id: '$offers.includedInDataCatalog.id',
+                        // includedInDataCatalog: { $first: '$offers.includedInDataCatalog' }
+                        _id: '$includedInDataCatalog.id'
+                        // includedInDataCatalog: { $first: '$includedInDataCatalog' }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        id: '$_id'
+                    }
+                }
+            ]);
+            return aggregate.exec();
         });
     }
+    // public async findAggregateOfferById(params: {
+    //     project: { id: string };
+    //     id: string;
+    // }): Promise<factory.aggregateOffer.IAggregateOffer> {
+    //     const doc = await this.aggregateOfferModel.findOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             'project.id': { $eq: params.project.id }
+    //         },
+    //         {
+    //             __v: 0,
+    //             createdAt: 0,
+    //             updatedAt: 0
+    //         }
+    //     )
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.aggregateOfferModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = MongoRepository.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
@@ -790,12 +873,16 @@ class MongoRepository {
             return result;
         });
     }
-    deleteById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.aggregateOfferModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
-                .exec();
-        });
-    }
+    // public async deleteById(params: {
+    //     project: { id: string };
+    //     id: string;
+    // }) {
+    //     await this.aggregateOfferModel.findOneAndRemove(
+    //         { _id: { $eq: params.id } },
+    //         { projection: { _id: 1 } }
+    //     )
+    //         .exec();
+    // }
     /**
      * サブカタログから集計オファーIDリストを検索する
      */

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

@@ -82,9 +82,6 @@ export declare class MongoRepository {
         };
     }): Promise<import("mongodb").UpdateResult | undefined>;
     search(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
-    /**
-     * 強制的に親カタログのみ検索する
-     */
     findItemListElementById(params: {
         id: string;
         project: {
@@ -97,6 +94,17 @@ export declare class MongoRepository {
     findFirstItemListElementById(params: {
         id: string;
     }): Promise<factory.offerCatalog.IItemListElement>;
+    /**
+     * カタログのitemListElementをpaging有で検索する
+     */
+    searchItemListElementById(params: {
+        id: string;
+        limit: number;
+        page: number;
+    }): Promise<{
+        id: string;
+        elementIndex: number;
+    }[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/offerCatalog.js

@@ -270,7 +270,8 @@ class MongoRepository {
                             }
                         },
                         // itemListElement.typeOfを追加(2023-09-14~)
-                        itemListElementTypeOf: { $first: '$itemListElement.typeOf' }
+                        itemListElementTypeOf: { $first: '$itemListElement.typeOf' },
+                        dateSynced: '$dateSynced'
                     }
                 }
             ]);
@@ -282,20 +283,6 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
-    /**
-     * 強制的に親カタログのみ検索する
-     */
-    // public async searchParentCatalogsForcibly(
-    //     params: factory.offerCatalog.ISearchConditions
-    // ): Promise<IAggregatedOfferCatalog[]> {
-    //     return this.search({
-    //         ...params,
-    //         itemListElement: {
-    //             ...params.itemListElement,
-    //             typeOf: { $eq: factory.offerType.Offer }
-    //         }
-    //     });
-    // }
     findItemListElementById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.offerCatalogModel.findOne({
@@ -333,6 +320,34 @@ class MongoRepository {
             return firstElement;
         });
     }
+    /**
+     * カタログのitemListElementをpaging有で検索する
+     */
+    searchItemListElementById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            const matchStages = [{ $match: { _id: { $eq: params.id } } }];
+            return this.offerCatalogModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$itemListElement',
+                        includeArrayIndex: 'elementIndex'
+                    }
+                },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        id: '$itemListElement.id',
+                        elementIndex: '$elementIndex'
+                    }
+                }
+            ])
+                .limit(params.limit * page)
+                .skip(params.limit * (page - 1))
+                .exec();
+        });
+    }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.offerCatalogModel.findOneAndRemove({