@chevre/domain 21.9.0-alpha.0 → 21.9.0-alpha.10

package/example/src/chevre/searchAvaialbleAppliesToMovieTicketByOfferCatalogId.ts

@@ -6,9 +6,12 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+    const productRepo = new chevre.repository.Product(mongoose.connection);
 
-    const result = await offerRepo.searchAvaialbleAppliesToMovieTicketByOfferCatalogId({
+    let result = await offerRepo.searchAvaialbleAppliesToMovieTicketByOfferCatalogId({
         limit: 10,
         page: 1,
         subOfferCatalog: {
@@ -19,6 +22,21 @@ async function main() {
     });
     console.log(result);
     console.log(result.length);
+
+    result = await chevre.service.offer.event.searchOfferAppliesToMovieTicket({
+        event: { id: 'cllkq475p' },
+        onlyValid: true,
+        limit: 100,
+        page: 1
+        // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined
+    })({
+        event: eventRepo,
+        offer: offerRepo,
+        offerCatalog: offerCatalogRepo,
+        product: productRepo
+    });
+    console.log(result);
+    console.log(result.length);
 }
 
 main()

package/example/src/chevre/searchEventTicketOffers.ts

@@ -28,6 +28,7 @@ async function main() {
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
         event: { id: 'ale6qiedq' },
         onlyValid: true,
+        priceSpecification: {},
         validateOfferRateLimit: true,
         addSortIndex: true,
         useIncludeInDataCatalog: true,

package/example/src/chevre/{searchOfferCatalogs.ts → searchOfferCatalogItems.ts}

@@ -9,23 +9,33 @@ mongoose.Model.on('index', (...args) => {
 });
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const catalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+    const catalogItemRepo = new chevre.repository.OfferCatalogItem(mongoose.connection);
 
     console.log('searching...');
-    const catalogs = await catalogRepo.search(
+    const catalogs = await catalogItemRepo.search(
         {
             project: { id: { $eq: PROJECT_ID } },
-            identifier: { $eq: '0001' },
             sort: { identifier: chevre.factory.sortType.Descending },
             limit: 2,
             page: 1,
             itemListElement: { typeOf: { $eq: 'Offer' } }
+            // id: { $in: ['xxx'] }
         }
     );
-    console.log('catalogs found', catalogs.map((catalog) => `${catalog.identifier} ${catalog.numberOfItems} ${catalog.itemListElementTypeOf}`));
+    console.log(catalogs[0]?.id, typeof catalogs[0]?.id);
+    console.log('catalogs found', catalogs.map((catalog) => `${catalog.id} ${catalog.identifier} ${catalog.numberOfItems} ${catalog.itemListElementTypeOf}`));
     console.log(catalogs.length);
+
+    const numCatalogs = await catalogItemRepo.count(
+        {
+            project: { id: { $eq: PROJECT_ID } },
+            itemListElement: { typeOf: { $eq: 'Offer' } }
+            // id: { $in: ['xxx'] }
+        }
+    );
+    console.log('numCatalogs:', numCatalogs);
 }
 
 main()

package/example/src/chevre/searchOffersByCatalog.ts

@@ -14,10 +14,17 @@ async function main() {
         page: 1,
         // ids: ['xx', 'xxx', '1001', '901'],
         subOfferCatalog: {
-            id: 'xxx'
+            id: '0001',
+            isOfferCatalogItem: false
         },
         excludeAppliesToMovieTicket: false,
-        useIncludeInDataCatalog: true
+        useIncludeInDataCatalog: false,
+        priceSpecification: {
+            // appliesToMovieTicket: {
+            //     serviceOutput: { typeOf: { $eq: 'SurfRock' } },
+            //     serviceType: { $exists: true }
+            // }
+        }
     });
     // console.log(offers);
     console.log(offers.map((offer) => {

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

@@ -11,18 +11,19 @@ export type IUnitPriceOfferFromAggregateOffer = factory.unitPriceOffer.IUnitPric
         id: string;
     };
 };
+type ISearchConditions = factory.unitPriceOffer.ISearchConditions;
 /**
  * 集計オファーリポジトリ
  */
 export declare class MongoRepository {
     private readonly aggregateOfferModel;
     constructor(connection: Connection);
-    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: factory.unitPriceOffer.ISearchConditions): IMatchStage[];
+    static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: ISearchConditions): IMatchStage[];
     static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): {
         [field: string]: AnyExpression;
     };
-    count(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
-    search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.aggregateOffer.IAggregateOffer[]>;
+    count(params: Omit<ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
+    search(params: ISearchConditions, projection?: IProjection): Promise<factory.aggregateOffer.IAggregateOffer[]>;
     pushIncludedInDataCatalog(params: {
         project: {
             id: string;
@@ -58,5 +59,11 @@ export declare class MongoRepository {
             };
         };
     }): Promise<void>;
+    deleteById(params: {
+        project: {
+            id: string;
+        };
+        id: string;
+    }): Promise<void>;
 }
 export {};

package/lib/chevre/repo/aggregateOffer.js

@@ -558,5 +558,14 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.aggregateOfferModel.findOneAndRemove({
+                _id: { $eq: params.id },
+                'project.id': { $eq: params.project.id }
+            }, { projection: { _id: 1 } })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/mongoose/schemas/offerCatalogItem.d.ts

@@ -0,0 +1,92 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import { Schema } from 'mongoose';
+declare const modelName = "OfferCatalogItem";
+/**
+ * オファーカタログアイテムスキーマ
+ */
+declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
+    collection: string;
+    id: true;
+    read: string;
+    writeConcern: import("mongodb").WriteConcern;
+    strict: true;
+    strictQuery: false;
+    timestamps: {
+        createdAt: string;
+        updatedAt: string;
+    };
+    toJSON: {
+        getters: false;
+        virtuals: false;
+        minimize: false;
+        versionKey: false;
+    };
+    toObject: {
+        getters: false;
+        virtuals: true;
+        minimize: false;
+        versionKey: false;
+    };
+}, {
+    typeOf: string;
+    additionalProperty: any[];
+    identifier: string;
+    itemListElement: any[];
+    name?: any;
+    project?: any;
+    alternateName?: any;
+    description?: any;
+    itemOffered?: any;
+    dateSynced?: Date | undefined;
+    relatedOffer?: any;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    typeOf: string;
+    additionalProperty: any[];
+    identifier: string;
+    itemListElement: any[];
+    name?: any;
+    project?: any;
+    alternateName?: any;
+    description?: any;
+    itemOffered?: any;
+    dateSynced?: Date | undefined;
+    relatedOffer?: any;
+}>> & Omit<import("mongoose").FlatRecord<{
+    typeOf: string;
+    additionalProperty: any[];
+    identifier: string;
+    itemListElement: any[];
+    name?: any;
+    project?: any;
+    alternateName?: any;
+    description?: any;
+    itemOffered?: any;
+    dateSynced?: Date | undefined;
+    relatedOffer?: any;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+}, never>>;
+export { modelName, schema };

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

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = exports.modelName = void 0;
+const mongoose_1 = require("mongoose");
+const writeConcern_1 = require("../writeConcern");
+const modelName = 'OfferCatalogItem';
+exports.modelName = modelName;
+/**
+ * オファーカタログアイテムスキーマ
+ */
+const schema = new mongoose_1.Schema({
+    project: mongoose_1.SchemaTypes.Mixed,
+    identifier: {
+        type: String,
+        required: true
+    },
+    name: mongoose_1.SchemaTypes.Mixed,
+    description: mongoose_1.SchemaTypes.Mixed,
+    alternateName: mongoose_1.SchemaTypes.Mixed,
+    typeOf: {
+        type: String,
+        required: true
+    },
+    itemListElement: [mongoose_1.SchemaTypes.Mixed],
+    itemOffered: mongoose_1.SchemaTypes.Mixed,
+    additionalProperty: [mongoose_1.SchemaTypes.Mixed],
+    dateSynced: Date,
+    relatedOffer: mongoose_1.SchemaTypes.Mixed
+}, {
+    collection: 'offerCatalogItems',
+    id: true,
+    read: 'primaryPreferred',
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: {
+        createdAt: 'createdAt',
+        updatedAt: 'updatedAt'
+    },
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+});
+exports.schema = schema;
+schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
+schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });

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

@@ -17,6 +17,7 @@ export type IUnitPriceOfferFromAggregateOffer = factory.unitPriceOffer.IUnitPric
 export declare class MongoRepository {
     private readonly aggregateOfferModel;
     private readonly offerCatalogModel;
+    private readonly offerCatalogItemModel;
     constructor(connection: Connection);
     static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): IMatchStage[];
     static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): {
@@ -32,6 +33,7 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
+            isOfferCatalogItem: boolean;
         };
         projection?: IProjection;
     }): Promise<{
@@ -51,6 +53,7 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
+            isOfferCatalogItem: boolean;
         };
         availableAtOrFrom?: {
             id?: string;
@@ -74,12 +77,17 @@ export declare class MongoRepository {
              * サブカタログID
              */
             id: string;
+            isOfferCatalogItem: boolean;
         };
         availableAtOrFrom?: {
             id?: string;
         };
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
+        /**
+         * 適用決済カード条件
+         */
+        priceSpecification: Pick<factory.unitPriceOffer.IPriceSpecificationSearchConditions, 'appliesToMovieTicket'>;
         onlyValid?: boolean;
         useIncludeInDataCatalog: boolean;
         limit?: number;
@@ -111,12 +119,6 @@ export declare class MongoRepository {
         limit?: number;
         page?: number;
     }): Promise<Pick<factory.priceSpecification.unitPrice.IAppliesToMovieTicket, 'serviceOutput'>[]>;
-    findAggregateOfferById(params: {
-        project: {
-            id: string;
-        };
-        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 & {
@@ -144,12 +146,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,10 +21,12 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+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 OFFERS_ARRAY_INDEX_NAME = 'offerIndex';
 /**
  * 単価オファーリポジトリ
@@ -33,6 +35,7 @@ class MongoRepository {
     constructor(connection) {
         this.aggregateOfferModel = connection.model(aggregateOffer_1.modelName, aggregateOffer_1.schema);
         this.offerCatalogModel = connection.model(offerCatalog_1.modelName, offerCatalog_1.schema);
+        this.offerCatalogItemModel = connection.model(offerCatalogItem_1.modelName, offerCatalogItem_1.schema);
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params) {
@@ -442,7 +445,8 @@ class MongoRepository {
     searchAllByOfferCatalogId(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
-                id: params.subOfferCatalog.id
+                id: params.subOfferCatalog.id,
+                isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
             });
             let offers = [];
             if (sortedOfferIds.length > 0) {
@@ -470,7 +474,7 @@ class MongoRepository {
                     .exec();
                 aggregateOfferIds = searchDistinctAggregateOfferIdsResult;
             }
-            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog(Object.assign({ id: params.subOfferCatalog.id }, (Array.isArray(aggregateOfferIds)) ? { itemListElementIds: aggregateOfferIds } : undefined));
+            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog(Object.assign({ id: params.subOfferCatalog.id, isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem }, (Array.isArray(aggregateOfferIds)) ? { itemListElementIds: aggregateOfferIds } : undefined));
             let offers = [];
             if (sortedOfferIds.length > 0) {
                 const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ 
@@ -503,30 +507,38 @@ 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
+                id: params.subOfferCatalog.id,
+                isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
             });
             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')
-                    ? { availableAtOrFrom: { id: { $eq: params.availableAtOrFrom.id } } }
-                    : 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')
+                    : { 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), (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);
@@ -577,23 +589,27 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
-    findAggregateOfferById(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();
-        });
-    }
+    // 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);
@@ -785,32 +801,56 @@ 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リストを検索する
      */
     searchAggregateOfferIdsBySubOfferCatalog(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [{ $match: { _id: { $eq: params.id } } }];
-            if (Array.isArray(params.itemListElementIds)) {
-                matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } });
-            }
-            const itemListElements = yield this.offerCatalogModel.aggregate([
-                { $unwind: '$itemListElement' },
-                ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        id: '$itemListElement.id'
+            let itemListElements;
+            if (params.isOfferCatalogItem) {
+                const matchStages = [{ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.id) } } }]; // ObjectIdなので注意
+                if (Array.isArray(params.itemListElementIds)) {
+                    matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } });
+                }
+                itemListElements = yield this.offerCatalogItemModel.aggregate([
+                    { $unwind: '$itemListElement' },
+                    ...matchStages,
+                    {
+                        $project: {
+                            _id: 0,
+                            id: '$itemListElement.id'
+                        }
                     }
+                ])
+                    .exec();
+            }
+            else {
+                const matchStages = [{ $match: { _id: { $eq: params.id } } }];
+                if (Array.isArray(params.itemListElementIds)) {
+                    matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } });
                 }
-            ])
-                .exec();
+                itemListElements = yield this.offerCatalogModel.aggregate([
+                    { $unwind: '$itemListElement' },
+                    ...matchStages,
+                    {
+                        $project: {
+                            _id: 0,
+                            id: '$itemListElement.id'
+                        }
+                    }
+                ])
+                    .exec();
+            }
             return (Array.isArray(itemListElements))
                 ? itemListElements.map((element) => element.id)
                 : [];

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

@@ -82,10 +82,6 @@ export declare class MongoRepository {
         };
     }): Promise<import("mongodb").UpdateResult | undefined>;
     search(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
-    /**
-     * 強制的に親カタログのみ検索する
-     */
-    searchParentCatalogsForcibly(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {
         id: string;
         project: {

package/lib/chevre/repo/offerCatalog.js

@@ -282,14 +282,6 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
-    /**
-     * 強制的に親カタログのみ検索する
-     */
-    searchParentCatalogsForcibly(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.search(Object.assign(Object.assign({}, params), { itemListElement: Object.assign(Object.assign({}, params.itemListElement), { typeOf: { $eq: factory.offerType.Offer } }) }));
-        });
-    }
     findItemListElementById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.offerCatalogModel.findOne({