@chevre/domain 22.11.0-alpha.11 → 22.11.0-alpha.13

package/example/src/chevre/roles/{assignRoles.ts → assignGlobalRoles.ts}

@@ -2,10 +2,10 @@
 import type { CognitoIdentityProvider as CognitoIdentityServiceProvider } from '@aws-sdk/client-cognito-identity-provider';
 import * as mongoose from 'mongoose';
 
+import { IGlobalMember } from '../../../../lib/chevre/repo/mongoose/schemas/member/global';
 import { chevre } from '../../../../lib/index';
 
 const { PROJECT_CREATOR_SUB } = process.env;
-const project = { id: '*' };
 
 let cognitoIdentityServiceProvider: CognitoIdentityServiceProvider | undefined;
 
@@ -23,7 +23,7 @@ async function main() {
         throw new chevre.factory.errors.NotFound('setting.userPoolIdNew');
     }
 
-    let member: chevre.factory.iam.IMemberOfRole;
+    let globalMember: IGlobalMember;
 
     if (cognitoIdentityServiceProvider === undefined) {
         const { CognitoIdentityProvider } = await import('@aws-sdk/client-cognito-identity-provider');
@@ -43,25 +43,26 @@ async function main() {
         ? `${profile.givenName} ${profile.familyName}`
         : profile.memberOf?.membershipNumber;
 
-    member = {
-        typeOf: chevre.factory.personType.Person,
-        id: profile.id,
-        memberOf: { id: project.id, typeOf: chevre.factory.organizationType.Project },
-        name: memberName,
-        username: profile.memberOf?.membershipNumber,
-        hasRole: [{
-            typeOf: chevre.factory.role.RoleType.OrganizationRole,
-            roleName: <any>'projectCreator'
-        }]
+    globalMember = {
+        typeOf: chevre.factory.role.RoleType.OrganizationRole,
+        member: {
+            typeOf: chevre.factory.personType.Person,
+            id: profile.id,
+            name: memberName,
+            username: profile.memberOf?.membershipNumber,
+            hasRole: [{
+                typeOf: chevre.factory.role.RoleType.OrganizationRole,
+                roleName: <any>'projectCreator'
+            }]
+        }
     };
-    console.log(profile, member);
+    console.log(profile, globalMember);
+
+    const existingGlobalMemberRoles = await memberRepo.findGlobalRoleNamesByMember({ member: { id: { $eq: globalMember.member.id } } });
+    console.log('existingGlobalMemberRoles:', existingGlobalMemberRoles);
 
     // 権限作成
-    await memberRepo.create([{
-        project: { typeOf: chevre.factory.organizationType.Project, id: project.id },
-        typeOf: chevre.factory.role.RoleType.OrganizationRole,
-        member: member
-    }]);
+    await memberRepo.createGlobalMember([globalMember]);
 }
 
 main()

package/example/src/chevre/roles/findPermissions.ts

@@ -0,0 +1,84 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const formatter = new Intl.NumberFormat('ja-JP');
+
+const PROJECT_ID = String(process.env.PROJECT_ID);
+const memberId = 'b3640a78-babd-4da4-81d3-7dcf4881a4a5';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    let startTime: [number, number] = process.hrtime();
+    let diff: [number, number] = process.hrtime(startTime);
+    let result: any;
+
+    startTime = process.hrtime();
+    result = await (await chevre.service.iam.createService()).findProjectPermissionsByMember({
+        project: { id: PROJECT_ID },
+        member: {
+            id: memberId,
+            memberOf: {
+                id: PROJECT_ID,
+                typeOf: chevre.factory.organizationType.Project
+            }
+        }
+    })({
+        member: memberRepo,
+        role: roleRepo
+    });
+    diff = process.hrtime(startTime);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    console.log(result.roleNames.length, 'roleNames found');
+    console.log(result.permissions.length, 'permissions found');
+
+    startTime = process.hrtime();
+    result = await (await chevre.service.iam.createService()).findProjectPermissionsByMember({
+        project: { id: PROJECT_ID },
+        member: {
+            id: memberId,
+            memberOf: {
+                id: PROJECT_ID,
+                typeOf: chevre.factory.organizationType.Project
+            }
+        }
+    })({
+        member: memberRepo,
+        role: roleRepo
+    });
+    diff = process.hrtime(startTime);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    console.log(result.roleNames.length, 'roleNames found');
+    console.log(result.permissions.length, 'permissions found');
+
+    startTime = process.hrtime();
+    result = await (await chevre.service.iam.createService()).findProjectPermissionsByMember({
+        project: { id: PROJECT_ID },
+        member: {
+            id: memberId,
+            memberOf: {
+                id: PROJECT_ID,
+                typeOf: chevre.factory.organizationType.Project
+            }
+        }
+    })({
+        member: memberRepo,
+        role: roleRepo
+    });
+    diff = process.hrtime(startTime);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    console.log(result.roleNames.length, 'roleNames found');
+    console.log(result.permissions.length, 'permissions found');
+
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/roles/findRoleNames.ts

@@ -0,0 +1,117 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const formatter = new Intl.NumberFormat('ja-JP');
+
+const PROJECT_ID = String(process.env.PROJECT_ID);
+const memberId = 'xxx';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
+
+    let startTime: [number, number] = process.hrtime();
+    let diff: [number, number] = process.hrtime(startTime);
+    let result: any;
+
+    // startTime = process.hrtime();
+    // result = await memberRepo.aggregateRoleNames({
+    //     project: { id: { $eq: PROJECT_ID } },
+    //     member: {
+    //         id: { $eq: memberId },
+    //         memberOf: {
+    //             id: { $eq: PROJECT_ID },
+    //             typeOf: { $eq: chevre.factory.organizationType.Project }
+    //         }
+    //     }
+    // });
+    // diff = process.hrtime(startTime);
+    // console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    // console.log(result.length, 'result found');
+
+    // startTime = process.hrtime();
+    // result = await memberRepo.aggregateRoleNames({
+    //     project: { id: { $eq: PROJECT_ID } },
+    //     member: {
+    //         id: { $eq: memberId },
+    //         memberOf: {
+    //             id: { $eq: PROJECT_ID },
+    //             typeOf: { $eq: chevre.factory.organizationType.Project }
+    //         }
+    //     }
+    // });
+    // diff = process.hrtime(startTime);
+    // console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    // console.log(result.length, 'result found');
+
+    // startTime = process.hrtime();
+    // result = await memberRepo.aggregateRoleNames({
+    //     project: { id: { $eq: PROJECT_ID } },
+    //     member: {
+    //         id: { $eq: memberId },
+    //         memberOf: {
+    //             id: { $eq: PROJECT_ID },
+    //             typeOf: { $eq: chevre.factory.organizationType.Project }
+    //         }
+    //     }
+    // });
+    // diff = process.hrtime(startTime);
+    // console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    // console.log(result.length, 'result found');
+    // console.log(result);
+
+    startTime = process.hrtime();
+    result = await memberRepo.findRoleNamesByMember({
+        project: { id: { $eq: PROJECT_ID } },
+        member: {
+            id: { $eq: memberId },
+            memberOf: {
+                id: { $eq: PROJECT_ID },
+                typeOf: { $eq: chevre.factory.organizationType.Project }
+            }
+        }
+    });
+    diff = process.hrtime(startTime);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    console.log(result.length, 'result found');
+
+    startTime = process.hrtime();
+    result = await memberRepo.findRoleNamesByMember({
+        project: { id: { $eq: PROJECT_ID } },
+        member: {
+            id: { $eq: memberId },
+            memberOf: {
+                id: { $eq: PROJECT_ID },
+                typeOf: { $eq: chevre.factory.organizationType.Project }
+            }
+        }
+    });
+    diff = process.hrtime(startTime);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    console.log(result.length, 'result found');
+
+    startTime = process.hrtime();
+    result = await memberRepo.findRoleNamesByMember({
+        project: { id: { $eq: PROJECT_ID } },
+        member: {
+            id: { $eq: memberId },
+            memberOf: {
+                id: { $eq: PROJECT_ID },
+                typeOf: { $eq: chevre.factory.organizationType.Project }
+            }
+        }
+    });
+    diff = process.hrtime(startTime);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    console.log(result.length, 'result found');
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/regex.ts

@@ -0,0 +1,31 @@
+// tslint:disable:no-console
+const projectIdMustBe = /^[0-9a-z-]+$/; // 記号はhyphenのみ許可
+
+let projectId: string;
+
+projectId = 'projectId';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = 'projectid';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = 'abcd1234-test';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = 'a-z';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = '0-9';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = '---';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = '-';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = '&';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = 'A';
+console.log(projectId, ':', projectIdMustBe.test(projectId));

package/lib/chevre/eventEmitter/task.d.ts

@@ -13,25 +13,34 @@ interface IExecuteSettings {
     redisClient?: RedisClientType;
 }
 type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
-type INextFunction = (task: Pick<factory.task.ITask<factory.taskName>, 'id'>) => IOperationExecute<void>;
+type INextFunction = (task: Pick<factory.task.ITask<factory.taskName>, 'id' | 'remainingNumberOfTries'>) => IOperationExecute<void>;
 interface IReadyTask {
     id: string;
     name?: factory.taskName;
     status: factory.taskStatus.Ready;
+    remainingNumberOfTries?: never;
     expires?: Date;
     executionResult?: never;
 }
 interface IRunningTask {
     id: string;
     status: factory.taskStatus.Running;
+    remainingNumberOfTries?: never;
     name?: never;
     expires?: never;
     executionResult?: never;
 }
+/**
+ * 実行されたタスクイベント
+ */
 interface IExecutedTask {
     id: string;
     status: factory.taskStatus;
     executionResult: factory.task.IExecutionResult;
+    /**
+     * 実行されたタスクの残り試行回数
+     */
+    remainingNumberOfTries: number;
     name?: never;
     expires?: never;
 }

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

@@ -1,11 +1,13 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+import { IGlobalMember } from './mongoose/schemas/member/global';
 type IKeyOfProjection = keyof factory.iam.IMember;
 export type ICustomerMember = Pick<factory.iam.IMemberOfRole, 'hasRole' | 'id' | 'name' | 'memberOf'>;
 /**
  * IAMメンバーリポジトリ
  */
 export declare class MemberRepo {
+    private readonly globalMemberModel;
     private readonly memberModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): FilterQuery<factory.iam.IMember>[];
@@ -37,7 +39,10 @@ export declare class MemberRepo {
     }): Promise<{
         member: ICustomerMember;
     }[]>;
-    aggregateRoleNames(params: {
+    /**
+     * distinctコマンドを使用して、プロジェクトメンバーのロールを検索する
+     */
+    findRoleNamesByMember(params: {
         project: {
             id: {
                 $eq: string;
@@ -56,9 +61,7 @@ export declare class MemberRepo {
                 };
             };
         };
-    }): Promise<{
-        roleName: string;
-    }[]>;
+    }): Promise<string[]>;
     deleteByProject(params: {
         project: {
             id: string;
@@ -125,7 +128,6 @@ export declare class MemberRepo {
     }): Promise<import("mongodb").DeleteResult>;
     /**
      * メンバーの権限を持つプロジェクト検索
-     * ANY_PROJECT_IDは除外
      */
     searchProjectIdsByMemberId(params: {
         member: {
@@ -164,6 +166,21 @@ export declare class MemberRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * グローバルメンバー作成
+     * 2025-07-21~
+     */
+    createGlobalMember(params: IGlobalMember[]): Promise<void>;
+    /**
+     * distinctコマンドを使用して、グローバルメンバーのロールを検索する
+     */
+    findGlobalRoleNamesByMember(params: {
+        member: {
+            id: {
+                $eq: string;
+            };
+        };
+    }): Promise<string[]>;
     private projectFields;
 }
 export {};

package/lib/chevre/repo/member.js

@@ -13,6 +13,7 @@ exports.MemberRepo = void 0;
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const member_1 = require("./mongoose/schemas/member");
+const global_1 = require("./mongoose/schemas/member/global");
 const AVAILABLE_PROJECT_FIELDS = [
     'project',
     'typeOf',
@@ -24,6 +25,7 @@ const ANY_PROJECT_ID = '*';
  */
 class MemberRepo {
     constructor(connection) {
+        this.globalMemberModel = connection.model(global_1.modelName, (0, global_1.createSchema)());
         this.memberModel = connection.model(member_1.modelName, (0, member_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
@@ -164,32 +166,55 @@ class MemberRepo {
                 .exec();
         });
     }
-    aggregateRoleNames(params) {
+    // migrate to findRoleNamesByMember(2025-07-21~)
+    // public async aggregateRoleNames(params: {
+    //     project: { id: { $eq: string } };
+    //     member: {
+    //         id: { $eq: string };
+    //         memberOf: {
+    //             id: { $eq: string };
+    //             typeOf: { $eq: factory.organizationType.Corporation | factory.organizationType.Project };
+    //         };
+    //     };
+    // }): Promise<{ roleName: string }[]> {
+    //     const matchStages: IMatchStage[] = [
+    //         { $match: { 'project.id': { $eq: params.project.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')
+    //         //     ? [{ $sort: { productID: params.sort.productID } }]
+    //         //     : [],
+    //         ...matchStages,
+    //         {
+    //             $unwind: {
+    //                 path: '$member.hasRole'
+    //             }
+    //         },
+    //         {
+    //             $project: {
+    //                 _id: 0,
+    //                 roleName: '$member.hasRole.roleName'
+    //             }
+    //         }
+    //     ]);
+    //     return aggregate.option({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec();
+    // }
+    /**
+     * distinctコマンドを使用して、プロジェクトメンバーのロールを検索する
+     */
+    findRoleNamesByMember(params) {
         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.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')
-                //     ? [{ $sort: { productID: params.sort.productID } }]
-                //     : [],
-                ...matchStages,
-                {
-                    $unwind: {
-                        path: '$member.hasRole'
-                    }
-                },
-                {
-                    $project: {
-                        _id: 0,
-                        roleName: '$member.hasRole.roleName'
-                    }
-                }
-            ]);
-            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            return this.memberModel.distinct('member.hasRole.roleName', {
+                'project.id': { $eq: params.project.id.$eq },
+                'member.id': { $eq: params.member.id.$eq },
+                'member.memberOf.id': { $eq: params.member.memberOf.id.$eq },
+                'member.memberOf.typeOf': { $eq: params.member.memberOf.typeOf.$eq }
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -284,7 +309,6 @@ class MemberRepo {
     }
     /**
      * メンバーの権限を持つプロジェクト検索
-     * ANY_PROJECT_IDは除外
      */
     searchProjectIdsByMemberId(params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -296,8 +320,7 @@ class MemberRepo {
                 throw new factory.errors.ArgumentNull('page');
             }
             const matchStages = [
-                { $match: { 'member.id': { $eq: params.member.id } } },
-                { $match: { 'project.id': { $ne: ANY_PROJECT_ID } } }
+                { $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 } } });
@@ -348,6 +371,32 @@ class MemberRepo {
                 .exec();
         });
     }
+    /**
+     * グローバルメンバー作成
+     * 2025-07-21~
+     */
+    createGlobalMember(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.length > 0) {
+                yield this.globalMemberModel.insertMany(params.map(({ typeOf, member }) => ({ typeOf, member })));
+            }
+            else {
+                // no op
+            }
+        });
+    }
+    /**
+     * distinctコマンドを使用して、グローバルメンバーのロールを検索する
+     */
+    findGlobalRoleNamesByMember(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.globalMemberModel.distinct('member.hasRole.roleName', {
+                'member.id': { $eq: params.member.id.$eq }
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     projectFields(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MemberRepo.CREATE_MONGO_CONDITIONS(params);

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

@@ -0,0 +1,14 @@
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../../factory';
+type IMemberOfRole = Pick<factory.iam.IMemberOfRole, 'hasRole' | 'id' | 'image' | 'name' | 'typeOf' | 'username'>;
+type IGlobalMember = Pick<factory.iam.IMember, 'typeOf'> & {
+    member: IMemberOfRole;
+};
+type IDocType = IGlobalMember;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+declare const modelName = "Member.Global";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
+export { createSchema, IGlobalMember, IModel, indexes, modelName };

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

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelName = exports.indexes = void 0;
+exports.createSchema = createSchema;
+const mongoose_1 = require("mongoose");
+const writeConcern_1 = require("../../writeConcern");
+const settings_1 = require("../../../../settings");
+const modelName = 'Member.Global';
+exports.modelName = modelName;
+const schemaDefinition = {
+    // globalロール管理なのでprojectは不要
+    // project: {
+    //     type: SchemaTypes.Mixed,
+    //     required: true
+    // },
+    typeOf: {
+        type: String,
+        required: true
+    },
+    member: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    }
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'members.global',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: false,
+    versionKey: false,
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { 'member.id': 1 },
+        {
+            name: 'uniqueIAMMember',
+            unique: true
+        }
+    ],
+    [
+        { 'member.hasRole.roleName': 1, 'member.id': 1 },
+        {
+            name: 'searchByMemberHasRoleRoleName',
+            partialFilterExpression: {
+                'member.hasRole.roleName': { $exists: true }
+            }
+        }
+    ]
+];
+exports.indexes = indexes;
+/**
+ * グロバールIAMメンバースキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}

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

@@ -11,13 +11,14 @@ export declare class RoleRepo {
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.role.organizationRole.ISearchConditions): FilterQuery<IDocType>[];
     projectFields(params: factory.role.organizationRole.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IRole[]>;
-    aggregatePermissions(params: {
+    /**
+     * distinctコマンドを使用して、ロールから権限を検索する
+     */
+    findUniquePermissionsByRoleName(params: {
         roleName: {
             $in: string[];
         };
-    }): Promise<{
-        _id: string;
-    }[]>;
+    }): Promise<string[]>;
     addPermissionIfNotExists(params: {
         roleName: {
             $eq: factory.role.organizationRole.RoleName;