@chevre/domain 21.8.0-alpha.62 → 21.8.0-alpha.63

package/example/src/chevre/searchEventTicketOffers.ts

@@ -29,6 +29,7 @@ async function main() {
         onlyValid: true,
         validateOfferRateLimit: true,
         addSortIndex: true,
+        useIncludeInDataCatalog: true,
         limit: 100,
         page: 1
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined

package/example/src/chevre/searchOffersByCatalog.ts

@@ -14,9 +14,10 @@ async function main() {
         page: 1,
         // ids: ['xx', 'xxx', '1001', '901'],
         offerCatalog: {
-            id: '0001'
+            id: '0004'
         },
-        excludeAppliesToMovieTicket: false
+        excludeAppliesToMovieTicket: false,
+        useIncludeInDataCatalog: true
     });
     // console.log(offers);
     console.log(offers.map((offer) => {

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

@@ -24,14 +24,26 @@ export declare class MongoRepository {
         [field: string]: AnyExpression;
     };
     /**
-     * カタログIDで単価オファーを検索する
+     * カタログIDで単価オファーを全て検索する
      * 必ずカタログデータから単価オファーIDを参照する
      */
-    searchByOfferCatalogId(params: {
+    searchAllByOfferCatalogId(params: {
+        offerCatalog: {
+            id: string;
+        };
+        projection?: IProjection;
+    }): Promise<{
+        offers: IUnitPriceOfferFromAggregateOffer[];
+    }>;
+    /**
+     * 単価オファーIDとカタログIDで単価オファーを検索する
+     * 必ずカタログデータから単価オファーIDを参照する
+     */
+    searchByIdsAndOfferCatalogId(params: {
         /**
-         * 指定したIDの単価オファーだけ取得する場合
+         * 指定したIDの単価オファーだけ取得
          */
-        ids?: string[];
+        ids: string[];
         offerCatalog: {
             id: string;
         };
@@ -52,10 +64,6 @@ export declare class MongoRepository {
      * カタログ内ソートインデックスはsortedOfferIdsで判断する
      */
     searchByOfferCatalogIdWithSortIndex(params: {
-        /**
-         * 指定したIDの単価オファーだけ取得する場合
-         */
-        ids?: string[];
         offerCatalog: {
             id: string;
         };
@@ -65,6 +73,7 @@ export declare class MongoRepository {
         unacceptedPaymentMethod?: string[];
         excludeAppliesToMovieTicket: boolean;
         onlyValid?: boolean;
+        useIncludeInDataCatalog: boolean;
         limit?: number;
         page?: number;
         projection?: IProjection;

package/lib/chevre/repo/offer.js

@@ -440,14 +440,45 @@ class MongoRepository {
         return projectStage;
     }
     /**
-     * カタログIDで単価オファーを検索する
+     * カタログIDで単価オファーを全て検索する
      * 必ずカタログデータから単価オファーIDを参照する
      */
-    searchByOfferCatalogId(params) {
+    searchAllByOfferCatalogId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [{ $match: { _id: { $eq: params.offerCatalog.id } } }];
+            const itemListElements = yield this.offerCatalogModel.aggregate([
+                { $unwind: '$itemListElement' },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        id: '$itemListElement.id'
+                    }
+                }
+            ])
+                .exec();
+            const sortedOfferIds = (Array.isArray(itemListElements))
+                ? itemListElements.map((element) => element.id)
+                : [];
+            let offers = [];
+            if (sortedOfferIds.length > 0) {
+                const searchOffersConditions = {
+                    parentOffer: { id: { $in: sortedOfferIds } }
+                };
+                offers = yield this.search(searchOffersConditions, params.projection);
+            }
+            return { offers };
+        });
+    }
+    /**
+     * 単価オファーIDとカタログIDで単価オファーを検索する
+     * 必ずカタログデータから単価オファーIDを参照する
+     */
+    searchByIdsAndOfferCatalogId(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const unitPriceOfferIds = params.ids;
-            let aggregateOfferIds = unitPriceOfferIds; // offersを使用していた段階では、集計オファーIDリストは単価オファーIDリストに等しい
+            let aggregateOfferIds; // 集計オファーIDでフィルターする場合
             if (Array.isArray(unitPriceOfferIds)) {
                 // 解釈を集計オファーIDに変更する必要がある(2023-09-11~)
                 // 単価オファーIDリスト→集計オファーIDに変換→カタログ条件にセット
@@ -508,20 +539,23 @@ class MongoRepository {
     searchByOfferCatalogIdWithSortIndex(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const unitPriceOfferIds = params.ids;
-            let aggregateOfferIds = unitPriceOfferIds; // offersを使用していた段階では、集計オファーIDリストは単価オファー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;
-            }
+            // const unitPriceOfferIds = params.ids;
+            // let aggregateOfferIds: string[] | undefined; // 集計オファーIDでフィルターする場合
+            // if (Array.isArray(unitPriceOfferIds)) {
+            //     // 解釈を集計オファーIDに変更する必要がある(2023-09-11~)
+            //     // 単価オファーIDリスト→集計オファーIDに変換→カタログ条件にセット
+            //     const searchDistinctAggregateOfferIdsResult = await this.aggregateOfferModel.distinct<string>(
+            //         '_id',
+            //         { 'offers.id': { $in: unitPriceOfferIds } }
+            //     )
+            //         .exec();
+            //     aggregateOfferIds = searchDistinctAggregateOfferIdsResult;
+            // }
             // aggregateで再実装(2023-01-26~)
             const matchStages = [{ $match: { _id: { $eq: params.offerCatalog.id } } }];
-            if (Array.isArray(aggregateOfferIds)) {
-                matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: aggregateOfferIds } } });
-            }
+            // if (Array.isArray(aggregateOfferIds)) {
+            //     matchStages.push({ $match: { 'itemListElement.id': { $exists: true, $in: aggregateOfferIds } } });
+            // }
             const itemListElements = yield this.offerCatalogModel.aggregate([
                 { $unwind: '$itemListElement' },
                 ...matchStages,
@@ -538,9 +572,11 @@ class MongoRepository {
                 : [];
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ 
+                const searchOffersConditions = Object.assign(Object.assign(Object.assign(Object.assign(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')
+                    parentOffer: Object.assign({}, (params.useIncludeInDataCatalog)
+                        ? { includedInDataCatalog: { id: { $in: [params.offerCatalog.id] } } }
+                        : { 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)

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -18,6 +18,7 @@ const moment = require("moment-timezone");
 const event_1 = require("../../../repo/event");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
+const findEventOffers_1 = require("./findEventOffers");
 const debug = createDebug('chevre-domain:service');
 /**
  * イベントデータをID指定で集計する
@@ -31,7 +32,7 @@ function aggregateScreeningEvent(params) {
         let aggregatingEvents = [event];
         // プロジェクト限定(2023-02-22~)
         if (settings_1.settings.useOfferRateLimitProjects.includes(event.project.id)) {
-            const availableOffers = yield findOffers({ event })(repos);
+            const availableOffers = yield (0, findEventOffers_1.findEventOffers)({ event })(repos);
             const offerRateLimitExists = availableOffers.some((o) => { var _a; return typeof ((_a = o.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope) === 'string'; });
             if (offerRateLimitExists) {
                 // 同location、かつ同時間帯、のイベントに関しても集計する(ttts暫定対応)
@@ -133,7 +134,7 @@ function aggregateOfferByEvent(params) {
         var _a, _b, _c;
         // プロジェクト限定(2023-02-22~)
         if (settings_1.settings.useAggregateOfferProjects.includes(params.event.project.id)) {
-            const availableOffers = yield findOffers(params)(repos);
+            const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
             // オファーごとの予約集計
             const offersWithAggregateReservation = [];
             for (const o of availableOffers) {
@@ -163,45 +164,6 @@ function aggregateOfferByEvent(params) {
         }
     });
 }
-/**
- * イベントオファー検索
- * NotFoundエラーをハンドリングする
- */
-function findOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        let availableOffers = [];
-        try {
-            // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-            const eventOffers = params.event.offers;
-            if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
-                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    const { offers } = yield repos.offer.searchByOfferCatalogId({
-                        offerCatalog: { id: eventService.hasOfferCatalog.id },
-                        excludeAppliesToMovieTicket: false
-                        // sort: false // ソート不要(2023-01-27~) // 完全廃止(2023-09-04~)
-                    });
-                    availableOffers = offers;
-                }
-            }
-            else {
-                throw new factory.errors.NotFound('event.offers.itemOffered.id');
-            }
-        }
-        catch (error) {
-            let throwsError = true;
-            // 万が一カタログが見つからない場合に対応
-            if (error instanceof factory.errors.NotFound) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        return availableOffers;
-    });
-}
 function calculateOfferCount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -15,6 +15,7 @@ exports.aggregateUseActionsOnEvent = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../factory");
+const findEventOffers_1 = require("./findEventOffers");
 const debug = createDebug('chevre-domain:service');
 function aggregateUseActionsOnEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -88,45 +89,6 @@ function findEntranceGates(params) {
         return movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.hasEntranceGate;
     });
 }
-/**
- * イベントオファー検索
- * NotFoundエラーをハンドリングする
- */
-function findOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        let availableOffers = [];
-        try {
-            // 興行設定があれば興行のカタログを参照する(2022-08-31~)
-            const eventOffers = params.event.offers;
-            if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
-                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    const { offers } = yield repos.offer.searchByOfferCatalogId({
-                        offerCatalog: { id: eventService.hasOfferCatalog.id },
-                        excludeAppliesToMovieTicket: false
-                        // sort: false // ソート不要(2023-01-27~) // 完全廃止(2023-09-04~)
-                    });
-                    availableOffers = offers;
-                }
-            }
-            else {
-                throw new factory.errors.NotFound('event.offers.itemOffered.id');
-            }
-        }
-        catch (error) {
-            let throwsError = true;
-            // 万が一カタログが見つからない場合に対応
-            if (error instanceof factory.errors.NotFound) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        return availableOffers;
-    });
-}
 /**
  * 入場ゲートごとに集計する
  */
@@ -135,7 +97,7 @@ function aggregateEntranceGateByEvent(params) {
         // 入場ゲートの予約使用アクション集計
         const places = [];
         if (Array.isArray(params.entranceGates) && params.entranceGates.length > 0) {
-            const availableOffers = yield findOffers(params)(repos);
+            const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
             // 念のため、identifierの存在する入場ゲートに絞る
             const entranceGates = params.entranceGates.filter((e) => {
                 return typeof e.identifier === 'string' && e.identifier.length > 0;

package/lib/chevre/service/aggregation/event/findEventOffers.d.ts

@@ -0,0 +1,14 @@
+import { IMinimizedIndividualEvent } from '../../../repo/event';
+import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as ProductRepo } from '../../../repo/product';
+import * as factory from '../../../factory';
+/**
+ * イベントオファー検索
+ * NotFoundエラーをハンドリングする
+ */
+export declare function findEventOffers(params: {
+    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
+}): (repos: {
+    product: ProductRepo;
+    offer: OfferRepo;
+}) => Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;

package/lib/chevre/service/aggregation/event/findEventOffers.js

@@ -0,0 +1,51 @@
+"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.findEventOffers = void 0;
+const factory = require("../../../factory");
+/**
+ * イベントオファー検索
+ * NotFoundエラーをハンドリングする
+ */
+function findEventOffers(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        let availableOffers = [];
+        try {
+            // 興行設定があれば興行のカタログを参照する
+            const eventOffers = params.event.offers;
+            if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+                    const { offers } = yield repos.offer.searchAllByOfferCatalogId({
+                        offerCatalog: { id: eventService.hasOfferCatalog.id }
+                    });
+                    availableOffers = offers;
+                }
+            }
+            else {
+                throw new factory.errors.NotFound('event.offers.itemOffered.id');
+            }
+        }
+        catch (error) {
+            let throwsError = true;
+            // 万が一カタログが見つからない場合に対応
+            if (error instanceof factory.errors.NotFound) {
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        return availableOffers;
+    });
+}
+exports.findEventOffers = findEventOffers;

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

@@ -94,7 +94,8 @@ function createTransactionObject(params) {
             ids: params.acceptedOffers.map((o) => o.id),
             itemOffered: { id: String(params.product.id) },
             onlyValid: true,
-            addSortIndex: false
+            addSortIndex: false,
+            useIncludeInDataCatalog: false
         })(repos);
         const transactionObject = [];
         for (const acceptedOffer of params.acceptedOffers) {

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

@@ -120,7 +120,8 @@ function addReservations(params) {
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
                 onlyValid: true,
                 addSortIndex: false,
-                validateOfferRateLimit: true
+                validateOfferRateLimit: true,
+                useIncludeInDataCatalog: false
             })(repos);
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
@@ -476,7 +477,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 }, (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, 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

@@ -239,7 +239,8 @@ function validateAcceptedOffers(params) {
             store: params.store,
             onlyValid: true,
             addSortIndex: false,
-            validateOfferRateLimit: true
+            validateOfferRateLimit: true,
+            useIncludeInDataCatalog: false
         })(repos);
         // 利用可能なチケットオファーであれば受け入れる
         const acceptedOffers = (Array.isArray(acceptedOffersWithoutDetail))

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

@@ -47,6 +47,7 @@ declare function searchEventTicketOffers(params: {
     page?: number;
     addSortIndex: boolean;
     validateOfferRateLimit: boolean;
+    useIncludeInDataCatalog: boolean;
 }): ISearchEventTicketOffersOperation<{
     ticketOffers: ITicketOfferWithSortIndex[];
     unitPriceOffers: factory.unitPriceOffer.IUnitPriceOffer[];

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

@@ -27,32 +27,37 @@ function searchTicketOffersByItemOffered(params) {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
         }
         if (params.withSortIndex) {
+            // addSortIndexの場合はid指定廃止(2023-09-13~)
+            if (Array.isArray(params.ids)) {
+                throw new factory.errors.NotImplemented('id specification on addSortIndex not implemented');
+            }
             const { offers, sortedOfferIds } = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
-                ids: params.ids,
+                // ids: params.ids,
                 offerCatalog: { id: catalogId },
                 availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
                 onlyValid: params.onlyValid === true,
-                // Mongoのpagingを利用するオプション(2023-02-21~)
+                useIncludeInDataCatalog: params.useIncludeInDataCatalog,
                 limit: params.limit,
                 page: params.page
-                // sort: false // 完全廃止(2023-09-04~)
             });
             return { availableOffers: offers, sortedOfferIds };
         }
         else {
-            const { offers } = yield repos.offer.searchByOfferCatalogId({
+            // addSortIndexの場合はid指定廃止(2023-09-13~)
+            if (!Array.isArray(params.ids)) {
+                throw new factory.errors.ArgumentNull('ids', 'ids must be specified');
+            }
+            const { offers } = yield repos.offer.searchByIdsAndOfferCatalogId({
                 ids: params.ids,
                 offerCatalog: { id: catalogId },
                 availableAtOrFrom: { id: (_e = params.store) === null || _e === void 0 ? void 0 : _e.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
                 onlyValid: params.onlyValid === true,
-                // Mongoのpagingを利用するオプション(2023-02-21~)
                 limit: params.limit,
                 page: params.page
-                // sort: false // 完全廃止(2023-09-04~)
             });
             return { availableOffers: offers };
         }
@@ -102,7 +107,8 @@ function searchEventTicketOffersByEvent(params) {
             onlyValid: params.onlyValid,
             unacceptedPaymentMethod,
             excludeAppliesToMovieTicket,
-            withSortIndex: params.addSortIndex
+            withSortIndex: params.addSortIndex,
+            useIncludeInDataCatalog: params.useIncludeInDataCatalog
         })(repos);
         // 冗長な検索について最適化(2023-03-03~)
         const { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({
@@ -266,7 +272,8 @@ function searchEventTicketOffers(params) {
                     page: params.page,
                     addSortIndex: params.addSortIndex,
                     validateOfferRateLimit: params.validateOfferRateLimit,
-                    onlyValid: params.onlyValid === true
+                    onlyValid: params.onlyValid === true,
+                    useIncludeInDataCatalog: params.useIncludeInDataCatalog
                 })(repos);
                 offers = searchOffersResult.ticketOffers;
                 unitPriceOffers = searchOffersResult.unitPriceOffers;

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

@@ -22,6 +22,7 @@ export declare function searchProductOffers(params: {
     };
     onlyValid: boolean;
     addSortIndex: boolean;
+    useIncludeInDataCatalog: boolean;
     limit?: number;
     page?: number;
 }): (repos: {

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

@@ -27,27 +27,34 @@ function searchProductOffers(params) {
         let offers;
         let sortedOfferIds;
         if (params.addSortIndex) {
+            // addSortIndexの場合はid指定廃止(2023-09-13~)
+            if (Array.isArray(params.ids)) {
+                throw new factory.errors.NotImplemented('id specification on addSortIndex not implemented');
+            }
             const searchByOfferCatalogIdResult = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
-                ids: params.ids,
+                // ids: params.ids,
                 offerCatalog: { id: offerCatalogId },
                 excludeAppliesToMovieTicket: false,
                 limit: params.limit,
                 page: params.page,
-                // sort: false, // 完全廃止(2023-09-04~)
                 onlyValid: params.onlyValid === true,
-                availableAtOrFrom: params.availableAt
+                availableAtOrFrom: params.availableAt,
+                useIncludeInDataCatalog: params.useIncludeInDataCatalog
             });
             offers = searchByOfferCatalogIdResult.offers;
             sortedOfferIds = searchByOfferCatalogIdResult.sortedOfferIds;
         }
         else {
-            const searchByOfferCatalogIdResult = yield repos.offer.searchByOfferCatalogId({
+            // addSortIndexの場合はid指定廃止(2023-09-13~)
+            if (!Array.isArray(params.ids)) {
+                throw new factory.errors.ArgumentNull('ids', 'ids must be specified');
+            }
+            const searchByOfferCatalogIdResult = yield repos.offer.searchByIdsAndOfferCatalogId({
                 ids: params.ids,
                 offerCatalog: { id: offerCatalogId },
                 excludeAppliesToMovieTicket: false,
                 limit: params.limit,
                 page: params.page,
-                // sort: false, // 完全廃止(2023-09-04~)
                 onlyValid: params.onlyValid === true,
                 availableAtOrFrom: params.availableAt
             });

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

@@ -55,6 +55,7 @@ export declare function search(params: {
     limit?: number;
     page?: number;
     addSortIndex: boolean;
+    useIncludeInDataCatalog: boolean;
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;

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

@@ -66,7 +66,8 @@ function search(params) {
             itemOffered: { id: params.itemOffered.id },
             availableAt: params.availableAt,
             onlyValid: params.onlyValid,
-            addSortIndex: params.addSortIndex
+            addSortIndex: params.addSortIndex,
+            useIncludeInDataCatalog: params.useIncludeInDataCatalog
         })(repos);
         return { offers, product };
         // Mongoへ移行(2023-03-01~)
@@ -211,7 +212,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 }, (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, 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.8.0-alpha.62"
+  "version": "21.8.0-alpha.63"
 }