@chevre/domain 22.5.0-alpha.1 → 22.5.0-alpha.3

package/example/src/chevre/projectFields.ts

@@ -8,15 +8,15 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const repo = await chevre.repository.Product.createInstance(mongoose.connection);
+    const repo = await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection);
 
     const docs = await repo.projectFields(
         {
-            limit: 1,
+            limit: 10,
             page: 1,
             project: { id: { $eq: project.id } }
         },
-        ['hasOfferCatalog.id']
+        ['relatedOffer']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });

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

@@ -52,7 +52,7 @@ const schemaOptions = {
     }
 };
 /**
- * オファーカタログアイテムスキーマ
+ * サブカタログスキーマ
  */
 let schema;
 function createSchema() {

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

@@ -30,8 +30,9 @@ export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, '
     numberOfItems?: number;
     itemListElementTypeOf: factory.offerType.Offer | 'OfferCatalog';
 };
+type IKeyOfProjection = 'name' | 'description' | 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'numberOfItems' | 'itemListElementTypeOf' | 'dateSynced';
 /**
- * オファーカタログリポジトリ
+ * カタログリポジトリ
  */
 export declare class OfferCatalogRepo {
     private readonly offerCatalogModel;
@@ -105,7 +106,7 @@ export declare class OfferCatalogRepo {
             };
         };
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
-    search(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
+    projectFields(params: factory.offerCatalog.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {
         id: string;
         project: {
@@ -155,3 +156,4 @@ export declare class OfferCatalogRepo {
         _id: string;
     }>>>;
 }
+export {};

package/lib/chevre/repo/offerCatalog.js

@@ -23,8 +23,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OfferCatalogRepo = void 0;
 const factory = require("../factory");
 const offerCatalog_1 = require("./mongoose/schemas/offerCatalog");
+const AVAILABLE_PROJECT_FIELDS = [
+    'name',
+    'description',
+    'project',
+    'typeOf',
+    'identifier',
+    'itemOffered',
+    'additionalProperty',
+    'numberOfItems',
+    'itemListElementTypeOf',
+    'dateSynced'
+];
 /**
- * オファーカタログリポジトリ
+ * カタログリポジトリ
  */
 class OfferCatalogRepo {
     constructor(connection) {
@@ -294,39 +306,44 @@ class OfferCatalogRepo {
                 .exec();
         });
     }
-    search(params) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = OfferCatalogRepo.CREATE_MONGO_CONDITIONS(params);
             const matchStages = conditions.map((condition) => {
                 return { $match: condition };
             });
-            const aggregate = this.offerCatalogModel.aggregate([
-                ...(((_a = params.sort) === null || _a === void 0 ? void 0 : _a.identifier) !== undefined) ? [{ $sort: { identifier: params.sort.identifier } }] : [],
-                ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        name: '$name',
-                        description: '$description',
-                        project: '$project',
-                        typeOf: '$typeOf',
-                        id: '$_id',
-                        identifier: '$identifier',
-                        itemOffered: '$itemOffered',
-                        additionalProperty: '$additionalProperty',
-                        numberOfItems: {
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            else {
+                // throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            }
+            const projection = Object.assign({ _id: 0, id: '$_id' }, Object.fromEntries(positiveProjectionFields.map((key) => {
+                let value;
+                switch (key) {
+                    case 'numberOfItems':
+                        value = {
                             $cond: {
                                 if: { $isArray: '$itemListElement' },
                                 then: { $size: '$itemListElement' },
                                 else: 0
                             }
-                        },
-                        // itemListElement.typeOfを追加(2023-09-14~)
-                        itemListElementTypeOf: { $first: '$itemListElement.typeOf' },
-                        dateSynced: '$dateSynced'
-                    }
+                        };
+                        break;
+                    case 'itemListElementTypeOf':
+                        value = { $first: '$itemListElement.typeOf' };
+                        break;
+                    default:
+                        value = 1;
                 }
+                return [key, value];
+            })));
+            const aggregate = this.offerCatalogModel.aggregate([
+                ...(((_a = params.sort) === null || _a === void 0 ? void 0 : _a.identifier) !== undefined) ? [{ $sort: { identifier: params.sort.identifier } }] : [],
+                ...matchStages,
+                { $project: projection }
             ]);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;

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

@@ -29,12 +29,9 @@ export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, '
     numberOfItems?: number;
     itemListElementTypeOf: factory.offerType.Offer;
 };
-type KeyOfOfferCatalogItem = keyof factory.offerCatalog.IOfferCatalog;
-type IProjection = {
-    [key in KeyOfOfferCatalogItem]?: 0 | 1;
-};
+type IKeyOfProjection = 'name' | 'description' | 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'numberOfItems' | 'itemListElementTypeOf' | 'dateSynced' | 'relatedOffer';
 /**
- * オファーカタログアイテムリポジトリ
+ * サブカタログリポジトリ
  */
 export declare class OfferCatalogItemRepo {
     private readonly offerCatalogItemModel;
@@ -93,7 +90,7 @@ export declare class OfferCatalogItemRepo {
         };
     }): Promise<void>;
     count(params: Omit<factory.offerCatalog.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
-    search(params: factory.offerCatalog.ISearchConditions, projection: IProjection): Promise<IAggregatedOfferCatalog[]>;
+    projectFields(params: factory.offerCatalog.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {
         id: string;
         project: {

package/lib/chevre/repo/offerCatalogItem.js

@@ -24,8 +24,21 @@ exports.OfferCatalogItemRepo = void 0;
 const mongoose_1 = require("mongoose");
 const factory = require("../factory");
 const offerCatalogItem_1 = require("./mongoose/schemas/offerCatalogItem");
+const AVAILABLE_PROJECT_FIELDS = [
+    'name',
+    'description',
+    'project',
+    'typeOf',
+    'identifier',
+    'itemOffered',
+    'additionalProperty',
+    'numberOfItems',
+    'itemListElementTypeOf',
+    'dateSynced',
+    'relatedOffer'
+];
 /**
- * オファーカタログアイテムリポジトリ
+ * サブカタログリポジトリ
  */
 class OfferCatalogItemRepo {
     constructor(connection) {
@@ -248,61 +261,87 @@ class OfferCatalogItemRepo {
             return (result.length > 0) ? result[0].numItems : 0;
         });
     }
-    search(params, projection) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = OfferCatalogItemRepo.CREATE_MONGO_CONDITIONS(params);
             const matchStages = conditions.map((condition) => {
                 return { $match: condition };
             });
-            let projectStage = {
-                _id: 0,
-                name: '$name',
-                description: '$description',
-                project: '$project',
-                typeOf: '$typeOf',
-                id: { $toString: '$_id' },
-                identifier: '$identifier',
-                itemOffered: '$itemOffered',
-                additionalProperty: '$additionalProperty',
-                relatedOffer: '$relatedOffer',
-                numberOfItems: {
-                    $cond: {
-                        if: { $isArray: '$itemListElement' },
-                        then: { $size: '$itemListElement' },
-                        else: 0
-                    }
-                },
-                itemListElementTypeOf: { $first: '$itemListElement.typeOf' },
-                dateSynced: '$dateSynced'
-            };
-            const positiveProjectionFields = Object.keys(projection)
-                .filter((key) => projection[key] !== 0);
-            const negativeProjectionFields = Object.keys(projection)
-                .filter((key) => projection[key] === 0);
-            if (positiveProjectionFields.length > 0) {
-                projectStage = {
-                    _id: 0,
-                    id: { $toString: '$_id' }
-                };
-                positiveProjectionFields.forEach((field) => {
-                    if (field !== '_id' && field !== 'id') {
-                        projectStage[field] = `$${field}`;
-                    }
-                });
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
-            else if (negativeProjectionFields.length > 0) {
-                negativeProjectionFields.forEach((field) => {
-                    if (projectStage[field] !== undefined && projectStage[field] !== null) {
-                        // tslint:disable-next-line:no-dynamic-delete
-                        delete projectStage[field];
-                    }
-                });
+            else {
+                // throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => {
+                let value;
+                switch (key) {
+                    case 'numberOfItems':
+                        value = {
+                            $cond: {
+                                if: { $isArray: '$itemListElement' },
+                                then: { $size: '$itemListElement' },
+                                else: 0
+                            }
+                        };
+                        break;
+                    case 'itemListElementTypeOf':
+                        value = { $first: '$itemListElement.typeOf' };
+                        break;
+                    default:
+                        value = 1;
+                }
+                return [key, value];
+            })));
+            // let projectStage: { [field: string]: AnyExpression } = {
+            //     _id: 0,
+            //     name: '$name',
+            //     description: '$description',
+            //     project: '$project',
+            //     typeOf: '$typeOf',
+            //     id: { $toString: '$_id' },
+            //     identifier: '$identifier',
+            //     itemOffered: '$itemOffered',
+            //     additionalProperty: '$additionalProperty',
+            //     relatedOffer: '$relatedOffer',
+            //     numberOfItems: {
+            //         $cond: {
+            //             if: { $isArray: '$itemListElement' },
+            //             then: { $size: '$itemListElement' },
+            //             else: 0
+            //         }
+            //     },
+            //     itemListElementTypeOf: { $first: '$itemListElement.typeOf' },
+            //     dateSynced: '$dateSynced'
+            // };
+            // const positiveProjectionFields: string[] = Object.keys(projection)
+            //     .filter((key) => projection[<KeyOfOfferCatalogItem>key] !== 0);
+            // const negativeProjectionFields: string[] = Object.keys(projection)
+            //     .filter((key) => projection[<KeyOfOfferCatalogItem>key] === 0);
+            // if (positiveProjectionFields.length > 0) {
+            //     projectStage = {
+            //         _id: 0,
+            //         id: { $toString: '$_id' }
+            //     };
+            //     positiveProjectionFields.forEach((field) => {
+            //         if (field !== '_id' && field !== 'id') {
+            //             projectStage[field] = `$${field}`;
+            //         }
+            //     });
+            // } else if (negativeProjectionFields.length > 0) {
+            //     negativeProjectionFields.forEach((field) => {
+            //         if (projectStage[field] !== undefined && projectStage[field] !== null) {
+            //             // tslint:disable-next-line:no-dynamic-delete
+            //             delete projectStage[field];
+            //         }
+            //     });
+            // }
             const aggregate = this.offerCatalogItemModel.aggregate([
                 ...(((_a = params.sort) === null || _a === void 0 ? void 0 : _a.identifier) !== undefined) ? [{ $sort: { identifier: params.sort.identifier } }] : [],
                 ...matchStages,
-                { $project: projectStage }
+                { $project: projection }
             ]);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;

package/lib/chevre/repo/paymentService.js

@@ -65,16 +65,6 @@ class PaymentServiceRepo {
                 typeOf: { $in: typeOfIn }
             });
         }
-        // discontinue(2024-08-20~)
-        // const hasOfferCatalogIdEq = params.hasOfferCatalog?.id?.$eq;
-        // if (typeof hasOfferCatalogIdEq === 'string') {
-        //     andConditions.push({
-        //         'hasOfferCatalog.id': {
-        //             $exists: true,
-        //             $eq: hasOfferCatalogIdEq
-        //         }
-        //     });
-        // }
         const idEq = (_e = params.id) === null || _e === void 0 ? void 0 : _e.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });

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

@@ -95,6 +95,9 @@ export declare class ProductRepo {
         typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard;
         id: string;
     }): Promise<factory.product.IAvailableChannel>;
+    /**
+     * 指定カタログの設定されたプロダクトを削除する
+     */
     deleteByHasOfferCatalog(params: {
         project: {
             id: string;

package/lib/chevre/repo/product.js

@@ -69,8 +69,15 @@ class ProductRepo {
         }
         const hasOfferCatalogIdEq = (_f = (_e = params.hasOfferCatalog) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
         if (typeof hasOfferCatalogIdEq === 'string') {
+            // migrate to itemListElement(2024-09-30~)
+            // andConditions.push({
+            //     'hasOfferCatalog.id': {
+            //         $exists: true,
+            //         $eq: hasOfferCatalogIdEq
+            //     }
+            // });
             andConditions.push({
-                'hasOfferCatalog.id': {
+                'hasOfferCatalog.itemListElement.id': {
                     $exists: true,
                     $eq: hasOfferCatalogIdEq
                 }
@@ -338,11 +345,15 @@ class ProductRepo {
             return availableChannel;
         });
     }
+    /**
+     * 指定カタログの設定されたプロダクトを削除する
+     */
     deleteByHasOfferCatalog(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.productModel.deleteMany({
                 'project.id': { $eq: params.project.id },
-                'hasOfferCatalog.id': { $exists: true, $eq: params.hasOfferCatalog.id }
+                // 'hasOfferCatalog.id': { $exists: true, $eq: params.hasOfferCatalog.id } // migrate to itemListElement(2024-09-30~)
+                'hasOfferCatalog.itemListElement.id': { $exists: true, $eq: params.hasOfferCatalog.id }
             })
                 .exec();
         });

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

@@ -160,7 +160,7 @@ function aggregateOfferByEvent(params) {
 }
 function calculateOfferCount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         let offerCount = 0;
         try {
             const eventOffers = params.event.offers;
@@ -175,13 +175,15 @@ function calculateOfferCount(params) {
                 if (eventService === undefined) {
                     throw new factory.errors.NotFound(factory.product.ProductType.EventService);
                 }
-                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    const catalogs = yield repos.offerCatalog.search({
+                // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
+                const firstCatalogIdOfProduct = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+                if (typeof firstCatalogIdOfProduct === 'string') {
+                    const catalogs = yield repos.offerCatalog.projectFields({
                         limit: 1,
                         page: 1,
-                        id: { $in: [eventService.hasOfferCatalog.id] }
-                    });
-                    const numberOfItems = (_c = catalogs.shift()) === null || _c === void 0 ? void 0 : _c.numberOfItems;
+                        id: { $in: [firstCatalogIdOfProduct] }
+                    }, ['numberOfItems']);
+                    const numberOfItems = (_d = catalogs.shift()) === null || _d === void 0 ? void 0 : _d.numberOfItems;
                     if (typeof numberOfItems === 'number') {
                         offerCount = numberOfItems;
                     }

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

@@ -17,7 +17,7 @@ const factory = require("../../../factory");
  */
 function findEventOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         let availableOffers = [];
         try {
             // 興行設定があれば興行のカタログを参照する
@@ -33,7 +33,8 @@ function findEventOffers(params) {
                 if (eventService === undefined) {
                     throw new factory.errors.NotFound(factory.product.ProductType.EventService);
                 }
-                const offerCatalogId = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id;
+                // const offerCatalogId = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
+                const offerCatalogId = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
                 if (typeof offerCatalogId === 'string') {
                     // サブカタログIDを決定
                     let subOfferCatalogId = offerCatalogId;

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

@@ -17,7 +17,7 @@ const factory_1 = require("../factory");
 function searchTicketOffersByItemOffered(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let catalogId;
         const eventService = (yield repos.product.projectFields({
             limit: 1,
@@ -29,8 +29,10 @@ function searchTicketOffersByItemOffered(params) {
         if (eventService === undefined) {
             throw new factory.errors.NotFound(factory.product.ProductType.EventService);
         }
-        if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-            catalogId = eventService.hasOfferCatalog.id;
+        // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
+        const firstCatalogIdOfProduct = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+        if (typeof firstCatalogIdOfProduct === 'string') {
+            catalogId = firstCatalogIdOfProduct;
         }
         if (typeof catalogId !== 'string') {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
@@ -49,7 +51,7 @@ function searchTicketOffersByItemOffered(params) {
                 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 (typeof ((_d = params.includedInDataCatalog) === null || _d === void 0 ? void 0 : _d.id) === 'string' && params.includedInDataCatalog.id.length > 0) {
                 if (isOfferCatalogItem) {
                     // no op
                 }
@@ -64,12 +66,14 @@ function searchTicketOffersByItemOffered(params) {
             // サブカタログの適用決済カード条件を考慮
             if (isOfferCatalogItem) {
                 // サブカタログ参照
-                const offerCatalogItem = (yield repos.offerCatalogItem.search({ id: { $in: [subOfferCatalogId] } }, { relatedOffer: 1 })).shift();
+                const offerCatalogItem = (yield repos.offerCatalogItem.projectFields({ id: { $in: [subOfferCatalogId] } }, ['relatedOffer']
+                // { relatedOffer: 1 }
+                )).shift();
                 if (offerCatalogItem === undefined) {
                     throw new factory.errors.NotFound('OfferCatalogItem');
                 }
                 // 強制的にサブカタログの適用決済カード条件に変更
-                const appliesToMovieTicketBySubCatalog = (_e = (_d = offerCatalogItem.relatedOffer) === null || _d === void 0 ? void 0 : _d.priceSpecification) === null || _e === void 0 ? void 0 : _e.appliesToMovieTicket;
+                const appliesToMovieTicketBySubCatalog = (_f = (_e = offerCatalogItem.relatedOffer) === null || _e === void 0 ? void 0 : _e.priceSpecification) === null || _f === void 0 ? void 0 : _f.appliesToMovieTicket;
                 if (Array.isArray(appliesToMovieTicketBySubCatalog)) {
                     priceSpecificationCondition = {
                         appliesToMovieTicket: {
@@ -90,7 +94,7 @@ function searchTicketOffersByItemOffered(params) {
             }
             const { offers, sortedOfferIds } = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
                 offerCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
-                availableAtOrFrom: { id: (_f = params.store) === null || _f === void 0 ? void 0 : _f.id },
+                availableAtOrFrom: { id: (_g = params.store) === null || _g === void 0 ? void 0 : _g.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
                 priceSpecification: priceSpecificationCondition,
@@ -118,7 +122,7 @@ function searchTicketOffersByItemOffered(params) {
             const availableOffers = yield repos.offer.searchAllByIdsAndOfferCatalogId({
                 ids: params.ids,
                 includedInDataCatalog: { id: includedInDataCatalogIds, isOfferCatalogItem },
-                availableAtOrFrom: { id: (_g = params.store) === null || _g === void 0 ? void 0 : _g.id },
+                availableAtOrFrom: { id: (_h = params.store) === null || _h === void 0 ? void 0 : _h.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
                 onlyValid: params.onlyValid === true
@@ -354,7 +358,7 @@ exports.searchEventTicketOffers = searchEventTicketOffers;
  */
 function searchOfferAppliesToMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         // optimize(2024-07-18~)
         const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'typeOf', 'superEvent.id', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
         // let soundFormatTypes: string[] = [];
@@ -390,8 +394,10 @@ function searchOfferAppliesToMovieTicket(params) {
             if (eventService === undefined) {
                 throw new factory.errors.NotFound(factory.product.ProductType.EventService);
             }
-            if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                catalogId = eventService.hasOfferCatalog.id;
+            // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
+            const firstCatalogIdOfProduct = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+            if (typeof firstCatalogIdOfProduct === 'string') {
+                catalogId = firstCatalogIdOfProduct;
             }
         }
         if (typeof catalogId !== 'string') {
@@ -408,7 +414,7 @@ function searchOfferAppliesToMovieTicket(params) {
         return repos.offer.searchAvaialbleAppliesToMovieTicketByOfferCatalogId({
             // subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
             subOfferCatalog: { id: subOfferCatalogId },
-            availableAtOrFrom: { id: (_c = params.store) === null || _c === void 0 ? void 0 : _c.id },
+            availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
             unacceptedPaymentMethod: unacceptedPaymentMethod,
             excludeAppliesToMovieTicket: excludeAppliesToMovieTicket,
             onlyValid: params.onlyValid === true,
@@ -424,7 +430,7 @@ exports.searchOfferAppliesToMovieTicket = searchOfferAppliesToMovieTicket;
  */
 function searchOfferCatalogItems(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         if (typeof params.limit !== 'number') {
             throw new factory.errors.Argument('limit', 'must be number');
         }
@@ -448,8 +454,10 @@ function searchOfferCatalogItems(params) {
             if (eventService === undefined) {
                 throw new factory.errors.NotFound(factory.product.ProductType.EventService);
             }
-            if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                catalogId = eventService.hasOfferCatalog.id;
+            // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
+            const firstCatalogIdOfProduct = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+            if (typeof firstCatalogIdOfProduct === 'string') {
+                catalogId = firstCatalogIdOfProduct;
             }
         }
         if (typeof catalogId !== 'string') {
@@ -464,15 +472,17 @@ function searchOfferCatalogItems(params) {
             });
             if (catalogItemListElements.length > 0) {
                 // サブカタログ検索
-                const searchOfferCatalogItemsResult = yield repos.offerCatalogItem.search({
+                const searchOfferCatalogItemsResult = yield repos.offerCatalogItem.projectFields({
                     id: { $in: catalogItemListElements.map((element) => element.id) }
-                }, {
-                    id: 1,
-                    name: 1,
-                    description: 1,
-                    additionalProperty: 1,
-                    relatedOffer: 1
-                });
+                }, ['description', 'name', 'additionalProperty', 'relatedOffer']
+                // {
+                //     id: 1,
+                //     name: 1,
+                //     description: 1,
+                //     additionalProperty: 1,
+                //     relatedOffer: 1
+                // }
+                );
                 offerCatalogItems = catalogItemListElements.map((element) => {
                     const offerCatalogItem = searchOfferCatalogItemsResult.find((item) => item.id === element.id);
                     if (offerCatalogItem === undefined) {
@@ -494,7 +504,7 @@ exports.searchOfferCatalogItems = searchOfferCatalogItems;
  */
 function searchOfferCatalogItemAvailability(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const { considerUnacceptedPaymentMethod } = params.options;
         if (typeof params.limit !== 'number') {
             throw new factory.errors.Argument('limit', 'must be number');
@@ -519,8 +529,10 @@ function searchOfferCatalogItemAvailability(params) {
             if (eventService === undefined) {
                 throw new factory.errors.NotFound(factory.product.ProductType.EventService);
             }
-            if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                catalogId = eventService.hasOfferCatalog.id;
+            // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
+            const firstCatalogIdOfProduct = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+            if (typeof firstCatalogIdOfProduct === 'string') {
+                catalogId = firstCatalogIdOfProduct;
             }
         }
         if (typeof catalogId !== 'string') {

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

@@ -17,7 +17,7 @@ const factory = require("../../../factory");
 function searchProductOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         // プロダクト検索
         const productWithOffers = (yield repos.product.projectFields({
             limit: 1,
@@ -29,7 +29,8 @@ function searchProductOffers(params) {
         if (productWithOffers === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const offerCatalogId = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.id;
+        // const offerCatalogId = productWithOffers.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
+        const offerCatalogId = (_b = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.itemListElement.at(0)) === null || _b === void 0 ? void 0 : _b.id;
         if (typeof offerCatalogId !== 'string') {
             return [];
         }
@@ -49,7 +50,7 @@ function searchProductOffers(params) {
                 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 (typeof ((_c = params.includedInDataCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string' && params.includedInDataCatalog.id.length > 0) {
                 if (isOfferCatalogItem) {
                     // no op
                 }

package/lib/chevre/service/task/onResourceUpdated/onOfferCatalogUpdated.js

@@ -19,10 +19,10 @@ function createInformOfferCatalogTasks(params) {
         }
         let offerCatalogs = [];
         if (params.isOfferCatalogItem) {
-            offerCatalogs = yield repos.offerCatalogItem.search({ id: { $in: params.ids } }, {});
+            offerCatalogs = yield repos.offerCatalogItem.projectFields({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);
         }
         else {
-            offerCatalogs = yield repos.offerCatalog.search({ id: { $in: params.ids } });
+            offerCatalogs = yield repos.offerCatalog.projectFields({ id: { $in: params.ids } }, ['identifier', 'name', 'numberOfItems', 'project', 'typeOf']);
         }
         const informResources = settings.onResourceUpdated.informResource;
         const offerCatalogs4inform = offerCatalogs.map(({ id, typeOf, name, identifier, project, numberOfItems }) => {

package/lib/chevre/service/task/onResourceUpdated/syncOfferCatalog.js

@@ -35,10 +35,10 @@ function syncOfferCatalog(params) {
             for (const offerCatalogId of params.ids) {
                 let offerCatalogs = [];
                 if (params.isOfferCatalogItem) {
-                    offerCatalogs = yield repos.offerCatalogItem.search({ id: { $in: [offerCatalogId] } }, {});
+                    offerCatalogs = yield repos.offerCatalogItem.projectFields({ id: { $in: [offerCatalogId] } }, ['id', 'itemListElementTypeOf']);
                 }
                 else {
-                    offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
+                    offerCatalogs = yield repos.offerCatalog.projectFields({ id: { $in: [offerCatalogId] } }, ['id', 'itemListElementTypeOf']);
                 }
                 const itemListElementTypeOf = (_a = offerCatalogs.shift()) === null || _a === void 0 ? void 0 : _a.itemListElementTypeOf;
                 switch (itemListElementTypeOf) {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.385.0",
-    "@cinerino/sdk": "10.11.0",
+    "@chevre/factory": "4.386.0-alpha.0",
+    "@cinerino/sdk": "10.12.0-alpha.0",
     "@motionpicture/coa-service": "9.5.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.5.0-alpha.1"
+  "version": "22.5.0-alpha.3"
 }

package/example/src/chevre/offerCatalog2offerCatalogItem.ts

@@ -1,161 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const PROJECT_ID = String(process.env.PROJECT_ID);
-// const OFFER_CATALOG_ID = String(process.env.OFFER_CATALOG_ID);
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const offerRepo = await chevre.repository.Offer.createInstance(mongoose.connection);
-    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
-
-    const offerCatalogs = (await offerCatalogRepo.search({
-        project: { id: { $eq: PROJECT_ID } }
-        // id: { $in: [OFFER_CATALOG_ID] }
-    }));
-
-    let i = 0;
-    let maxOfferCatalogItemNumItemListElement = 0;
-    let maxIdentifierLength = 0;
-    let maxOfferCatalogItemLength = 0;
-    for (const offerCatalog of offerCatalogs) {
-        i += 1;
-        maxIdentifierLength = Math.max(maxIdentifierLength, offerCatalog.identifier.length);
-
-        const { itemListElement } = await offerCatalogRepo.findItemListElementById({
-            id: String(offerCatalog.id),
-            project: { id: PROJECT_ID }
-        });
-        const aggregateOfferIds = itemListElement.map((element) => element.id);
-        const unitPriceOffers = await offerRepo.search({
-            parentOffer: { id: { $in: aggregateOfferIds } }
-        });
-        // console.log(unitPriceOffers);
-        console.log(unitPriceOffers.length, 'unitPriceOffers found', i);
-
-        let paymentMethodTypeSets = unitPriceOffers.reduce<{ identifier: string; codeValues: string[] }[]>(
-            (a, b) => {
-                let appliesToMovieTicketPaymentMethodTypes = b.priceSpecification.appliesToMovieTicket?.map((appliesToMovieTicket) => {
-                    return appliesToMovieTicket.serviceOutput.typeOf;
-                });
-
-                if (Array.isArray(appliesToMovieTicketPaymentMethodTypes)) {
-                    appliesToMovieTicketPaymentMethodTypes = appliesToMovieTicketPaymentMethodTypes.sort(
-                        (aCodeValue, bCodeValue) => (aCodeValue > bCodeValue) ? 1 : -1 // 順序保証
-                    );
-                    const setIdentifier = appliesToMovieTicketPaymentMethodTypes.join(',');
-
-                    if (!a.some((paymentMethodTypeSet) => paymentMethodTypeSet.identifier === setIdentifier)) {
-                        return [
-                            ...a,
-                            {
-                                identifier: setIdentifier,
-                                codeValues: appliesToMovieTicketPaymentMethodTypes
-                            }
-                        ];
-                    } else {
-                        return a;
-                    }
-                } else {
-                    return a;
-                }
-            },
-            []
-        );
-        paymentMethodTypeSets = paymentMethodTypeSets.sort((a, b) => (a.identifier > b.identifier) ? 1 : -1); // 順序保証
-        console.log(paymentMethodTypeSets);
-
-        const offerCatalogItems: chevre.factory.offerCatalog.IOfferCatalog[] = [];
-
-        // 適用決済カード条件なしのオファーについてサブカタログを作成
-        offerCatalogItems.push({
-            project: { id: PROJECT_ID, typeOf: chevre.factory.organizationType.Project },
-            typeOf: 'OfferCatalog',
-            // id?: string;
-            identifier: `${offerCatalog.identifier}IDX${offerCatalogItems.length}`,
-            name: {
-                ja: `${offerCatalog.name.ja}`
-            },
-            itemListElement: unitPriceOffers.filter((offer) => {
-                return !Array.isArray(offer.priceSpecification.appliesToMovieTicket);
-            })
-                .map((offer) => {
-                    return {
-                        typeOf: chevre.factory.offerType.Offer,
-                        /**
-                         * 集計オファーID
-                         */
-                        id: String(offer.parentOffer?.id)
-                    };
-                }),
-            itemOffered: { typeOf: chevre.factory.product.ProductType.EventService },
-            additionalProperty: []
-        });
-
-        // 適用決済カード条件ありのオファーについてサブカタログを作成
-        paymentMethodTypeSets.forEach((paymentMethodTypeSet) => {
-            offerCatalogItems.push({
-                project: { id: PROJECT_ID, typeOf: chevre.factory.organizationType.Project },
-                typeOf: 'OfferCatalog',
-                // id?: string;
-                identifier: `${offerCatalog.identifier}IDX${offerCatalogItems.length}`,
-                name: {
-                    ja: `${offerCatalog.name.ja}[${paymentMethodTypeSet.identifier}]`,
-                    en: `${offerCatalog.name.en}[${paymentMethodTypeSet.identifier}]`
-                },
-                itemListElement: unitPriceOffers.filter((offer) => {
-                    return Array.isArray(offer.priceSpecification.appliesToMovieTicket)
-                        && paymentMethodTypeSet.codeValues.length === offer.priceSpecification.appliesToMovieTicket.length
-                        && paymentMethodTypeSet.codeValues.every((paymentMethodType) => {
-                            return Array.isArray(offer.priceSpecification.appliesToMovieTicket)
-                                && offer.priceSpecification.appliesToMovieTicket.some(
-                                    (appliesToMovieTicket) => appliesToMovieTicket.serviceOutput.typeOf === paymentMethodType);
-                        });
-                })
-                    .map((offer) => {
-                        return {
-                            typeOf: chevre.factory.offerType.Offer,
-                            /**
-                             * 集計オファーID
-                             */
-                            id: String(offer.parentOffer?.id)
-                        };
-                    }),
-                itemOffered: { typeOf: chevre.factory.product.ProductType.EventService },
-                additionalProperty: [],
-                relatedOffer: {
-                    typeOf: chevre.factory.offerType.Offer,
-                    priceSpecification: {
-                        appliesToMovieTicket: [{ serviceOutput: { typeOf: paymentMethodTypeSet.codeValues[0] } }]
-                    }
-                }
-            });
-        });
-
-        // tslint:disable-next-line:no-null-keyword
-        // console.dir(offerCatalogItems, { depth: null });
-        console.dir(offerCatalogItems.map((offerCatalogItem) => {
-            return `${offerCatalogItem.itemListElement.length} items on ${offerCatalogItem.identifier} ${offerCatalogItem.name.ja} `;
-        }));
-
-        offerCatalogItems.forEach((offerCatalogItem) => {
-            maxOfferCatalogItemNumItemListElement =
-                Math.max(maxOfferCatalogItemNumItemListElement, offerCatalogItem.itemListElement.length);
-        });
-
-        maxOfferCatalogItemLength = Math.max(maxOfferCatalogItemLength, offerCatalogItems.length);
-    }
-
-    console.log(i, 'offerCatalogs checked');
-    console.log('maxOfferCatalogItemNumItemListElement:', maxOfferCatalogItemNumItemListElement);
-    console.log('maxIdentifierLength:', maxIdentifierLength);
-    console.log('maxOfferCatalogItemLength:', maxOfferCatalogItemLength);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);