@chevre/domain 21.4.0-alpha.3 → 21.4.0-alpha.31

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 /**
@@ -19,6 +43,14 @@ export declare class MongoRepository {
             id: {
                 $eq: string;
             };
+            memberOf: {
+                id: {
+                    $eq: string;
+                };
+                typeOf: {
+                    $eq: factory.organizationType.Corporation | factory.organizationType.Project;
+                };
+            };
         };
     }): Promise<{
         roleName: string;
@@ -43,12 +75,31 @@ export declare class MongoRepository {
             id: string;
         };
         member: {
-            hasRole?: factory.iam.IMemberHasRole;
             id: string;
+            memberOf: {
+                id: string;
+                typeOf: factory.organizationType.Corporation | factory.organizationType.Project;
+            };
+            hasRole?: factory.iam.IMemberHasRole;
             image?: string;
             name?: string;
         };
     }): Promise<void>;
+    /**
+     * 互換性維持プログラム専用
+     */
+    updateByMemberMemberOf(params: {
+        project: {
+            id: string;
+        };
+        member: {
+            id: string;
+            memberOf: {
+                id: string;
+                typeOf: factory.organizationType.Project;
+            };
+        };
+    }): Promise<void>;
     /**
      * メンバー削除
      */
@@ -58,6 +109,14 @@ export declare class MongoRepository {
         };
         member: {
             id: string;
+            memberOf: {
+                id: {
+                    $eq: string;
+                };
+                typeOf: {
+                    $eq: factory.organizationType.Corporation | factory.organizationType.Project;
+                };
+            };
         };
     }): Promise<void>;
     /**
@@ -75,4 +134,20 @@ export declare class MongoRepository {
         limit: number;
         page: number;
     }): Promise<string[]>;
+    /**
+     * member.memberOf.typeOfからmember.memberOf.idのリストを検索する
+     * 権限を持つ販売者IDの検索など
+     */
+    searchMemberOfIdsByMemberId(params: {
+        member: {
+            id: string;
+            memberOf: {
+                typeOf: factory.organizationType.Corporation | factory.organizationType.Project;
+            };
+        };
+        project: {
+            id: string;
+        };
+    }): Promise<string[]>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/member.js

@@ -22,7 +22,7 @@ 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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -48,6 +48,14 @@ class MongoRepository {
                 }
             }
         }
+        const memberMemberOfTypeOfEq = (_c = (_b = (_a = params.member) === null || _a === void 0 ? void 0 : _a.memberOf) === null || _b === void 0 ? void 0 : _b.typeOf) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof memberMemberOfTypeOfEq === 'string') {
+            andConditions.push({ 'member.memberOf.typeOf': { $eq: memberMemberOfTypeOfEq } });
+        }
+        const memberMemberOfIdEq = (_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.$eq;
+        if (typeof memberMemberOfIdEq === 'string') {
+            andConditions.push({ 'member.memberOf.id': { $eq: memberMemberOfIdEq } });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.member !== undefined && params.member !== null) {
@@ -71,7 +79,7 @@ class MongoRepository {
                 }
             }
         }
-        const memberIdIn = (_b = (_a = params.member) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$in;
+        const memberIdIn = (_h = (_g = params.member) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$in;
         if (Array.isArray(memberIdIn)) {
             andConditions.push({
                 'member.id': {
@@ -79,7 +87,7 @@ class MongoRepository {
                 }
             });
         }
-        const memberNameRegex = (_d = (_c = params.member) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.$regex;
+        const memberNameRegex = (_k = (_j = params.member) === null || _j === void 0 ? void 0 : _j.name) === null || _k === void 0 ? void 0 : _k.$regex;
         if (typeof memberNameRegex === 'string' && memberNameRegex.length > 0) {
             andConditions.push({
                 'member.name': {
@@ -88,7 +96,7 @@ class MongoRepository {
                 }
             });
         }
-        const memberHasRoleRoleNameEq = (_g = (_f = (_e = params.member) === null || _e === void 0 ? void 0 : _e.hasRole) === null || _f === void 0 ? void 0 : _f.roleName) === null || _g === void 0 ? void 0 : _g.$eq;
+        const memberHasRoleRoleNameEq = (_o = (_m = (_l = params.member) === null || _l === void 0 ? void 0 : _l.hasRole) === null || _m === void 0 ? void 0 : _m.roleName) === null || _o === void 0 ? void 0 : _o.$eq;
         if (typeof memberHasRoleRoleNameEq === 'string') {
             andConditions.push({
                 'member.hasRole.roleName': {
@@ -136,7 +144,9 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [
                 { $match: { 'project.id': { $eq: params.project.id.$eq } } },
-                { $match: { 'member.id': { $eq: params.member.id.$eq } } }
+                { $match: { 'member.id': { $eq: params.member.id.$eq } } },
+                { $match: { 'member.memberOf.id': { $eq: params.member.memberOf.id.$eq } } },
+                { $match: { 'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf.$eq } } }
             ];
             const aggregate = this.memberModel.aggregate([
                 // ...(typeof params.sort?.productID === 'number')
@@ -215,7 +225,9 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.memberModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
-                'member.id': { $eq: params.member.id }
+                'member.id': { $eq: params.member.id },
+                'member.memberOf.id': { $eq: params.member.memberOf.id },
+                'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf }
             }, Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (Array.isArray(params.member.hasRole)) ? { 'member.hasRole': params.member.hasRole } : undefined), (typeof params.member.image === 'string') ? { 'member.image': params.member.image } : undefined), (typeof params.member.name === 'string') ? { 'member.name': params.member.name } : undefined))
                 .exec();
             if (doc === null) {
@@ -223,6 +235,24 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * 互換性維持プログラム専用
+     */
+    updateByMemberMemberOf(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.memberModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                'member.id': { $eq: params.member.id },
+                'member.memberOf': { $exists: false }
+            }, {
+                'member.memberOf': params.member.memberOf
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.memberModel.modelName);
+            }
+        });
+    }
     /**
      * メンバー削除
      */
@@ -230,7 +260,9 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.memberModel.findOneAndDelete({
                 'project.id': { $eq: params.project.id },
-                'member.id': { $eq: params.member.id }
+                'member.id': { $eq: params.member.id },
+                'member.memberOf.id': { $eq: params.member.memberOf.id.$eq },
+                'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf.$eq }
             })
                 .exec();
             if (doc === null) {
@@ -244,22 +276,52 @@ class MongoRepository {
     searchProjectIdsByMemberId(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const searchConditions = Object.assign({ 'member.id': { $eq: params.member.id } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$regex) === 'string' && params.project.id.$regex.length > 0)
-                ? { 'project.id': { $regex: new RegExp(params.project.id.$regex) } }
-                : undefined);
-            const query = this.memberModel.find(searchConditions, { project: 1 })
-                // sortを保証する
-                .sort({ 'project.id': factory.sortType.Ascending });
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                query.limit(params.limit)
-                    .skip(params.limit * (page - 1));
+            if (typeof params.limit !== 'number') {
+                throw new factory.errors.ArgumentNull('limit');
             }
-            const projectMembers = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            if (typeof params.page !== 'number') {
+                throw new factory.errors.ArgumentNull('page');
+            }
+            const matchStages = [{ $match: { 'member.id': { $eq: params.member.id } } }];
+            if (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$regex) === 'string' && params.project.id.$regex.length > 0) {
+                matchStages.push({ $match: { 'project.id': { $regex: new RegExp(params.project.id.$regex) } } });
+            }
+            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            const aggregate = this.memberModel.aggregate([
+                ...matchStages,
+                {
+                    $group: {
+                        _id: '$project.id'
+                    }
+                },
+                { $sort: { _id: factory.sortType.Ascending } }
+            ])
+                .limit(params.limit * page)
+                .skip(params.limit * (page - 1));
+            return aggregate
                 .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
-            return projectMembers.map((m) => m.project.id);
+                .then((docs) => docs.map((doc) => doc._id));
+        });
+    }
+    /**
+     * member.memberOf.typeOfからmember.memberOf.idのリストを検索する
+     * 権限を持つ販売者IDの検索など
+     */
+    searchMemberOfIdsByMemberId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const query = this.memberModel.distinct('member.memberOf.id', {
+                'project.id': { $eq: params.project.id },
+                'member.id': { $eq: params.member.id },
+                'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf }
+            });
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.memberModel.find(conditions, projection)
+            .sort({ 'member.id': factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/mongoose/schemas/event.d.ts

@@ -25,7 +25,7 @@
 import { Schema } from 'mongoose';
 declare const modelName = "Event";
 /**
- * イベント(公演など)スキーマ
+ * イベントスキーマ
  */
 declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
@@ -53,11 +53,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;
@@ -86,11 +87,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     kanaName?: string | undefined;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;
@@ -119,11 +121,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     kanaName?: string | undefined;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;

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

@@ -7,10 +7,17 @@ const factory = require("../../../factory");
 const modelName = 'Event';
 exports.modelName = modelName;
 /**
- * イベント(公演など)スキーマ
+ * イベントスキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    organizer: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     _id: String,
     typeOf: {
         type: String,
@@ -78,6 +85,12 @@ schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ 'project.id': 1, startDate: 1 }, {
     name: 'searchByProjectId-v20220721'
 });
+schema.index({ 'organizer.id': 1, startDate: 1 }, {
+    name: 'searchByOrganizerId',
+    partialFilterExpression: {
+        'organizer.id': { $exists: true }
+    }
+});
 schema.index({ typeOf: 1, startDate: 1 }, { name: 'searchByTypeOf' });
 schema.index({ eventStatus: 1, startDate: 1 }, { name: 'searchByEventStatus' });
 schema.index({ name: 1, startDate: 1 }, { name: 'searchByName' });

package/lib/chevre/repo/mongoose/schemas/member.d.ts

@@ -25,7 +25,7 @@
 import { Schema } from 'mongoose';
 declare const modelName = "Member";
 /**
- * プロジェクトメンバースキーマ
+ * IAMメンバースキーマ
  */
 declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
@@ -53,16 +53,16 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
-    project?: any;
-    member?: any;
+    project: any;
+    member: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
-    project?: any;
-    member?: any;
+    project: any;
+    member: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
-    project?: any;
-    member?: any;
+    project: any;
+    member: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;
 }, never>>;

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

@@ -6,15 +6,21 @@ const writeConcern_1 = require("../writeConcern");
 const modelName = 'Member';
 exports.modelName = modelName;
 /**
- * プロジェクトメンバースキーマ
+ * IAMメンバースキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     typeOf: {
         type: String,
         required: true
     },
-    member: mongoose_1.SchemaTypes.Mixed
+    member: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    }
 }, {
     collection: 'members',
     id: true,
@@ -43,9 +49,7 @@ const schema = new mongoose_1.Schema({
 exports.schema = schema;
 schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
-schema.index({ 'member.id': 1 }, {
-    name: 'searchByMemberId'
-});
+schema.index({ 'member.id': 1 }, { name: 'searchByMemberId' });
 schema.index({ 'project.id': 1, 'member.id': 1 }, {
     name: 'uniqueProjectMember',
     unique: true
@@ -62,3 +66,5 @@ schema.index({ 'member.hasRole.roleName': 1, 'member.id': 1 }, {
         'member.hasRole.roleName': { $exists: true }
     }
 });
+schema.index({ 'member.memberOf.typeOf': 1, 'member.id': 1 }, { name: 'searchByMemberMemberOfTypeOf' });
+schema.index({ 'member.memberOf.id': 1, 'member.id': 1 }, { name: 'searchByMemberMemberOfId' });

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

@@ -53,13 +53,14 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -72,18 +73,18 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -96,18 +97,18 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -120,7 +121,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }> & {

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

@@ -9,7 +9,15 @@ exports.modelName = modelName;
  * 場所スキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    // 必須化(2023-07-14~)
+    parentOrganization: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     typeOf: {
         type: String,
         required: true
@@ -32,7 +40,6 @@ const schema = new mongoose_1.Schema({
     kanaName: String,
     offers: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    parentOrganization: mongoose_1.SchemaTypes.Mixed,
     // ↓ルームの施設からの分離に伴い属性追加(2023-06-22~)
     openSeatingAllowed: mongoose_1.SchemaTypes.Mixed,
     amenityFeature: mongoose_1.SchemaTypes.Mixed

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

@@ -54,9 +54,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, {
     typeOf: string;
     additionalProperty: any[];
+    provider: any[];
     offers: any[];
     productID: string;
-    provider: any[];
     name?: any;
     project?: any;
     description?: any;
@@ -67,9 +67,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
+    provider: any[];
     offers: any[];
     productID: string;
-    provider: any[];
     name?: any;
     project?: any;
     description?: any;
@@ -80,9 +80,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
+    provider: any[];
     offers: any[];
     productID: string;
-    provider: any[];
     name?: any;
     project?: any;
     description?: any;

package/lib/chevre/repo/mongoose/schemas/reservation.d.ts

@@ -53,12 +53,13 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
     reservationNumber: string;
+    provider: any;
     reservationStatus: string;
     checkedIn: boolean;
     attended: boolean;
     _id?: string | undefined;
-    project?: any;
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
@@ -81,12 +82,13 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     previousReservationStatus?: string | undefined;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     reservationNumber: string;
+    provider: any;
     reservationStatus: string;
     checkedIn: boolean;
     attended: boolean;
     _id?: string | undefined;
-    project?: any;
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
@@ -109,12 +111,13 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     previousReservationStatus?: string | undefined;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     reservationNumber: string;
+    provider: any;
     reservationStatus: string;
     checkedIn: boolean;
     attended: boolean;
     _id?: string | undefined;
-    project?: any;
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;

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

@@ -9,7 +9,14 @@ exports.modelName = modelName;
  * 予約スキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    provider: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     _id: String,
     typeOf: {
         type: String,
@@ -74,9 +81,8 @@ exports.schema = schema;
 schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ bookingTime: -1 }, { name: 'searchByBookingTime-v3' });
-schema.index({ 'project.id': 1, bookingTime: -1 }, {
-    name: 'searchByProjectId-v20220721'
-});
+schema.index({ 'project.id': 1, bookingTime: -1 }, { name: 'searchByProjectId-v20220721' });
+schema.index({ 'provider.id': 1, bookingTime: -1 }, { name: 'searchByProviderId' });
 schema.index({ typeOf: 1, bookingTime: -1 }, { name: 'searchByTypeOf-v3' });
 schema.index({ reservationNumber: 1, bookingTime: -1 }, { name: 'searchByReservationNumber-v3' });
 schema.index({ reservationStatus: 1, bookingTime: -1 }, { name: 'searchByReservationStatus-v3' });