@chevre/domain 21.4.0-alpha.8 → 21.4.0

package/lib/chevre/repo/assetTransaction.js

@@ -319,23 +319,17 @@ class MongoRepository {
         });
     }
     addReservations(params) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
                 status: { $eq: factory.transactionStatusType.InProgress }
-            }, Object.assign({ 'object.acceptedOffer': params.object.acceptedOffer, 
-                // 念のため残す(2021/10/14)が、そのうち削除
-                // 冗長なので削除(2021/10/19～)
-                // 'object.event': params.object.reservationFor,
-                'object.reservationFor': params.object.reservationFor, 
-                // 念のため残す(2021/10/14)が、そのうち削除
-                // 冗長なので削除(2021/10/19～)
-                // 'object.reservations': params.object.subReservation,
-                'object.subReservation': params.object.subReservation }, (typeof ((_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                ? { 'object.issuedThrough': params.object.issuedThrough }
-                : undefined), { new: true })
+            }, {
+                'object.acceptedOffer': params.object.acceptedOffer,
+                'object.issuedThrough': params.object.issuedThrough,
+                'object.reservationFor': params.object.reservationFor,
+                'object.subReservation': params.object.subReservation
+            }, { new: true })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);

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

@@ -169,6 +169,22 @@ export declare class MongoRepository {
         };
         id: string;
     }): Promise<void>;
+    deleteScreeningEventsByMovieTheaterBranchCode(params: {
+        project: {
+            id: string;
+        };
+        location: {
+            branchCode: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
+    deleteScreeningEventSeriesByMovieTheaterBranchCode(params: {
+        project: {
+            id: string;
+        };
+        location: {
+            branchCode: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/event.js

@@ -28,6 +28,7 @@ const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
 exports.PROJECTION_MINIMIZED_EVENT = {
     project: 1,
+    organizer: 1,
     _id: 1,
     typeOf: 1,
     additionalProperty: 1,
@@ -52,7 +53,19 @@ class MongoRepository {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42;
-        const andConditions = [{ typeOf: { $eq: conditions.typeOf } }];
+        const andConditions = [];
+        const typeOfEq = conditions.typeOf;
+        if (typeof typeOfEq === 'string') {
+            andConditions.push({ typeOf: { $eq: typeOfEq } });
+        }
+        const typeOfIn = conditions.typeOfIn;
+        if (Array.isArray(typeOfIn)) {
+            andConditions.push({ typeOf: { $in: typeOfIn } });
+        }
+        // typeOf条件必須検証(2023-07-13~)
+        if (typeof typeOfEq !== 'string' && !Array.isArray(typeOfIn)) {
+            throw new factory.errors.ArgumentNull('typeOf');
+        }
         const projectIdEq = (_b = (_a = conditions.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 } });
@@ -838,6 +851,26 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteScreeningEventsByMovieTheaterBranchCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                typeOf: { $eq: factory.eventType.ScreeningEvent },
+                'project.id': { $eq: params.project.id },
+                'superEvent.location.branchCode': { $exists: true, $eq: params.location.branchCode }
+            })
+                .exec();
+        });
+    }
+    deleteScreeningEventSeriesByMovieTheaterBranchCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                typeOf: { $eq: factory.eventType.ScreeningEventSeries },
+                'project.id': { $eq: params.project.id },
+                'location.branchCode': { $exists: true, $eq: params.location.branchCode }
+            })
+                .exec();
+        });
+    }
     deleteByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.eventModel.deleteMany({

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';
 /**
@@ -7,7 +31,6 @@ export declare class MongoRepository {
     private readonly memberModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): any[];
-    count(params: factory.iam.ISearchConditions): Promise<number>;
     search(params: factory.iam.ISearchConditions): Promise<factory.iam.IMember[]>;
     aggregateRoleNames(params: {
         project: {
@@ -19,13 +42,18 @@ export declare class MongoRepository {
             id: {
                 $eq: string;
             };
+            memberOf: {
+                id: {
+                    $eq: string;
+                };
+                typeOf: {
+                    $eq: factory.organizationType.Corporation | factory.organizationType.Project;
+                };
+            };
         };
     }): Promise<{
         roleName: string;
     }[]>;
-    findById(params: {
-        id: string;
-    }): Promise<factory.iam.IMember>;
     deleteByProject(params: {
         project: {
             id: string;
@@ -43,12 +71,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 +105,14 @@ export declare class MongoRepository {
         };
         member: {
             id: string;
+            memberOf: {
+                id: {
+                    $eq: string;
+                };
+                typeOf: {
+                    $eq: factory.organizationType.Corporation | factory.organizationType.Project;
+                };
+            };
         };
     }): Promise<void>;
     /**
@@ -69,10 +124,27 @@ export declare class MongoRepository {
         };
         project?: {
             id?: {
+                $eq?: string;
                 $regex?: string;
             };
         };
         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,64 +22,37 @@ 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, _p, _q, _r, _s, _t, _u, _v;
         const andConditions = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.id !== undefined && params.id !== null) {
-            if (typeof params.id.$eq === 'string') {
-                andConditions.push({
-                    _id: {
-                        $eq: params.id.$eq
-                    }
-                });
-            }
+        const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.project !== undefined && params.project !== null) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
+        const projectIdEq = (_c = (_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.member !== undefined && params.member !== null) {
-            if (params.member.typeOf !== undefined && params.member.typeOf !== null) {
-                if (typeof params.member.typeOf.$eq === 'string') {
-                    andConditions.push({
-                        'member.typeOf': {
-                            $exists: true,
-                            $eq: params.member.typeOf.$eq
-                        }
-                    });
-                }
-            }
-            if (params.member.id !== undefined && params.member.id !== null) {
-                if (typeof params.member.id.$eq === 'string') {
-                    andConditions.push({
-                        'member.id': {
-                            $eq: params.member.id.$eq
-                        }
-                    });
-                }
-            }
+        const memberMemberOfTypeOfEq = (_f = (_e = (_d = params.member) === null || _d === void 0 ? void 0 : _d.memberOf) === null || _e === void 0 ? void 0 : _e.typeOf) === null || _f === void 0 ? void 0 : _f.$eq;
+        if (typeof memberMemberOfTypeOfEq === 'string') {
+            andConditions.push({ 'member.memberOf.typeOf': { $eq: memberMemberOfTypeOfEq } });
         }
-        const memberIdIn = (_b = (_a = params.member) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$in;
+        const memberMemberOfIdEq = (_j = (_h = (_g = params.member) === null || _g === void 0 ? void 0 : _g.memberOf) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$eq;
+        if (typeof memberMemberOfIdEq === 'string') {
+            andConditions.push({ 'member.memberOf.id': { $eq: memberMemberOfIdEq } });
+        }
+        const memberTypeOfEq = (_l = (_k = params.member) === null || _k === void 0 ? void 0 : _k.typeOf) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof memberTypeOfEq === 'string') {
+            andConditions.push({ 'member.typeOf': { $exists: true, $eq: memberTypeOfEq } });
+        }
+        const memberIdEq = (_o = (_m = params.member) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof memberIdEq === 'string') {
+            andConditions.push({ 'member.id': { $eq: memberIdEq } });
+        }
+        const memberIdIn = (_q = (_p = params.member) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$in;
         if (Array.isArray(memberIdIn)) {
-            andConditions.push({
-                'member.id': {
-                    $in: memberIdIn
-                }
-            });
+            andConditions.push({ 'member.id': { $in: memberIdIn } });
         }
-        const memberNameRegex = (_d = (_c = params.member) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.$regex;
+        const memberNameRegex = (_s = (_r = params.member) === null || _r === void 0 ? void 0 : _r.name) === null || _s === void 0 ? void 0 : _s.$regex;
         if (typeof memberNameRegex === 'string' && memberNameRegex.length > 0) {
             andConditions.push({
                 'member.name': {
@@ -88,7 +61,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 = (_v = (_u = (_t = params.member) === null || _t === void 0 ? void 0 : _t.hasRole) === null || _u === void 0 ? void 0 : _u.roleName) === null || _v === void 0 ? void 0 : _v.$eq;
         if (typeof memberHasRoleRoleNameEq === 'string') {
             andConditions.push({
                 'member.hasRole.roleName': {
@@ -99,14 +72,6 @@ class MongoRepository {
         }
         return andConditions;
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            return this.memberModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
-    }
     search(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
@@ -136,7 +101,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')
@@ -159,19 +126,21 @@ class MongoRepository {
                 .exec();
         });
     }
-    findById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.memberModel.findOne({
-                _id: params.id
-            })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.memberModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
+    // public async findById2(params: {
+    //     id: string;
+    // }): Promise<factory.iam.IMember> {
+    //     const doc = await this.memberModel.findOne(
+    //         {
+    //             _id: params.id
+    //         }
+    //     )
+    //         .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.memberModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
     deleteByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.memberModel.deleteMany({
@@ -200,12 +169,6 @@ class MongoRepository {
                 // no op
             }
             return members;
-            // return this.memberModel.create({
-            //     project: params.project,
-            //     typeOf: params.typeOf,
-            //     member: params.member
-            // })
-            //     .then((doc) => doc.toObject());
         });
     }
     /**
@@ -215,7 +178,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 +188,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 +213,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) {
@@ -242,24 +227,57 @@ class MongoRepository {
      * メンバーの権限を持つプロジェクト検索
      */
     searchProjectIdsByMemberId(params) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         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.$eq) === 'string') {
+                matchStages.push({ $match: { 'project.id': { $eq: params.project.id.$eq } } });
+            }
+            if (typeof ((_d = (_c = params.project) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$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

@@ -54,9 +54,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, {
     typeOf: string;
     project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
-    organizer: any;
     _id?: string | undefined;
     name?: any;
     alternateName?: any;
@@ -88,9 +88,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
     project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
-    organizer: any;
     _id?: string | undefined;
     name?: any;
     alternateName?: any;
@@ -122,9 +122,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
     project: any;
+    organizer: any;
     checkInCount: number;
     attendeeCount: number;
-    organizer: any;
     _id?: string | undefined;
     name?: any;
     alternateName?: any;

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,11 +49,17 @@ 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({ 'project.id': 1, 'member.id': 1 }, {
-    name: 'uniqueProjectMember',
+schema.index({ 'member.id': 1 }, { name: 'searchByMemberId' });
+// uniqueIndex再設定(2023-07-25~)
+// schema.index(
+//     { 'project.id': 1, 'member.id': 1 },
+//     {
+//         name: 'uniqueProjectMember',
+//         unique: true
+//     }
+// );
+schema.index({ 'project.id': 1, 'member.id': 1, 'member.memberOf.id': 1 }, {
+    name: 'uniqueIAMMember',
     unique: true
 });
 schema.index({ 'member.typeOf': 1, 'member.id': 1 }, {
@@ -62,3 +74,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' });