refactor: move getProjectsByUser to read model (#8262)

Unleash · Sep 26, 2024 · 823f633 · 823f633
1 parent aca0de4
commit 823f633
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 65 deletions.
diff --git a/src/lib/features/project/fake-project-read-model.ts b/src/lib/features/project/fake-project-read-model.ts
@@ -14,4 +14,7 @@ export class FakeProjectReadModel implements IProjectReadModel {
     getProjectsForInsights(): Promise<ProjectForInsights[]> {
         return Promise.resolve([]);
     }
+    getProjectsByUser(): Promise<string[]> {
+        return Promise.resolve([]);
+    }
 }
diff --git a/src/lib/features/project/project-read-model-type.ts b/src/lib/features/project/project-read-model-type.ts
@@ -37,4 +37,5 @@ export interface IProjectReadModel {
     getFeatureProject(
         featureName: string,
     ): Promise<{ project: string; createdAt: Date } | null>;
+    getProjectsByUser(userId: number): Promise<string[]>;
 }
diff --git a/src/lib/features/project/project-read-model.ts b/src/lib/features/project/project-read-model.ts
@@ -249,4 +249,36 @@ export class ProjectReadModel implements IProjectReadModel {
         memberTimer();
         return members;
     }
+
+    async getProjectsByUser(userId: number): Promise<string[]> {
+        const projects = await this.db
+            .from((db) => {
+                db.select('role_user.project')
+                    .from('role_user')
+                    .leftJoin('roles', 'role_user.role_id', 'roles.id')
+                    .leftJoin('projects', 'role_user.project', 'projects.id')
+                    .where('user_id', userId)
+                    .andWhere('projects.archived_at', null)
+                    .union((queryBuilder) => {
+                        queryBuilder
+                            .select('group_role.project')
+                            .from('group_role')
+                            .leftJoin(
+                                'group_user',
+                                'group_user.group_id',
+                                'group_role.group_id',
+                            )
+                            .leftJoin(
+                                'projects',
+                                'group_role.project',
+                                'projects.id',
+                            )
+                            .where('group_user.user_id', userId)
+                            .andWhere('projects.archived_at', null);
+                    })
+                    .as('query');
+            })
+            .pluck('project');
+        return projects;
+    }
 }
diff --git a/src/lib/features/project/project-service.ts b/src/lib/features/project/project-service.ts
@@ -1344,7 +1344,7 @@ export default class ProjectService {
     }
 
     async getProjectsByUser(userId: number): Promise<string[]> {
-        return this.projectStore.getProjectsByUser(userId);
+        return this.projectReadModel.getProjectsByUser(userId);
     }
 
     async getProjectRoleUsage(roleId: number): Promise<IProjectRoleUsage[]> {

diff --git a/src/lib/features/project/project-store-type.ts b/src/lib/features/project/project-store-type.ts
@@ -96,8 +96,6 @@ export interface IProjectStore extends Store<IProject, string> {
         date: string,
     ): Promise<number>;
 
-    getProjectsByUser(userId: number): Promise<string[]>;
-
     count(): Promise<number>;
 
     getAll(query?: IProjectQuery): Promise<IProject[]>;

diff --git a/src/lib/features/project/project-store.ts b/src/lib/features/project/project-store.ts
@@ -390,63 +390,6 @@ class ProjectStore implements IProjectStore {
         return rows.map(this.mapProjectEnvironmentRow);
     }
 
-    private async getMembersCount(): Promise<IProjectMembersCount[]> {
-        const members = await this.db
-            .select('project')
-            .from((db) => {
-                db.select('user_id', 'project')
-                    .from('role_user')
-                    .leftJoin('roles', 'role_user.role_id', 'roles.id')
-                    .where((builder) => builder.whereNot('type', 'root'))
-                    .union((queryBuilder) => {
-                        queryBuilder
-                            .select('user_id', 'project')
-                            .from('group_role')
-                            .leftJoin(
-                                'group_user',
-                                'group_user.group_id',
-                                'group_role.group_id',
-                            );
-                    })
-                    .as('query');
-            })
-            .groupBy('project')
-            .count('user_id');
-        return members;
-    }
-
-    async getProjectsByUser(userId: number): Promise<string[]> {
-        const projects = await this.db
-            .from((db) => {
-                db.select('role_user.project')
-                    .from('role_user')
-                    .leftJoin('roles', 'role_user.role_id', 'roles.id')
-                    .leftJoin('projects', 'role_user.project', 'projects.id')
-                    .where('user_id', userId)
-                    .andWhere('projects.archived_at', null)
-                    .union((queryBuilder) => {
-                        queryBuilder
-                            .select('group_role.project')
-                            .from('group_role')
-                            .leftJoin(
-                                'group_user',
-                                'group_user.group_id',
-                                'group_role.group_id',
-                            )
-                            .leftJoin(
-                                'projects',
-                                'group_role.project',
-                                'projects.id',
-                            )
-                            .where('group_user.user_id', userId)
-                            .andWhere('projects.archived_at', null);
-                    })
-                    .as('query');
-            })
-            .pluck('project');
-        return projects;
-    }
-
     async getMembersCountByProject(projectId: string): Promise<number> {
         const members = await this.db
             .from((db) => {

diff --git a/src/test/fixtures/fake-project-store.ts b/src/test/fixtures/fake-project-store.ts
@@ -143,11 +143,6 @@ export default class FakeProjectStore implements IProjectStore {
         )!.health = healthUpdate.health;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    getProjectsByUser(userId: number): Promise<string[]> {
-        return Promise.resolve([]);
-    }
-
     addEnvironmentToProjects(
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         environment: string,