feat: return all project owners (including groups and system)

Unleash · Oct 1, 2024 · 95f5635 · 95f5635
1 parent b14bbf5
commit 95f5635
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/lib/features/personal-dashboard/personal-dashboard-service.ts b/src/lib/features/personal-dashboard/personal-dashboard-service.ts
@@ -115,7 +115,7 @@ export class PersonalDashboardService {
         }));
 
         const owners =
-            await this.projectOwnersReadModel.getUserProjectOwners(projectId);
+            await this.projectOwnersReadModel.getProjectOwners(projectId);
 
         return {
             latestEvents: formattedEvents,

diff --git a/src/lib/features/project/fake-project-owners-read-model.ts b/src/lib/features/project/fake-project-owners-read-model.ts
@@ -1,5 +1,6 @@
 import type {
     IProjectOwnersReadModel,
+    ProjectOwners,
     UserProjectOwner,
     WithProjectOwners,
 } from './project-owners-read-model.type';
@@ -18,7 +19,7 @@ export class FakeProjectOwnersReadModel implements IProjectOwnersReadModel {
         return [];
     }
 
-    async getUserProjectOwners(projectId: string): Promise<UserProjectOwner[]> {
+    async getUserProjectOwners(projectId: string): Promise<ProjectOwners> {
         return [];
     }
 }
diff --git a/src/lib/features/project/project-owners-read-model.ts b/src/lib/features/project/project-owners-read-model.ts
@@ -4,6 +4,7 @@ import { generateImageUrl } from '../../util';
 import type {
     GroupProjectOwner,
     IProjectOwnersReadModel,
+    ProjectOwners,
     ProjectOwnersDictionary,
     UserProjectOwner,
     WithProjectOwners,
@@ -158,11 +159,8 @@ export class ProjectOwnersReadModel implements IProjectOwnersReadModel {
         return ProjectOwnersReadModel.addOwnerData(projects, owners);
     }
 
-    async getUserProjectOwners(projectId: string): Promise<UserProjectOwner[]> {
-        const ownerRole = await this.db(T.ROLES)
-            .where({ name: RoleName.OWNER })
-            .first();
-        const usersDict = await this.getAllProjectUsersByRole(ownerRole.id);
-        return usersDict[projectId] ?? [];
+    async getProjectOwners(projectId: string): Promise<ProjectOwners> {
+        const owners = await this.getProjectOwnersDictionary();
+        return owners[projectId] ?? [];
     }
 }
diff --git a/src/lib/features/project/project-owners-read-model.type.ts b/src/lib/features/project/project-owners-read-model.type.ts
@@ -30,7 +30,7 @@ export interface IProjectOwnersReadModel {
         projects: T[],
     ): Promise<WithProjectOwners<T>>;
 
-    getUserProjectOwners(projectId: string): Promise<UserProjectOwner[]>;
+    getProjectOwners(projectId: string): Promise<ProjectOwners>;
 
     getAllUserProjectOwners(
         projects?: Set<string>,