@chevre/domain 22.5.0-alpha.0 → 22.5.0-alpha.2

package/example/src/chevre/migrateProductHasOfferCatalog.ts

@@ -0,0 +1,80 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
+
+    const cursor = productRepo.getCursor(
+        {
+            typeOf: { $exists: true },
+            'hasOfferCatalog.id': { $exists: true }
+        },
+        {
+            project: 1,
+            typeOf: 1,
+            productID: 1,
+            hasOfferCatalog: 1,
+            id: { $toString: '$_id' }
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const product: Pick<chevre.factory.product.IProduct, 'hasOfferCatalog' | 'productID' | 'project' | 'typeOf' | 'id'> = doc;
+        // console.log(product);
+        const { hasOfferCatalog } = product;
+        if (typeof hasOfferCatalog?.id !== 'string') {
+            throw new Error(`${product.project.id} ${product.productID} has no catalog`);
+        }
+        if (typeof product.id !== 'string') {
+            throw new Error(`${product.project.id} ${product.productID} has no id`);
+        }
+
+        const alreadyMigrated = Array.isArray(hasOfferCatalog?.itemListElement)
+            && hasOfferCatalog?.itemListElement.length === 1
+            && hasOfferCatalog?.id === hasOfferCatalog.itemListElement[0].id;
+        if (alreadyMigrated) {
+            console.log(
+                'already exist.',
+                product.project.id,
+                product.typeOf,
+                product.id, product.productID, i, updateCount
+            );
+        } else {
+            updateCount += 1;
+            console.log(
+                'updating...',
+                product.project.id,
+                product.typeOf,
+                product.id, product.productID, i, updateCount
+            );
+            await productRepo.migrateHasOfferCatalogItemListElement({
+                id: product.id,
+                hasOfferCatalog: { id: hasOfferCatalog.id }
+            });
+            console.log(
+                'updated.',
+                product.project.id,
+                product.typeOf,
+                product.id, product.productID, i, updateCount
+            );
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/projectFields.ts

@@ -8,7 +8,7 @@ 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.Task.createInstance(mongoose.connection);
+    const repo = await chevre.repository.Product.createInstance(mongoose.connection);
 
     const docs = await repo.projectFields(
         {
@@ -16,7 +16,7 @@ async function main() {
             page: 1,
             project: { id: { $eq: project.id } }
         },
-        ['id', 'identifier', 'data']
+        ['hasOfferCatalog.id']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(docs, { depth: null });

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

@@ -19,9 +19,6 @@ const schemaDefinition = {
     // provider: [SchemaTypes.Mixed], // 廃止(2024-04-12~)
     serviceOutput: mongoose_1.SchemaTypes.Mixed,
     serviceType: mongoose_1.SchemaTypes.Mixed
-    // createdAt: SchemaTypes.Mixed,
-    // updatedAt: SchemaTypes.Mixed,
-    // __v: SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -65,6 +62,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { 'hasOfferCatalog.itemListElement.id': 1, productID: 1 },
+        {
+            name: 'offerCatalogItemId',
+            partialFilterExpression: {
+                'hasOfferCatalog.itemListElement.id': { $exists: true }
+            }
+        }
+    ],
     [
         { 'serviceOutput.typeOf': 1, productID: 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

@@ -24,9 +24,9 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
 import type { Connection, FilterQuery } from 'mongoose';
-import { IDocTypeAsProduct } from './mongoose/schemas/product';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.product.IProduct;
+import { IDocTypeAsProduct } from './mongoose/schemas/product';
+type IKeyOfProjection = keyof factory.product.IProduct | 'hasOfferCatalog.id';
 /**
  * プロダクト検索条件
  */
@@ -42,7 +42,7 @@ export declare class ProductRepo {
     /**
      * プロダクトを検索する
      */
-    projectFields(conditions: ISearchConditions4product, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<(factory.product.IProduct & {
+    projectFields(conditions: ISearchConditions4product, inclusion: IKeyOfProjection[]): Promise<(factory.product.IProduct & {
         id: string;
     })[]>;
     deleteProductById(params: {
@@ -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;
@@ -120,5 +123,11 @@ export declare class ProductRepo {
         filter: FilterQuery<factory.product.IProduct>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    migrateHasOfferCatalogItemListElement(params: {
+        id: string;
+        hasOfferCatalog: {
+            id: string;
+        };
+    }): Promise<void>;
 }
 export {};

package/lib/chevre/repo/product.js

@@ -21,9 +21,9 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductRepo = void 0;
-const product_1 = require("./mongoose/schemas/product");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const product_1 = require("./mongoose/schemas/product");
 const AVAILABLE_PROJECT_FIELDS = [
     'project',
     'typeOf',
@@ -34,7 +34,8 @@ const AVAILABLE_PROJECT_FIELDS = [
     'name',
     'productID',
     'serviceOutput',
-    'serviceType'
+    'serviceType',
+    'hasOfferCatalog.id'
 ];
 /**
  * プロダクトリポジトリ
@@ -68,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
                 }
@@ -165,7 +173,9 @@ class ProductRepo {
     /**
      * プロダクトを検索する
      */
-    projectFields(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion
+    // exclusion: IKeyOfProjection[] // discontinue(2024-09-28~)
+    ) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = ProductRepo.CREATE_MONGO_CONDITIONS(conditions);
@@ -174,28 +184,12 @@ class ProductRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                }
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+                // if (Array.isArray(exclusion) && exclusion.length > 0) {
+                //     positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
+                // }
             }
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
-            // let projection: { [key: string]: number } = {};
-            // if (Array.isArray(inclusion) && inclusion.length > 0) {
-            //     inclusion.forEach((field) => {
-            //         projection[field] = 1;
-            //     });
-            // } else {
-            //     projection = {
-            //         __v: 0,
-            //         createdAt: 0,
-            //         updatedAt: 0
-            //     };
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         exclusion.forEach((field) => {
-            //             projection[field] = 0;
-            //         });
-            //     }
-            // }
             const query = this.productModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
@@ -338,7 +332,9 @@ class ProductRepo {
                 project: { id: { $eq: params.project.id } },
                 typeOf: { $eq: factory.product.ProductType.PaymentCard },
                 id: { $eq: params.id }
-            }, ['availableChannel'], [])).shift();
+            }, ['availableChannel']
+            // []
+            )).shift();
             if (paymentService === undefined) {
                 throw new factory.errors.NotFound('PaymentService');
             }
@@ -349,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();
         });
@@ -382,5 +382,23 @@ class ProductRepo {
                 .exec();
         });
     }
+    migrateHasOfferCatalogItemListElement(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const offerCatalogItems = [{ id: params.hasOfferCatalog.id }];
+            const doc = yield this.productModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                'hasOfferCatalog.id': { $exists: true, $eq: params.hasOfferCatalog.id }
+            }, {
+                $set: {
+                    'hasOfferCatalog.itemListElement': offerCatalogItems
+                }
+            }, { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                .lean()
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.productModel.modelName);
+            }
+        });
+    }
 }
 exports.ProductRepo = ProductRepo;

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;
@@ -169,17 +169,21 @@ function calculateOfferCount(params) {
                     limit: 1,
                     page: 1,
                     id: { $eq: eventOffers.itemOffered.id }
-                }, ['hasOfferCatalog'], [])).shift();
+                }, ['hasOfferCatalog']
+                // []
+                )).shift();
                 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 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.search({
                         limit: 1,
                         page: 1,
-                        id: { $in: [eventService.hasOfferCatalog.id] }
+                        id: { $in: [firstCatalogIdOfProduct] }
                     });
-                    const numberOfItems = (_c = catalogs.shift()) === null || _c === void 0 ? void 0 : _c.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 {
             // 興行設定があれば興行のカタログを参照する
@@ -27,11 +27,14 @@ function findEventOffers(params) {
                     limit: 1,
                     page: 1,
                     id: { $eq: eventOffers.itemOffered.id }
-                }, ['hasOfferCatalog'], [])).shift();
+                }, ['hasOfferCatalog']
+                // []
+                )).shift();
                 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/assetTransaction/moneyTransfer.js

@@ -34,7 +34,9 @@ function start(params) {
             project: { id: { $eq: params.project.id } },
             typeOf: { $eq: factory.product.ProductType.PaymentCard },
             id: { $eq: issuedThroughId }
-        }, [], []);
+        }, ['availableChannel', 'serviceOutput']
+        // []
+        );
         const product = products.shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');

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

@@ -274,7 +274,9 @@ function fixPaymentService(params) {
                     project: { id: { $eq: params.project.id } },
                     typeOf: { $eq: factory.product.ProductType.PaymentCard },
                     id: { $eq: getPaymentServiceId(params) }
-                }, [], [])).shift();
+                }, ['availableChannel', 'serviceOutput', 'serviceType']
+                // []
+                )).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }

package/lib/chevre/service/assetTransaction/refund/factory.d.ts

@@ -6,5 +6,5 @@ export declare function createStartParams(params: factory.assetTransaction.refun
     transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     payAction: factory.action.trade.pay.IAction;
-    paymentService?: factory.product.IProduct | Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'typeOf' | 'serviceOutput'>;
+    paymentService?: Pick<factory.product.IProduct, 'availableChannel' | 'typeOf'> | Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'typeOf' | 'serviceOutput'>;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Refund>;

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

@@ -92,7 +92,9 @@ function fixPaymentService(params) {
                     project: { id: { $eq: params.payAction.project.id } },
                     typeOf: { $eq: factory.product.ProductType.PaymentCard },
                     id: { $eq: paymentServiceId }
-                }, [], [])).shift();
+                }, ['availableChannel', 'typeOf']
+                // []
+                )).shift();
                 if (paymentService === undefined) {
                     throw new factory.errors.NotFound('PaymentService');
                 }

package/lib/chevre/service/assetTransaction/registerService/factory.d.ts

@@ -12,7 +12,7 @@ export declare function createPointAward(params: {
  */
 export declare function createServiceOutput(params: {
     dateIssued: Date;
-    product: factory.product.IProduct & {
+    product: Pick<factory.product.IProduct, 'id' | 'typeOf' | 'project' | 'serviceOutput' | 'serviceType'> & {
         id: string;
     };
     acceptedOffer: factory.assetTransaction.registerService.IAcceptedOfferWithoutDetail;

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

@@ -48,7 +48,9 @@ function start(params) {
             limit: 1,
             page: 1,
             id: { $eq: productId }
-        }, [], [])).shift();
+        }, ['id', 'project', 'serviceOutput', 'serviceType', 'typeOf']
+        // []
+        )).shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
@@ -141,7 +143,9 @@ function createPermitService(params) {
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }
-        }, ['availableChannel'], [])).shift();
+        }, ['availableChannel']
+        // []
+        )).shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }

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

@@ -299,7 +299,9 @@ function validateProgramMembershipUsed(params) {
                     page: 1,
                     id: { $eq: issuedThroughId },
                     typeOf: { $eq: factory.product.ProductType.MembershipService }
-                }, ['typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+                }, ['typeOf', 'project', 'serviceType', 'serviceOutput']
+                // []
+                )).shift();
                 if (permitIssuedThrough === undefined) {
                     throw new factory.errors.NotFound(factory.product.ProductType.MembershipService);
                 }
@@ -414,7 +416,9 @@ function createPermitService(params) {
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }
-        }, ['availableChannel'], [])).shift();
+        }, ['availableChannel']
+        // []
+        )).shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }

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

@@ -409,7 +409,9 @@ function createPermitService(params) {
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }
-        }, ['availableChannel'], [])).shift();
+        }, ['availableChannel']
+        // []
+        )).shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }

package/lib/chevre/service/moneyTransfer.js

@@ -334,7 +334,9 @@ function createPermitServiceCredentials(params) {
             page: 1,
             id: { $eq: params.issuedThrough.id },
             typeOf: { $eq: factory.product.ProductType.PaymentCard }
-        }, ['availableChannel'], [])).shift();
+        }, ['availableChannel']
+        // []
+        )).shift();
         if (paymentCardService === undefined) {
             throw new factory.errors.NotFound(factory.product.ProductType.PaymentCard);
         }

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

@@ -17,18 +17,22 @@ 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,
             page: 1,
             id: { $eq: String((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) }
-        }, ['hasOfferCatalog', 'project'], [])).shift();
+        }, ['hasOfferCatalog', 'project']
+        // []
+        )).shift();
         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');
@@ -47,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
                 }
@@ -67,7 +71,7 @@ function searchTicketOffersByItemOffered(params) {
                     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: {
@@ -88,7 +92,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,
@@ -116,7 +120,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
@@ -352,7 +356,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[] = [];
@@ -382,12 +386,16 @@ function searchOfferAppliesToMovieTicket(params) {
                 limit: 1,
                 page: 1,
                 id: { $eq: eventOffers.itemOffered.id }
-            }, ['hasOfferCatalog'], [])).shift();
+            }, ['hasOfferCatalog']
+            // []
+            )).shift();
             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') {
@@ -404,7 +412,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,
@@ -420,7 +428,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');
         }
@@ -438,12 +446,16 @@ function searchOfferCatalogItems(params) {
                 limit: 1,
                 page: 1,
                 id: { $eq: eventOffers.itemOffered.id }
-            }, ['hasOfferCatalog'], [])).shift();
+            }, ['hasOfferCatalog']
+            // []
+            )).shift();
             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') {
@@ -488,7 +500,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');
@@ -507,12 +519,16 @@ function searchOfferCatalogItemAvailability(params) {
                 limit: 1,
                 page: 1,
                 id: { $eq: eventOffers.itemOffered.id }
-            }, ['hasOfferCatalog'], [])).shift();
+            }, ['hasOfferCatalog']
+            // []
+            )).shift();
             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,17 +17,20 @@ 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,
             page: 1,
             id: { $eq: params.itemOffered.id }
-        }, ['hasOfferCatalog', 'project'], [])).shift();
+        }, ['hasOfferCatalog', 'project']
+        // []
+        )).shift();
         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 [];
         }
@@ -47,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/offer/product.d.ts

@@ -68,7 +68,7 @@ export declare function search(params: {
     productOffer: ProductOfferRepo;
 }) => Promise<{
     offers: factory.product.ITicketOffer[];
-    product: factory.product.IProduct;
+    product: Pick<factory.product.IProduct, "id" | "project" | "name" | "typeOf" | "description" | "serviceType" | "serviceOutput" | "productID">;
 }>;
 export type IAuthorizeOfferAction = factory.action.authorize.offer.product.IAction;
 /**

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

@@ -32,7 +32,9 @@ function search(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             id: { $eq: params.itemOffered.id }
-        }, [], []);
+        }, ['id', 'name', 'productID', 'project', 'serviceOutput', 'serviceType', 'typeOf', 'description']
+        // []
+        );
         const product = searchProductsResult.shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
@@ -179,7 +181,9 @@ function fixProductAndOffers(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             id: { $eq: productId }
-        }, [], []);
+        }, ['id', 'name', 'productID', 'project', 'serviceOutput', 'serviceType', 'typeOf']
+        // []
+        );
         const product = searchProductsResult.shift();
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');

package/lib/chevre/service/payment/paymentCard.js

@@ -84,7 +84,9 @@ function validatePaymentMethod(params, paymentServiceId) {
             page: 1,
             id: { $eq: paymentServiceId },
             typeOf: { $eq: factory.product.ProductType.PaymentCard }
-        }, ['serviceOutput'], [])).shift();
+        }, ['serviceOutput']
+        // []
+        )).shift();
         const currency = (_e = (_d = paymentCatdProduct === null || paymentCatdProduct === void 0 ? void 0 : paymentCatdProduct.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount) === null || _e === void 0 ? void 0 : _e.currency;
         if (typeof currency !== 'string') {
             throw new factory.errors.NotFound('product.serviceOutput.amount.currency');

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

@@ -351,7 +351,9 @@ function deleteResourcesByOfferCatalog(params) {
                 const productsWithCatalog = yield repos.product.projectFields({
                     project: { id: { $eq: params.project.id } },
                     hasOfferCatalog: { id: { $eq: catalogId } }
-                }, ['id'], []);
+                }, ['id']
+                // []
+                );
                 let deleteEventResult;
                 let updateOfferResult;
                 if (productsWithCatalog.length > 0) {

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

@@ -276,7 +276,9 @@ function createInformProductTasks(params) {
         const products4inform = yield repos.product.projectFields({
             typeOf: { $eq: params.typeOf },
             id: { $in: params.ids }
-        }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType'], []);
+        }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType']
+        // []
+        );
         const informResources = settings.onResourceUpdated.informResource;
         if (products4inform.length > 0) {
             const taskRunsAt = new Date();

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.0"
+  "version": "22.5.0-alpha.2"
 }

package/example/src/chevre/migrateEventSeries2secondary.ts

@@ -1,70 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
-
-    const cursor = eventSeriesRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries }
-        },
-        {
-            _id: 1,
-            startDate: 1,
-            project: 1,
-            typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const eventSeries: Pick<chevre.factory.event.screeningEventSeries.IEvent, 'id' | 'startDate' | 'project' | 'typeOf'> =
-            doc.toObject();
-        const alreadyMigrated = false;
-        if (alreadyMigrated) {
-            console.log(
-                'already exist.',
-                eventSeries.project.id,
-                eventSeries.typeOf,
-                eventSeries.id,
-                eventSeries.startDate, i, updateCount
-            );
-        } else {
-            updateCount += 1;
-            console.log(
-                'updating...',
-                eventSeries.project.id,
-                eventSeries.typeOf,
-                eventSeries.id,
-                eventSeries.startDate, i, updateCount
-            );
-            // await eventSeriesRepo.sync2secondary({
-            //     id: eventSeries.id
-            // });
-            console.log(
-                'updated.',
-                eventSeries.project.id,
-                eventSeries.typeOf,
-                eventSeries.id,
-                eventSeries.startDate, i, updateCount
-            );
-        }
-    });
-
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);