@chevre/domain 21.10.0 → 21.11.0-alpha.1

package/example/src/chevre/offer/searchAllByIdsAndOfferCatalogId.ts

@@ -0,0 +1,34 @@
+// tslint:disable:no-console
+// import * as redis from 'redis';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+
+    const offers = await offerRepo.searchAllByIdsAndOfferCatalogId({
+        ids: ['xx', 'xxx', '1001', '901'],
+        includedInDataCatalog: {
+            // id: ['0001'],
+            // isOfferCatalogItem: false
+            id: ['6509262f69b07dde13c708eb', '6509262f69b07dde13c708ex', '6508dd91584bb60769914d2b', '651360e04df434b49114e4bb'],
+            isOfferCatalogItem: true
+        },
+        excludeAppliesToMovieTicket: false
+    });
+    // console.log(offers);
+    console.log(offers.map((offer) => {
+        return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id} ${offer.offerIndex}`;
+    }));
+    console.log(offers.length);
+}
+
+main()
+    .then(console.log)
+    .catch((error) => {
+        console.error(chevre.errorHandler.handleMongoError(error));
+        console.error(error.name, error.code, error.message);
+    });

package/example/src/chevre/{searchEventTicketOffers.ts → offer/searchEventTicketOffers.ts}

@@ -2,7 +2,7 @@
 import * as mongoose from 'mongoose';
 import * as redis from 'redis';
 
-import { chevre } from '../../../lib/index';
+import { chevre } from '../../../../lib/index';
 
 // const PROJECT_ID = process.env.PROJECT_ID;
 
@@ -28,6 +28,7 @@ async function main() {
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
         event: { id: 'ale6qiedq' },
         onlyValid: true,
+        includedInDataCatalog: { id: '' },
         priceSpecification: {},
         validateOfferRateLimit: true,
         addSortIndex: true,

package/example/src/chevre/{searchOffersByCatalog.ts → offer/searchOffersByCatalog.ts}

@@ -2,7 +2,7 @@
 // import * as redis from 'redis';
 import * as mongoose from 'mongoose';
 
-import { chevre } from '../../../lib/index';
+import { chevre } from '../../../../lib/index';
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
@@ -13,7 +13,7 @@ async function main() {
         limit: 10,
         page: 1,
         // ids: ['xx', 'xxx', '1001', '901'],
-        subOfferCatalog: {
+        offerCatalog: {
             id: '0001',
             isOfferCatalogItem: false
         },
@@ -33,7 +33,6 @@ async function main() {
         return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id} ${offer.offerIndex} ${sortIndex}`;
     }));
     console.log(offers.length);
-    console.log('USE_AGGREGATE_OFFERS_AS_PRIMARY:', process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY);
 }
 
 main()

package/lib/chevre/errorHandler.js

@@ -33,6 +33,9 @@ function handleMongoError(error) {
             default:
         }
     }
+    if (mongoose_1.mongo.BSON.BSONError.isBSONError(handledError)) {
+        handledError = new factory_1.errors.Argument('', handledError.message);
+    }
     return handledError;
 }
 exports.handleMongoError = handleMongoError;

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

@@ -48,11 +48,11 @@ export declare class MongoRepository {
          * 指定したIDの単価オファーだけ取得
          */
         ids: string[];
-        subOfferCatalog: {
+        includedInDataCatalog: {
             /**
-             * サブカタログID
+             * オファー記載のカタログID(複数対応)
              */
-            id: string;
+            id: string[];
             isOfferCatalogItem: boolean;
         };
         availableAtOrFrom?: {
@@ -62,15 +62,13 @@ export declare class MongoRepository {
         excludeAppliesToMovieTicket: boolean;
         onlyValid?: boolean;
         projection?: IProjection;
-    }): Promise<{
-        offers: IUnitPriceOfferFromAggregateOffer[];
-    }>;
+    }): Promise<IUnitPriceOfferFromAggregateOffer[]>;
     /**
      * カタログに含まれるオファーを検索する(カタログ内ソートは保証しない)
      * カタログ内ソートインデックスはsortedOfferIdsで判断する
      */
     searchByOfferCatalogIdWithSortIndex(params: {
-        subOfferCatalog: {
+        offerCatalog: {
             /**
              * サブカタログID
              */
@@ -166,5 +164,9 @@ export declare class MongoRepository {
      * サブカタログから集計オファーIDリストを検索する
      */
     private searchAggregateOfferIdsBySubOfferCatalog;
+    /**
+     * 複数サブカタログから集計オファーIDリストを検索する
+     */
+    private searchAggregateOfferIdsBySubOfferCatalogs;
 }
 export {};

package/lib/chevre/repo/offer.js

@@ -492,17 +492,17 @@ class MongoRepository {
             if (aggregateOfferIds.length === 0) {
                 throw new factory.errors.NotFound(factory.offerType.AggregateOffer);
             }
-            const sortedOfferIds = yield this.searchAggregateOfferIdsBySubOfferCatalog({
-                id: params.subOfferCatalog.id,
-                isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem,
+            const aggregateOfferIdsInDataCatalog = yield this.searchAggregateOfferIdsBySubOfferCatalogs({
+                id: params.includedInDataCatalog.id,
+                isOfferCatalogItem: params.includedInDataCatalog.isOfferCatalogItem,
                 itemListElementIds: aggregateOfferIds
             });
             let offers = [];
-            if (sortedOfferIds.length > 0) {
-                debug('searchAllByIdsAndOfferCatalogId:searching offers...,sortedOfferIds:', sortedOfferIds, 'ids:', params.ids);
+            if (aggregateOfferIdsInDataCatalog.length > 0) {
+                debug('searchAllByIdsAndOfferCatalogId:searching offers...,aggregateOfferIdsInDataCatalog:', aggregateOfferIdsInDataCatalog, 'ids:', params.ids);
                 const searchOffersConditions = Object.assign({ 
                     // aggregateOffer.idで検索する(2023-09-09~)
-                    parentOffer: { id: { $in: sortedOfferIds } }, id: { $in: params.ids }, priceSpecification: {
+                    parentOffer: { id: { $in: aggregateOfferIdsInDataCatalog } }, id: { $in: params.ids }, priceSpecification: {
                         appliesToMovieTicket: Object.assign(Object.assign({}, (Array.isArray(params.unacceptedPaymentMethod) && params.unacceptedPaymentMethod.length > 0)
                             ? {
                                 serviceOutput: {
@@ -516,17 +516,10 @@ class MongoRepository {
                             : 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
-                );
+                    : undefined);
                 offers = yield this.search(searchOffersConditions, params.projection);
             }
-            return { offers };
+            return offers;
         });
     }
     /**
@@ -537,8 +530,8 @@ class MongoRepository {
         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,
-                isOfferCatalogItem: params.subOfferCatalog.isOfferCatalogItem
+                id: params.offerCatalog.id,
+                isOfferCatalogItem: params.offerCatalog.isOfferCatalogItem
             });
             let offers = [];
             if (sortedOfferIds.length > 0) {
@@ -562,7 +555,7 @@ class MongoRepository {
                         : 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] } } }
+                    ? { includedInDataCatalog: { id: { $in: [params.offerCatalog.id] } } }
                     : { 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')
@@ -891,9 +884,6 @@ class MongoRepository {
             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,
@@ -908,9 +898,6 @@ class MongoRepository {
             }
             else {
                 const matchStages = [{ $match: { _id: { $eq: params.id } } }];
-                if (Array.isArray(params.itemListElementIds)) {
-                    matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } });
-                }
                 itemListElements = yield this.offerCatalogModel.aggregate([
                     { $unwind: '$itemListElement' },
                     ...matchStages,
@@ -928,5 +915,53 @@ class MongoRepository {
                 : [];
         });
     }
+    /**
+     * 複数サブカタログから集計オファー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');
+            }
+            let itemListElements;
+            if (params.isOfferCatalogItem) {
+                const matchStages = [
+                    { $match: { _id: { $in: params.id.map((id) => new mongoose_1.Types.ObjectId(id)) } } },
+                    { $match: { 'itemListElement.id': { $exists: true, $in: params.itemListElementIds } } }
+                ];
+                itemListElements = yield 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');
+                }
+                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)
+                : [];
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/service/assetTransaction/registerService.js

@@ -94,6 +94,7 @@ function createTransactionObject(params) {
             ids: params.acceptedOffers.map((o) => o.id),
             itemOffered: { id: String(params.product.id) },
             onlyValid: true,
+            includedInDataCatalog: { id: '' },
             addSortIndex: false,
             useIncludeInDataCatalog: false
         })(repos);

package/lib/chevre/service/assetTransaction/reserve.js

@@ -119,6 +119,7 @@ function addReservations(params) {
                 // 対応アプリケーション条件追加(2023-01-27~)
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
                 priceSpecification: {},
+                includedInDataCatalog: { id: '' },
                 onlyValid: true,
                 addSortIndex: false,
                 validateOfferRateLimit: true,
@@ -478,7 +479,7 @@ function searchAvailableAddOns(params) {
         if (Array.isArray(params.ticketOffer.addOn)) {
             const addOnProductIds = [...new Set(params.ticketOffer.addOn.map((o) => String(o.itemOffered.id)))];
             for (const addOnProductId of addOnProductIds) {
-                const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false, useIncludeInDataCatalog: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false, includedInDataCatalog: { id: '' }, useIncludeInDataCatalog: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAt: { id: params.availableAtOrFrom.id } }
                     : undefined))(repos);
                 availableAddOns.push(...offers.map((o) => {

package/lib/chevre/service/offer/event/authorize.js

@@ -238,6 +238,7 @@ function validateAcceptedOffers(params) {
             event: { id: params.event.id },
             store: params.store,
             priceSpecification: {},
+            includedInDataCatalog: { id: '' },
             onlyValid: true,
             addSortIndex: false,
             validateOfferRateLimit: true,

package/lib/chevre/service/offer/event/searchEventTicketOffers.d.ts

@@ -41,6 +41,9 @@ declare function searchEventTicketOffers(params: {
      */
     onlyValid: boolean;
     priceSpecification: Pick<factory.unitPriceOffer.IPriceSpecificationSearchConditions, 'appliesToMovieTicket'>;
+    includedInDataCatalog: {
+        id: string;
+    };
     limit?: number;
     page?: number;
     addSortIndex: boolean;

package/lib/chevre/service/offer/event/searchEventTicketOffers.js

@@ -16,12 +16,11 @@ const factory_1 = require("../factory");
 function searchTicketOffersByItemOffered(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
+        let eventService;
         let catalogId;
-        if (typeof ((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = yield repos.product.findById({ id: (_b = params.itemOffered) === null || _b === void 0 ? void 0 : _b.id }, ['hasOfferCatalog'], []);
-            if (typeof ((_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
-                catalogId = eventService.hasOfferCatalog.id;
-            }
+        eventService = yield repos.product.findById({ id: (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id }, ['hasOfferCatalog', 'project'], []);
+        if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+            catalogId = eventService.hasOfferCatalog.id;
         }
         if (typeof catalogId !== 'string') {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
@@ -39,9 +38,20 @@ function searchTicketOffersByItemOffered(params) {
             if (Array.isArray(params.ids)) {
                 throw new factory.errors.NotImplemented('id specification on addSortIndex not implemented');
             }
+            // 明示的にカタログ指定可能にする
+            if (typeof ((_c = params.includedInDataCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string' && params.includedInDataCatalog.id.length > 0) {
+                if (isOfferCatalogItem) {
+                    // no op
+                }
+                else {
+                    if (subOfferCatalogId !== params.includedInDataCatalog.id) {
+                        throw new factory.errors.Argument('includedInDataCatalog.id', 'invalid offerCatalog');
+                    }
+                }
+                subOfferCatalogId = params.includedInDataCatalog.id;
+            }
             const { offers, sortedOfferIds } = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
-                // ids: params.ids,
-                subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
+                offerCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
@@ -54,21 +64,28 @@ function searchTicketOffersByItemOffered(params) {
             return { availableOffers: offers, sortedOfferIds };
         }
         else {
-            // addSortIndexの場合はid指定廃止(2023-09-13~)
+            // id指定必須(2023-09-13~)
             if (!Array.isArray(params.ids)) {
                 throw new factory.errors.ArgumentNull('ids', 'ids must be specified');
             }
-            const { offers } = yield repos.offer.searchAllByIdsAndOfferCatalogId({
+            let includedInDataCatalogIds = [subOfferCatalogId];
+            if (isOfferCatalogItem) {
+                // 複数カタログ対応(2023-09-27~)
+                const offerCatalogItems = yield repos.offerCatalog.findItemListElementById({
+                    id: catalogId,
+                    project: { id: eventService.project.id }
+                });
+                includedInDataCatalogIds = offerCatalogItems.itemListElement.map((element) => element.id);
+            }
+            const availableOffers = yield repos.offer.searchAllByIdsAndOfferCatalogId({
                 ids: params.ids,
-                subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
+                includedInDataCatalog: { id: includedInDataCatalogIds, isOfferCatalogItem },
                 availableAtOrFrom: { id: (_e = params.store) === null || _e === void 0 ? void 0 : _e.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
                 onlyValid: params.onlyValid === true
-                // limit: params.limit,
-                // page: params.page
             });
-            return { availableOffers: offers };
+            return { availableOffers };
         }
     });
 }
@@ -108,12 +125,13 @@ function searchEventTicketOffersByEvent(params) {
         // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         const eventOffers = event.offers;
         const { availableOffers, sortedOfferIds } = yield searchTicketOffersByItemOffered({
-            itemOffered: { id: (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id },
+            itemOffered: { id: String((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) },
             ids: params.ids,
             store: params.store,
             limit: params.limit,
             page: params.page,
             onlyValid: params.onlyValid,
+            includedInDataCatalog: params.includedInDataCatalog,
             unacceptedPaymentMethod,
             excludeAppliesToMovieTicket,
             priceSpecification: params.priceSpecification,
@@ -279,6 +297,7 @@ function searchEventTicketOffers(params) {
                     event,
                     store: params.store,
                     priceSpecification: params.priceSpecification,
+                    includedInDataCatalog: params.includedInDataCatalog,
                     limit: params.limit,
                     page: params.page,
                     addSortIndex: params.addSortIndex,

package/lib/chevre/service/offer/product/searchProductOffers.d.ts

@@ -24,6 +24,9 @@ export declare function searchProductOffers(params: {
     onlyValid: boolean;
     addSortIndex: boolean;
     useIncludeInDataCatalog: boolean;
+    includedInDataCatalog: {
+        id: string;
+    };
     limit?: number;
     page?: number;
 }): (repos: {

package/lib/chevre/service/offer/product/searchProductOffers.js

@@ -15,12 +15,12 @@ const settings_1 = require("../../../settings");
 /**
  * プロダクトオファーを検索する
  */
-// tslint:disable-next-line:max-func-body-length
 function searchProductOffers(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         // プロダクト検索
-        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id }, ['hasOfferCatalog'], []);
+        const productWithOffers = yield repos.product.findById({ id: params.itemOffered.id }, ['hasOfferCatalog', 'project'], []);
         const offerCatalogId = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof offerCatalogId !== 'string') {
             return [];
@@ -40,9 +40,20 @@ function searchProductOffers(params) {
             if (Array.isArray(params.ids)) {
                 throw new factory.errors.NotImplemented('id specification on addSortIndex not implemented');
             }
+            // 明示的にカタログ指定可能にする
+            if (typeof ((_b = params.includedInDataCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string' && params.includedInDataCatalog.id.length > 0) {
+                if (isOfferCatalogItem) {
+                    // no op
+                }
+                else {
+                    if (subOfferCatalogId !== params.includedInDataCatalog.id) {
+                        throw new factory.errors.Argument('includedInDataCatalog.id', 'invalid offerCatalog');
+                    }
+                }
+                subOfferCatalogId = params.includedInDataCatalog.id;
+            }
             const searchByOfferCatalogIdResult = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
-                // ids: params.ids,
-                subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
+                offerCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
                 priceSpecification: {},
                 limit: params.limit,
@@ -55,20 +66,27 @@ function searchProductOffers(params) {
             sortedOfferIds = searchByOfferCatalogIdResult.sortedOfferIds;
         }
         else {
-            // addSortIndexの場合はid指定廃止(2023-09-13~)
+            // id指定必須(2023-09-13~)
             if (!Array.isArray(params.ids)) {
                 throw new factory.errors.ArgumentNull('ids', 'ids must be specified');
             }
+            let includedInDataCatalogIds = [subOfferCatalogId];
+            if (isOfferCatalogItem) {
+                // 複数カタログ対応(2023-09-27~)
+                const offerCatalogItems = yield repos.offerCatalog.findItemListElementById({
+                    id: offerCatalogId,
+                    project: { id: productWithOffers.project.id }
+                });
+                includedInDataCatalogIds = offerCatalogItems.itemListElement.map((element) => element.id);
+            }
             const searchByOfferCatalogIdResult = yield repos.offer.searchAllByIdsAndOfferCatalogId({
                 ids: params.ids,
-                subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
+                includedInDataCatalog: { id: includedInDataCatalogIds, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
-                // limit: params.limit,
-                // page: params.page,
                 onlyValid: params.onlyValid === true,
                 availableAtOrFrom: params.availableAt
             });
-            offers = searchByOfferCatalogIdResult.offers;
+            offers = searchByOfferCatalogIdResult;
         }
         return offers.map((o) => {
             var _a;

package/lib/chevre/service/offer/product.d.ts

@@ -52,6 +52,9 @@ export declare function search(params: {
         id: string;
     };
     onlyValid: boolean;
+    includedInDataCatalog: {
+        id: string;
+    };
     limit?: number;
     page?: number;
     addSortIndex: boolean;

package/lib/chevre/service/offer/product.js

@@ -64,6 +64,7 @@ function search(params) {
             itemOffered: { id: params.itemOffered.id },
             availableAt: params.availableAt,
             onlyValid: params.onlyValid,
+            includedInDataCatalog: params.includedInDataCatalog,
             addSortIndex: params.addSortIndex,
             useIncludeInDataCatalog: params.useIncludeInDataCatalog,
             limit: params.limit,
@@ -185,7 +186,7 @@ function fixProductAndOffers(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, addSortIndex: false, useIncludeInDataCatalog: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
+        const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, includedInDataCatalog: { id: '' }, addSortIndex: false, useIncludeInDataCatalog: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
         return { product, availableOffers: offers };
     });
 }

package/package.json

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