@chevre/domain 21.15.0-alpha.1 → 21.15.0-alpha.10

package/example/src/chevre/migrateIAMMemberPOSRoles.ts

@@ -0,0 +1,78 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+const POS_CLIENT_ID = String(process.env.POS_CLIENT_ID);
+enum ROLE_NAME {
+    Customer = 'customer',
+    POS = 'pos'
+}
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
+
+    const cursor = memberRepo.getCursor(
+        {
+            'member.id': { $eq: POS_CLIENT_ID }
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('members found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const iamMember: chevre.factory.iam.IMember = doc.toObject();
+
+        const hasCustomerRole = iamMember.member.hasRole.some((role) => role.roleName === ROLE_NAME.Customer);
+        const alreadyMigrated = iamMember.member.hasRole.some((role) => role.roleName === ROLE_NAME.POS);
+
+        if (alreadyMigrated) {
+            console.log(
+                'already exist...', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.hasRole.length, 'roles', i);
+        } else {
+            if (!hasCustomerRole) {
+                console.error(
+                    'has no customer role!',
+                    iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, iamMember.member.hasRole.length, 'roles', i);
+                throw new Error('has no customer role!');
+            }
+
+            const newHasRole: chevre.factory.iam.IMemberHasRole = iamMember.member.hasRole;
+            newHasRole.push({ roleName: ROLE_NAME.POS, typeOf: chevre.factory.iam.RoleType.OrganizationRole });
+            console.log(
+                'updating reservation...',
+                iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, newHasRole.length, 'roles', i);
+            await memberRepo.updateByMemberId({
+                project: { id: iamMember.project.id },
+                member: {
+                    id: iamMember.member.id,
+                    memberOf: {
+                        id: iamMember.project.id,
+                        typeOf: chevre.factory.organizationType.Project
+                    },
+                    hasRole: newHasRole
+                }
+            });
+            updateCount += 1;
+            console.log(
+                'updated.',
+                iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, newHasRole.length, 'roles', i);
+        }
+    });
+
+    console.log(i, 'members checked');
+    console.log(updateCount, 'members updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/{migrateCategoryCodeAdditionalProperties.ts → migrateMovieTheaterAdditionalProperties.ts}

@@ -12,10 +12,11 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const additionalPropertyRepo = await chevre.repository.AdditionalProperty.createInstance(mongoose.connection);
-    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
+    const placeRepo = await chevre.repository.Place.createInstance(mongoose.connection);
 
-    const cursor = categoryCodeRepo.getCursor(
+    const cursor = placeRepo.getCursor(
         {
+            typeOf: { $eq: chevre.factory.placeType.MovieTheater }
             // 'project.id': { $eq: project.id },
             // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
         },
@@ -25,7 +26,7 @@ async function main() {
             // orderDate: 1
         }
     );
-    console.log('categoryCodes found');
+    console.log('places found');
 
     const additionalPropertyNames: string[] = [];
     const projectIds: string[] = [];
@@ -36,30 +37,30 @@ async function main() {
     let i = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
-        const categoryCode: chevre.factory.categoryCode.ICategoryCode = doc.toObject();
+        const movieTheater: chevre.factory.place.movieTheater.IPlace = doc.toObject();
 
-        const additionalPropertyNamesOnResource = (Array.isArray(categoryCode.additionalProperty))
-            ? categoryCode.additionalProperty?.map((p) => p.name)
+        const additionalPropertyNamesOnResource = (Array.isArray(movieTheater.additionalProperty))
+            ? movieTheater.additionalProperty?.map((p) => p.name)
             : [];
         if (Array.isArray(additionalPropertyNamesOnResource) && additionalPropertyNamesOnResource.length > 0) {
             console.log(
                 additionalPropertyNamesOnResource.join(','),
                 additionalPropertyNamesOnResource.length,
                 'additionalPropertyNamesOnResource found',
-                categoryCode.project.id,
-                categoryCode.codeValue
+                movieTheater.project.id,
+                movieTheater.branchCode
             );
             additionalPropertyNames.push(...additionalPropertyNamesOnResource);
-            projectIds.push(categoryCode.project.id);
+            projectIds.push(movieTheater.project.id);
             additionalPropertyNamesOnResource.forEach((name) => {
                 if (!name.match(/^[a-zA-Z]*$/)) {
                     // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                    unexpextedprojectIds.push(categoryCode.project.id);
+                    unexpextedprojectIds.push(movieTheater.project.id);
                 }
                 // tslint:disable-next-line:no-magic-numbers
                 if (name.length < 5) {
                     // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                    unexpextedprojectIds.push(categoryCode.project.id);
+                    unexpextedprojectIds.push(movieTheater.project.id);
                 }
             });
 
@@ -67,19 +68,19 @@ async function main() {
                 checked += 1;
                 const existingAdditionalProperties = await additionalPropertyRepo.search({
                     limit: 1,
-                    project: { id: { $eq: categoryCode.project.id } },
+                    project: { id: { $eq: movieTheater.project.id } },
                     codeValue: { $eq: additionalPropertyNameOnResource },
-                    inCodeSet: { identifier: { $eq: categoryCode.typeOf } }
+                    inCodeSet: { identifier: { $eq: movieTheater.typeOf } }
                 });
                 if (existingAdditionalProperties.length === 0) {
                     const additionalProperty: chevre.factory.additionalProperty.IAdditionalProperty = {
-                        project: categoryCode.project,
+                        project: movieTheater.project,
                         // id?: string;
                         typeOf: 'CategoryCode',
                         codeValue: additionalPropertyNameOnResource,
                         inCodeSet: {
                             typeOf: 'CategoryCodeSet',
-                            identifier: categoryCode.typeOf
+                            identifier: movieTheater.typeOf
                         },
                         name: { ja: additionalPropertyNameOnResource }
                     };
@@ -88,22 +89,21 @@ async function main() {
                     console.log(
                         'additionalProerty created',
                         additionalPropertyNameOnResource,
-                        categoryCode.project.id,
-                        categoryCode.codeValue
+                        movieTheater.project.id,
+                        movieTheater.branchCode
                     );
                 } else {
                     console.log(
                         'additionalProerty existed',
                         additionalPropertyNameOnResource,
-                        categoryCode.project.id,
-                        categoryCode.codeValue
+                        movieTheater.project.id,
+                        movieTheater.branchCode
                     );
                 }
-
             }
         }
     });
-    console.log(i, 'categoryCodes checked');
+    console.log(i, 'places checked');
     console.log('additionalPropertyNames:', [...new Set(additionalPropertyNames)]);
     console.log('projectIds:', [...new Set(projectIds)]);
     console.log('unexpextedprojectIds:', [...new Set(unexpextedprojectIds)]);

package/example/src/chevre/searchCategoryCodesByAggregate.ts

@@ -0,0 +1,32 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
+
+    const categoryCodes = await categoryCodeRepo.searchByAggregate(
+        {
+            limit: 100,
+            page: 1,
+            sort: { codeValue: chevre.factory.sortType.Ascending }
+            // id: { $eq: 'xxx' }
+            // project: { id: { $eq: project.id } }
+            // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
+            // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
+        },
+        ['_id'],
+        []
+    );
+    console.log('categoryCodes found', categoryCodes[0]);
+    console.log(categoryCodes.length, 'categoryCodes found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchSellersByAggregate.ts

@@ -0,0 +1,48 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
+
+    const sellersByAggregate = await sellerRepo.searchByAggregate(
+        {
+            limit: 5,
+            page: 1,
+            sort: { branchCode: chevre.factory.sortType.Descending },
+            id: { $eq: 'xxx' }
+            // project: { id: { $eq: project.id } }
+            // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
+            // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
+        },
+        [],
+        ['hasMerchantReturnPolicy', 'additionalProperty', 'project', 'name', 'typeOf', 'url', 'telephone']
+    );
+    console.log('sellers found', sellersByAggregate, sellersByAggregate[0]?.hasMerchantReturnPolicy);
+    console.log(sellersByAggregate.length, 'sellers found');
+
+    const sellers = await sellerRepo.search(
+        {
+            limit: 5,
+            page: 1,
+            sort: { branchCode: chevre.factory.sortType.Descending },
+            id: { $eq: 'xxx' }
+            // project: { id: { $eq: project.id } }
+            // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
+            // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
+        },
+        [],
+        ['hasMerchantReturnPolicy', 'additionalProperty', 'project', 'name', 'typeOf', 'url', 'telephone']
+    );
+    console.log('sellers found', sellers, sellers[0]?.hasMerchantReturnPolicy);
+    console.log(sellers.length, 'sellers found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -1,31 +1,45 @@
 // tslint:disable:no-console
-import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
-const PROJECT_ID = String(process.env.PROJECT_ID);
+// const PROJECT_ID = String(process.env.PROJECT_ID);
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
-
     let updateResult: any;
-    updateResult = await transactionRepo.unsetUnnecessaryFields({
+
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
+    updateResult = await sellerRepo.unsetUnnecessaryFields({
         filter: {
             // 'project.id': { $eq: PROJECT_ID },
-            typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
-            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
-            startDate: {
-                $lte: moment('2023-08-16T07:26:00Z')
-                    .toDate()
-            },
-            'object.authorizeActions': { $exists: true }
+            typeOf: { $eq: chevre.factory.organizationType.Corporation },
+            areaServed: { $exists: true }
+        },
+        $unset: { areaServed: 1 }
+    });
+    console.log('unset processed.', updateResult);
+
+    const placeRepo = await chevre.repository.Place.createInstance(mongoose.connection);
+    updateResult = await placeRepo.unsetUnnecessaryFieldsFromMovieTheater({
+        filter: {
+            $and: [
+                { typeOf: { $eq: chevre.factory.placeType.MovieTheater } },
+                {
+                    $or: [
+                        { 'offers.project': { $exists: true } },
+                        { 'offers.priceCurrency': { $exists: true } }
+                    ]
+                }
+            ]
         },
-        $unset: { 'object.authorizeActions': 1 }
+        $unset: {
+            'offers.project': 1,
+            'offers.priceCurrency': 1
+        }
     });
-    console.log('unset processed.', updateResult, 'PROJECT_ID:', PROJECT_ID);
+    console.log('unset processed.', updateResult);
 }
 
 main()

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

@@ -22,23 +22,27 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection } from 'mongoose';
+import { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode | '_id';
 /**
  * 区分リポジトリ
  */
 export declare class MongoRepository {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): any[];
-    count(params: factory.categoryCode.ISearchConditions): Promise<number>;
+    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<factory.categoryCode.ICategoryCode>[];
+    static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): {
+        [field: string]: AnyExpression;
+    };
+    /**
+     * 集計検索(publicな属性検索が目的)
+     */
+    searchByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
     /**
      * 検索
      */
-    search(params: factory.categoryCode.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<factory.categoryCode.ICategoryCode[]>;
-    findById(params: {
-        id: string;
-    }): Promise<factory.categoryCode.ICategoryCode>;
+    search(params: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
     save(params: {
         id?: string;
         attributes: factory.categoryCode.ICategoryCode;
@@ -61,5 +65,6 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<factory.categoryCode.ICategoryCode>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }
+export {};

package/lib/chevre/repo/categoryCode.js

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
 const categoryCode_1 = require("./mongoose/schemas/categoryCode");
 const factory = require("../factory");
 const settings_1 = require("../settings");
@@ -34,7 +35,6 @@ class MongoRepository {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        // MongoDB検索条件
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -51,11 +51,13 @@ class MongoRepository {
         }
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
-            andConditions.push({ _id: { $eq: idEq } });
+            // andConditions.push({ _id: { $eq: idEq } });
+            andConditions.push({ _id: { $eq: new mongoose_1.Types.ObjectId(idEq) } });
         }
         const idIn = (_b = params.id) === null || _b === void 0 ? void 0 : _b.$in;
         if (Array.isArray(idIn)) {
-            andConditions.push({ _id: { $in: idIn } });
+            // andConditions.push({ _id: { $in: idIn } });
+            andConditions.push({ _id: { $in: idIn.map((id) => new mongoose_1.Types.ObjectId(id)) } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -149,12 +151,68 @@ class MongoRepository {
         }
         return andConditions;
     }
-    count(params) {
+    static CREATE_AGGREGATE_PROJECTION(inclusion, exclusion) {
+        let projectStage = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            project: '$project',
+            typeOf: '$typeOf',
+            additionalProperty: '$additionalProperty',
+            color: '$color',
+            image: '$image',
+            codeValue: '$codeValue',
+            inCodeSet: '$inCodeSet',
+            name: '$name',
+            paymentMethod: '$paymentMethod'
+        };
+        if (inclusion.length > 0) {
+            projectStage = { _id: 0 };
+            inclusion.forEach((field) => {
+                switch (field) {
+                    case '_id':
+                    case 'id':
+                        projectStage.id = { $toString: '$_id' };
+                        break;
+                    default:
+                        projectStage[field] = `$${field}`;
+                }
+            });
+        }
+        else if (exclusion.length > 0) {
+            exclusion.forEach((field) => {
+                if (typeof projectStage[field] === 'string' || typeof projectStage[field] === 'object') {
+                    // tslint:disable-next-line:no-dynamic-delete
+                    delete projectStage[field];
+                }
+            });
+        }
+        return projectStage;
+    }
+    /**
+     * 集計検索(publicな属性検索が目的)
+     */
+    searchByAggregate(conditions, inclusion, exclusion) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            return this.categoryCodeModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
+            const matchStages = MongoRepository.CREATE_MONGO_CONDITIONS(conditions)
+                .map((c) => ({ $match: c }));
+            const projectStage = MongoRepository.CREATE_AGGREGATE_PROJECTION(inclusion, exclusion);
+            const sortByCodeValue = (_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.codeValue;
+            const aggregate = this.categoryCodeModel.aggregate([
+                ...matchStages,
+                ...(typeof sortByCodeValue === 'number')
+                    ? [{ $sort: { codeValue: sortByCodeValue } }]
+                    : [],
+                { $project: projectStage }
+            ]);
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
+                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
+                aggregate.limit(conditions.limit * page)
+                    .skip(conditions.limit * (page - 1));
+            }
+            return aggregate.exec();
         });
     }
     /**
@@ -197,20 +255,6 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
-    findById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.categoryCodeModel.findOne({ _id: params.id }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.categoryCodeModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;

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

@@ -23,15 +23,16 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection } from 'mongoose';
+import { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+type IKeyOfProjection = keyof factory.creativeWork.movie.ICreativeWork | '_id';
 /**
  * コンテンツリポジトリ
  */
 export declare class MongoRepository {
     private readonly creativeWorkModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.movie.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.movie.ISearchConditions): FilterQuery<import("@chevre/factory/lib/creativeWork/movie").ICreativeWork>[];
     /**
      * コンテンツを保管する
      */
@@ -42,13 +43,10 @@ export declare class MongoRepository {
     upsertMoviesByIdentifier(params: {
         attributes: factory.creativeWork.movie.ICreativeWork;
     }[]): Promise<BulkWriteResult | void>;
-    findMovieById(params: {
-        id: string;
-    }): Promise<factory.creativeWork.movie.ICreativeWork>;
     /**
      * コンテンツを検索する
      */
-    searchMovies(params: factory.creativeWork.movie.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<factory.creativeWork.movie.ICreativeWork[]>;
+    searchMovies(params: factory.creativeWork.movie.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.creativeWork.movie.ICreativeWork[]>;
     /**
      * コンテンツを削除する
      */
@@ -60,9 +58,10 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<factory.creativeWork.movie.ICreativeWork>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
-        filter: any;
+        filter: FilterQuery<factory.creativeWork.movie.ICreativeWork>;
         $unset: any;
     }): Promise<import("mongodb").UpdateResult>;
 }
+export {};

package/lib/chevre/repo/creativeWork.js

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
 const creativeWork_1 = require("./mongoose/schemas/creativeWork");
 const factory = require("../factory");
 const settings_1 = require("../settings");
@@ -34,111 +35,65 @@ class MongoRepository {
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        // MongoDB検索条件
         const andConditions = [
-            {
-                typeOf: factory.creativeWorkType.Movie
-            }
+            { typeOf: { $eq: factory.creativeWorkType.Movie } }
         ];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
-            andConditions.push({
-                'project.id': {
-                    $eq: projectIdEq
-                }
-            });
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
         const contentRatingEq = (_c = params.contentRating) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof contentRatingEq === 'string') {
-            andConditions.push({
-                contentRating: {
-                    $exists: true,
-                    $eq: contentRatingEq
-                }
-            });
+            andConditions.push({ contentRating: { $exists: true, $eq: contentRatingEq } });
         }
         const distributorCodeValueEq = (_e = (_d = params.distributor) === null || _d === void 0 ? void 0 : _d.codeValue) === null || _e === void 0 ? void 0 : _e.$eq;
         if (typeof distributorCodeValueEq === 'string') {
-            andConditions.push({
-                'distributor.codeValue': {
-                    $exists: true,
-                    $eq: distributorCodeValueEq
-                }
-            });
+            andConditions.push({ 'distributor.codeValue': { $exists: true, $eq: distributorCodeValueEq } });
         }
         const idEq = (_f = params.id) === null || _f === void 0 ? void 0 : _f.$eq;
         if (typeof idEq === 'string') {
-            andConditions.push({ _id: { $eq: idEq } });
+            // andConditions.push({ _id: { $eq: idEq } });
+            andConditions.push({ _id: { $eq: new mongoose_1.Types.ObjectId(idEq) } });
         }
         const idIn = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$in;
         if (Array.isArray(idIn)) {
-            andConditions.push({ _id: { $in: idIn } });
+            // andConditions.push({ _id: { $in: idIn } });
+            andConditions.push({ _id: { $in: idIn.map((id) => new mongoose_1.Types.ObjectId(id)) } });
         }
         if (typeof params.identifier === 'string') {
             if (params.identifier.length > 0) {
-                andConditions.push({
-                    identifier: { $regex: new RegExp(params.identifier) }
-                });
+                andConditions.push({ identifier: { $regex: new RegExp(params.identifier) } });
             }
         }
         else {
             const identifierEq = (_h = params.identifier) === null || _h === void 0 ? void 0 : _h.$eq;
             if (typeof identifierEq === 'string') {
-                andConditions.push({
-                    identifier: { $eq: identifierEq }
-                });
+                andConditions.push({ identifier: { $eq: identifierEq } });
             }
             const identifierIn = (_j = params.identifier) === null || _j === void 0 ? void 0 : _j.$in;
             if (Array.isArray(identifierIn)) {
-                andConditions.push({
-                    identifier: { $in: identifierIn }
-                });
+                andConditions.push({ identifier: { $in: identifierIn } });
             }
         }
         if (typeof params.name === 'string' && params.name.length > 0) {
             // 多言語名称対応(2022-07-11~)
             andConditions.push({
                 $or: [
-                    {
-                        name: {
-                            $exists: true,
-                            $regex: new RegExp(params.name)
-                        }
-                    },
-                    {
-                        'name.ja': {
-                            $exists: true,
-                            $regex: new RegExp(params.name)
-                        }
-                    },
-                    {
-                        'name.en': {
-                            $exists: true,
-                            $regex: new RegExp(params.name)
-                        }
-                    }
+                    { name: { $exists: true, $regex: new RegExp(params.name) } },
+                    { 'name.ja': { $exists: true, $regex: new RegExp(params.name) } },
+                    { 'name.en': { $exists: true, $regex: new RegExp(params.name) } }
                 ]
             });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.datePublishedFrom !== undefined) {
-            andConditions.push({
-                datePublished: {
-                    $exists: true,
-                    $gte: params.datePublishedFrom
-                }
-            });
+            andConditions.push({ datePublished: { $exists: true, $gte: params.datePublishedFrom } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.datePublishedThrough !== undefined) {
-            andConditions.push({
-                datePublished: {
-                    $exists: true,
-                    $lte: params.datePublishedThrough
-                }
-            });
+            andConditions.push({ datePublished: { $exists: true, $lte: params.datePublishedThrough } });
         }
         const offersAvailableFrom = (_k = params.offers) === null || _k === void 0 ? void 0 : _k.availableFrom;
         if (offersAvailableFrom instanceof Date) {
@@ -171,7 +126,7 @@ class MongoRepository {
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
-                doc = yield this.creativeWorkModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                doc = yield this.creativeWorkModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true })
                     .exec();
             }
             if (doc === null) {
@@ -216,20 +171,6 @@ class MongoRepository {
             }
         });
     }
-    findMovieById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.creativeWorkModel.findOne({ _id: params.id }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.creativeWorkModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
     /**
      * コンテンツを検索する
      */
@@ -276,7 +217,7 @@ class MongoRepository {
      */
     deleteMovie(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.creativeWorkModel.findOneAndRemove({ _id: params.id })
+            yield this.creativeWorkModel.findOneAndRemove({ _id: { $eq: params.id } })
                 .exec();
         });
     }

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

@@ -8,12 +8,12 @@ const modelName = 'Seller';
 exports.modelName = modelName;
 const schemaDefinition = {
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    areaServed: [mongoose_1.SchemaTypes.Mixed],
+    // areaServed: [SchemaTypes.Mixed],
     branchCode: String,
     hasMerchantReturnPolicy: [mongoose_1.SchemaTypes.Mixed],
     makesOffer: [mongoose_1.SchemaTypes.Mixed],
     name: mongoose_1.SchemaTypes.Mixed,
-    parentOrganization: mongoose_1.SchemaTypes.Mixed,
+    // parentOrganization: SchemaTypes.Mixed,
     paymentAccepted: [mongoose_1.SchemaTypes.Mixed],
     project: mongoose_1.SchemaTypes.Mixed,
     typeOf: {

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

@@ -22,21 +22,22 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { AnyExpression, Connection } from 'mongoose';
+import type { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
 export type IMovieTheaterIncludingScreeningRooms = factory.place.movieTheater.IPlace & {
     containsPlace: factory.place.screeningRoom.IPlace[];
 };
+type IKeyOfProjectionMovieTheater = keyof factory.place.movieTheater.IPlace | '_id';
 /**
  * 施設リポジトリ
  */
 export declare class MongoRepository {
     private readonly placeModel;
     constructor(connection: Connection);
-    static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): any[];
-    static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): any[];
+    static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): FilterQuery<import("@chevre/factory/lib/place/busStop").IPlace>[];
+    static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): FilterQuery<import("@chevre/factory/lib/place/movieTheater").IPlace>[];
     static CREATE_SEARCH_SEATS_PROJECTION(params: factory.place.seat.IProjection): {
         [field: string]: AnyExpression;
     };
@@ -48,7 +49,7 @@ export declare class MongoRepository {
     /**
      * 施設検索
      */
-    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions, inclusion: (keyof factory.place.movieTheater.IPlace | '_id' | 'url')[], exclusion: string[]): Promise<factory.place.movieTheater.IPlace[]>;
+    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions, inclusion: IKeyOfProjectionMovieTheater[], exclusion: IKeyOfProjectionMovieTheater[]): Promise<factory.place.movieTheater.IPlace[]>;
     deleteMovieTheaterById(params: {
         project: {
             id: string;
@@ -283,14 +284,10 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    unsetContainsPlaceFromMovieTheater(params: {
-        /**
-         * 施設ID
-         */
-        id: string;
-    }): Promise<{
-        id: string;
-    } | undefined>;
+    unsetUnnecessaryFieldsFromMovieTheater(params: {
+        filter: FilterQuery<any>;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
     deleteManyByParentOrganizationId(params: {
         project: {
             id: string;
@@ -324,6 +321,6 @@ export declare class MongoRepository {
         };
         id: string;
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }
 export {};

package/lib/chevre/repo/place.js

@@ -24,7 +24,6 @@ exports.MongoRepository = void 0;
 const place_1 = require("./mongoose/schemas/place");
 const factory = require("../factory");
 const settings_1 = require("../settings");
-// const debug = createDebug('chevre-domain:repo:place');
 /**
  * 施設リポジトリ
  */
@@ -210,17 +209,17 @@ class MongoRepository {
         return andConditions;
     }
     static CREATE_SEARCH_SEATS_PROJECTION(params) {
-        let includeScreeningRooms = true;
-        if (params['containedInPlace.containedInPlace'] === 0) {
-            includeScreeningRooms = false;
-        }
+        const includeSectionBranchCode = params['containedInPlace.branchCode'] !== 0;
+        const includeSectionName = params['containedInPlace.name'] !== 0;
+        const includeSectionTypeOf = params['containedInPlace.typeOf'] !== 0;
+        const includeScreeningRooms = params['containedInPlace.containedInPlace'] !== 0;
         const projectStage = {
             _id: 0,
             typeOf: '$containsPlace.containsPlace.typeOf',
             branchCode: '$containsPlace.containsPlace.branchCode',
             name: '$containsPlace.containsPlace.name',
             seatingType: '$containsPlace.containsPlace.seatingType',
-            containedInPlace: Object.assign({ typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name' }, (includeScreeningRooms)
+            containedInPlace: Object.assign(Object.assign(Object.assign(Object.assign({}, (includeSectionBranchCode) ? { branchCode: '$containsPlace.branchCode' } : undefined), (includeSectionName) ? { name: '$containsPlace.name' } : undefined), (includeSectionTypeOf) ? { typeOf: '$containsPlace.typeOf' } : undefined), (includeScreeningRooms)
                 ? {
                     containedInPlace: {
                         typeOf: '$typeOf',
@@ -333,9 +332,7 @@ class MongoRepository {
     /**
      * 施設検索
      */
-    searchMovieTheaters(params, 
-    // projection明示指定化(2023-06-22~)
-    inclusion, exclusion) {
+    searchMovieTheaters(params, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
@@ -1287,23 +1284,10 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    unsetContainsPlaceFromMovieTheater(params) {
+    unsetUnnecessaryFieldsFromMovieTheater(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.placeModel.findOneAndUpdate({
-                _id: { $eq: params.id },
-                typeOf: { $eq: factory.placeType.MovieTheater },
-                'containsPlace.branchCode': { $exists: true }
-            }, {
-                $unset: { containsPlace: 1 }
-            })
-                .select({ _id: 1 })
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    return;
-                }
-                return doc.toObject();
-            });
+            return this.placeModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
         });
     }
     deleteManyByParentOrganizationId(params) {

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

@@ -22,9 +22,10 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import { Connection } from 'mongoose';
+import { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 export type ISeller = factory.seller.ISeller;
+export type ISellerByAggregate = Pick<ISeller, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'id' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'>;
 export interface IMemberSearchConditions {
     /**
      * 販売者メンバーで絞る場合
@@ -37,17 +38,17 @@ export interface IMemberSearchConditions {
         };
     };
 }
+type IKeyOfProjection = keyof ISeller | '_id';
 /**
  * 販売者リポジトリ
  */
 export declare class MongoRepository {
     private readonly organizationModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): any[];
-    /**
-     * 特定販売者検索
-     * searchに置き換え(2023-07-13~)
-     */
+    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<factory.seller.ISeller>[];
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion: string[], exclusion: (keyof ISellerByAggregate)[]): {
+        [field: string]: AnyExpression;
+    };
     /**
      * 販売者を保管する
      */
@@ -55,10 +56,14 @@ export declare class MongoRepository {
         id?: string;
         attributes: factory.seller.ISeller;
     }): Promise<ISeller>;
+    /**
+     * 集計検索(publicな属性検索が目的)
+     */
+    searchByAggregate(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: (keyof ISellerByAggregate)[], exclusion: (keyof ISellerByAggregate)[]): Promise<ISellerByAggregate[]>;
     /**
      * 販売者検索
      */
-    search(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: string[], exclusion: string[]): Promise<ISeller[]>;
+    search(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<ISeller[]>;
     /**
      * 対応決済方法を検索する
      */
@@ -96,5 +101,10 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
+export {};

package/lib/chevre/repo/seller.js

@@ -35,7 +35,6 @@ class MongoRepository {
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -43,12 +42,14 @@ class MongoRepository {
         }
         const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof idEq === 'string') {
-            andConditions.push({ _id: { $eq: idEq } });
+            // andConditions.push({ _id: { $eq: idEq } });
+            andConditions.push({ _id: { $eq: new mongoose_1.Types.ObjectId(idEq) } });
         }
         // メンバー条件追加(2023-07-24~)
         const memberMemberOfIdIn = (_f = (_e = (_d = params.member) === null || _d === void 0 ? void 0 : _d.memberOf) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(memberMemberOfIdIn)) {
-            andConditions.push({ _id: { $in: memberMemberOfIdIn } });
+            // andConditions.push({ _id: { $in: memberMemberOfIdIn } });
+            andConditions.push({ _id: { $in: memberMemberOfIdIn.map((memberMemberOfId) => new mongoose_1.Types.ObjectId(memberMemberOfId)) } });
         }
         const nameRegex = params.name;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
@@ -143,41 +144,47 @@ class MongoRepository {
         }
         return andConditions;
     }
-    /**
-     * 特定販売者検索
-     * searchに置き換え(2023-07-13~)
-     */
-    // public async findById(
-    //     conditions: {
-    //         id: string;
-    //     },
-    //     inclusion: string[],
-    //     exclusion: string[]
-    // ): Promise<ISeller> {
-    //     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 doc = await this.organizationModel.findOne({ _id: conditions.id }, projection)
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound(this.organizationModel.modelName);
-    //     }
-    //     return doc.toObject();
-    // }
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion, exclusion) {
+        const projectStage = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            additionalProperty: '$additionalProperty',
+            branchCode: '$branchCode',
+            hasMerchantReturnPolicy: {
+                $cond: {
+                    if: { $isArray: '$hasMerchantReturnPolicy' },
+                    then: {
+                        $cond: {
+                            if: { $eq: [{ $size: '$hasMerchantReturnPolicy' }, 0] },
+                            then: [],
+                            else: [{
+                                    url: { $first: '$hasMerchantReturnPolicy.url' },
+                                    typeOf: { $first: '$hasMerchantReturnPolicy.typeOf' }
+                                }]
+                        }
+                    },
+                    else: []
+                }
+            },
+            name: '$name',
+            project: '$project',
+            typeOf: '$typeOf',
+            url: '$url',
+            telephone: '$telephone'
+        };
+        if (inclusion.length > 0) {
+            // no op
+        }
+        else if (exclusion.length > 0) {
+            exclusion.forEach((field) => {
+                if (typeof projectStage[field] === 'string' || typeof projectStage[field] === 'object') {
+                    // tslint:disable-next-line:no-dynamic-delete
+                    delete projectStage[field];
+                }
+            });
+        }
+        return projectStage;
+    }
     /**
      * 販売者を保管する
      */
@@ -204,6 +211,33 @@ class MongoRepository {
             return organization;
         });
     }
+    /**
+     * 集計検索(publicな属性検索が目的)
+     */
+    searchByAggregate(conditions, inclusion, exclusion) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = MongoRepository.CREATE_MONGO_CONDITIONS(conditions)
+                .map((c) => ({ $match: c }));
+            const projectStage = MongoRepository.CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion, exclusion);
+            const sortByBranchCode = (_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode;
+            const aggregate = this.organizationModel.aggregate([
+                ...matchStages,
+                ...(typeof sortByBranchCode === 'number')
+                    ? [{ $sort: { branchCode: sortByBranchCode } }]
+                    : [],
+                { $project: projectStage }
+            ]);
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
+                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
+                aggregate.limit(conditions.limit * page)
+                    .skip(conditions.limit * (page - 1));
+            }
+            return aggregate.exec();
+        });
+    }
     /**
      * 販売者検索
      */
@@ -309,5 +343,11 @@ class MongoRepository {
             .sort({ branchCode: factory.sortType.Ascending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.organizationModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -17,7 +17,7 @@ function createPrice(params) {
             name: priceSpec.name,
             price: priceSpec.price,
             priceCurrency: priceSpec.priceCurrency,
-            project: priceSpec.project,
+            // project: priceSpec.project,
             typeOf: priceSpec.typeOf,
             appliesToCategoryCode: priceSpec.appliesToCategoryCode,
             valueAddedTaxIncluded: priceSpec.valueAddedTaxIncluded

package/lib/chevre/service/event.js

@@ -697,8 +697,8 @@ function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromC
         typeOf: factory.placeType.MovieTheater,
         telephone: theaterFromCOA.theaterTelNum,
         offers: {
-            project: { typeOf: project.typeOf, id: project.id },
-            priceCurrency: factory.priceCurrency.JPY,
+            // project: { typeOf: project.typeOf, id: project.id }, // optimize(2023-11-06~)
+            // priceCurrency: factory.priceCurrency.JPY, // optimize(2023-11-06~)
             typeOf: factory.offerType.Offer,
             eligibleQuantity: {
                 typeOf: 'QuantitativeValue',

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

@@ -9,6 +9,7 @@ import * as EventOfferService from './offer/event';
 import * as EventServiceByCOAOfferService from './offer/eventServiceByCOA';
 import * as MoneyTransferOfferService from './offer/moneyTransfer';
 import * as ProductOfferService from './offer/product';
+type ICategoryCodeChargeSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.CategoryCodeChargeSpecification>;
 export { EventOfferService as event, EventServiceByCOAOfferService as eventServiceByCOA, MoneyTransferOfferService as moneyTransfer, ProductOfferService as product };
 /**
  * 座席にオファー情報を付加する
@@ -19,7 +20,7 @@ export declare function addOffers2Seat(params: {
     /**
      * 座席区分加算料金
      */
-    priceSpecs: factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.CategoryCodeChargeSpecification>[];
+    priceSpecs: ICategoryCodeChargeSpecification[];
 }): factory.place.seat.IPlaceWithOffer;
 /**
  * イベントに対する座席オファーを検索する

package/lib/chevre/service/offer.js

@@ -30,13 +30,19 @@ function addOffers2Seat(params) {
     const seatingTypes = (Array.isArray(params.seat.seatingType))
         ? params.seat.seatingType
         : (typeof params.seat.seatingType === 'string' && params.seat.seatingType.length > 0) ? [params.seat.seatingType] : [];
-    const priceComponent = params.priceSpecs.filter((s) => {
+    const priceComponent = params.priceSpecs.filter((priceSpec) => {
         // 適用カテゴリーコードに座席タイプが含まれる価格仕様を検索
-        return (Array.isArray(s.appliesToCategoryCode))
-            && s.appliesToCategoryCode.some((categoryCode) => {
+        return (Array.isArray(priceSpec.appliesToCategoryCode))
+            && priceSpec.appliesToCategoryCode.some((categoryCode) => {
                 return seatingTypes.includes(categoryCode.codeValue);
-                // && categoryCode.inCodeSet.identifier === factory.categoryCode.CategorySetIdentifier.SeatingType;
             });
+    })
+        .map(({ appliesToCategoryCode, name, price, priceCurrency, typeOf, valueAddedTaxIncluded }) => {
+        return {
+            appliesToCategoryCode,
+            // id,
+            name, price, priceCurrency, typeOf, valueAddedTaxIncluded
+        };
     });
     const priceSpecification = {
         typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
@@ -46,11 +52,11 @@ function addOffers2Seat(params) {
     if (typeof params.availability === 'string') {
         availability = params.availability;
     }
-    return Object.assign(Object.assign({}, params.seat), { offers: [{
-                typeOf: factory.offerType.Offer,
-                availability,
-                priceSpecification
-            }] });
+    return Object.assign(Object.assign({}, params.seat), { offers: [Object.assign({ 
+                // typeOf: factory.offerType.Offer, // optimize(2023-11-08~)
+                availability }, (priceSpecification.priceComponent.length > 0)
+                ? { priceSpecification } // priceComponentの存在する場合のみ追加(2023-11-08~)
+                : undefined)] });
 }
 exports.addOffers2Seat = addOffers2Seat;
 /**

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.337.0",
-    "@cinerino/sdk": "5.0.0-alpha.3",
+    "@chevre/factory": "4.340.0",
+    "@cinerino/sdk": "5.0.0-alpha.11",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.15.0-alpha.1"
+  "version": "21.15.0-alpha.10"
 }

package/example/src/chevre/migrateIAMMemberMemberOf.ts

@@ -1,59 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
-
-    const cursor = memberRepo.getCursor(
-        {},
-        {
-            // _id: 1,
-        }
-    );
-    console.log('members found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const iamMember: chevre.factory.iam.IMember = doc.toObject();
-
-        const memberOfId = iamMember.member.memberOf?.id;
-        const alreadyMigrated = typeof memberOfId === 'string';
-
-        if (alreadyMigrated) {
-            console.log('already exist...', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, memberOfId, i);
-        } else {
-            console.log(
-                'updating reservation...', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, memberOfId, i);
-            await memberRepo.updateByMemberMemberOf({
-                project: { id: iamMember.project.id },
-                member: {
-                    id: iamMember.member.id,
-                    memberOf: {
-                        id: iamMember.project.id,
-                        typeOf: chevre.factory.organizationType.Project
-                    }
-                }
-            });
-            updateCount += 1;
-            console.log('updated.', iamMember.project.id, iamMember.member.id, iamMember.member.typeOf, memberOfId, i);
-        }
-    });
-
-    console.log(i, 'members checked');
-    console.log(updateCount, 'members updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/searchSellers.ts

@@ -1,28 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
-
-    const sellers = await sellerRepo.search(
-        {
-            project: { id: { $eq: project.id } },
-            paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
-            hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
-        },
-        ['name'],
-        []
-    );
-    console.log('sellers found', sellers);
-    console.log(sellers.length, 'sellers found');
-}
-
-main()
-    .then()
-    .catch(console.error);