feat: do some impl

Unleash · Sep 25, 2024 · d5cb78a · d5cb78a
1 parent c8ea16e
commit d5cb78a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 16 deletions.
diff --git a/src/lib/features/personal-dashboard/personal-dashboard-controller.e2e.test.ts b/src/lib/features/personal-dashboard/personal-dashboard-controller.e2e.test.ts
@@ -110,6 +110,7 @@ test('should return personal dashboard with membered projects', async () => {
                         type: 'root',
                     },
                 ],
+                owners: [],
             },
             {
                 name: projectA.name,
@@ -121,6 +122,7 @@ test('should return personal dashboard with membered projects', async () => {
                         type: 'project',
                     },
                 ],
+                owners: [],
             },
             {
                 name: projectC.name,
@@ -132,6 +134,7 @@ test('should return personal dashboard with membered projects', async () => {
                         type: 'project',
                     },
                 ],
+                owners: [],
             },
         ],
     });
@@ -181,6 +184,7 @@ test('should return projects where users are part of a group', async () => {
                         type: 'root',
                     },
                 ],
+                owners: [],
             },
             {
                 name: projectA.name,
@@ -197,6 +201,7 @@ test('should return projects where users are part of a group', async () => {
                         type: 'project',
                     },
                 ],
+                owners: [],
             },
         ],
     });

diff --git a/src/lib/features/personal-dashboard/personal-dashboard-read-model.ts b/src/lib/features/personal-dashboard/personal-dashboard-read-model.ts
@@ -1,4 +1,5 @@
 import type { Db } from '../../db/db';
+import type { IProjectOwnersReadModel } from '../project/project-owners-read-model.type';
 import type {
     IPersonalDashboardReadModel,
     PersonalFeature,
@@ -14,8 +15,11 @@ type IntermediateProjectResult = Omit<PersonalProject, 'roles'> & {
 export class PersonalDashboardReadModel implements IPersonalDashboardReadModel {
     private db: Db;
 
-    constructor(db: Db) {
+    private projectOwnersReadModel: IProjectOwnersReadModel;
+
+    constructor(db: Db, ProjectOwnersReadModel: IProjectOwnersReadModel) {
         this.db = db;
+        this.projectOwnersReadModel = ProjectOwnersReadModel;
     }
 
     async getPersonalProjects(userId: number): Promise<PersonalProject[]> {
@@ -80,14 +84,18 @@ export class PersonalDashboardReadModel implements IPersonalDashboardReadModel {
             (project: IntermediateProjectResult) => {
                 const roles = Object.values(project.roles);
                 roles.sort((a, b) => a.id - b.id);
+
                 return {
                     ...project,
                     roles,
                 } as PersonalProject;
             },
         );
         projectList.sort((a, b) => a.name.localeCompare(b.name));
-        return projectList;
+        const withOwners =
+            await this.projectOwnersReadModel.addOwners(projectList);
+
+        return withOwners;
     }
 
     async getPersonalFeatures(userId: number): Promise<PersonalFeature[]> {

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,13 +1,12 @@
 import type {
     IProjectOwnersReadModel,
-    IProjectForUiWithOwners,
+    WithProjectOwners,
 } from './project-owners-read-model.type';
-import type { ProjectForUi } from './project-read-model-type';
 
 export class FakeProjectOwnersReadModel implements IProjectOwnersReadModel {
-    async addOwners(
-        projects: ProjectForUi[],
-    ): Promise<IProjectForUiWithOwners[]> {
+    async addOwners<T extends { id: string }>(
+        projects: T[],
+    ): Promise<WithProjectOwners<T>> {
         return projects.map((project) => ({
             ...project,
             owners: [{ ownerType: 'system' }],

diff --git a/src/lib/features/project/project-owners-read-model.ts b/src/lib/features/project/project-owners-read-model.ts
@@ -6,7 +6,7 @@ import type {
     IProjectOwnersReadModel,
     ProjectOwnersDictionary,
     UserProjectOwner,
-    ProjectOwners,
+    WithProjectOwners,
 } from './project-owners-read-model.type';
 
 const T = {
@@ -16,10 +16,6 @@ const T = {
     USERS: 'users',
 };
 
-type WithProjectOwners<T extends { id: string }> = (T & {
-    owners: ProjectOwners;
-})[];
-
 export class ProjectOwnersReadModel implements IProjectOwnersReadModel {
     private db: Db;
 

diff --git a/src/lib/features/project/project-owners-read-model.type.ts b/src/lib/features/project/project-owners-read-model.type.ts
@@ -21,9 +21,13 @@ export type IProjectForUiWithOwners = ProjectForUi & {
     owners: ProjectOwners;
 };
 
+export type WithProjectOwners<T extends { id: string }> = (T & {
+    owners: ProjectOwners;
+})[];
+
 export interface IProjectOwnersReadModel {
-    addOwners(
-        projects: ProjectForUi[],
+    addOwners<T extends { id: string }>(
+        projects: T[],
         anonymizeProjectOwners?: boolean,
-    ): Promise<IProjectForUiWithOwners[]>;
+    ): Promise<WithProjectOwners<T>>;
 }
diff --git a/src/lib/openapi/spec/personal-dashboard-schema.ts b/src/lib/openapi/spec/personal-dashboard-schema.ts
@@ -1,4 +1,5 @@
 import type { FromSchema } from 'json-schema-to-ts';
+import { projectSchema } from './project-schema';
 
 export const personalDashboardSchema = {
     $id: '#/components/schemas/personalDashboardSchema',
@@ -24,6 +25,7 @@ export const personalDashboardSchema = {
                         example: 'My Project',
                         description: 'The name of the project',
                     },
+                    owners: projectSchema.properties.owners,
                     roles: {
                         type: 'array',
                         description:

diff --git a/src/lib/services/index.ts b/src/lib/services/index.ts
@@ -149,6 +149,7 @@ import { OnboardingService } from '../features/onboarding/onboarding-service';
 import { PersonalDashboardService } from '../features/personal-dashboard/personal-dashboard-service';
 import { PersonalDashboardReadModel } from '../features/personal-dashboard/personal-dashboard-read-model';
 import { FakePersonalDashboardReadModel } from '../features/personal-dashboard/fake-personal-dashboard-read-model';
+import { ProjectOwnersReadModel } from '../features/project/project-owners-read-model';
 
 export const createServices = (
     stores: IUnleashStores,
@@ -406,7 +407,7 @@ export const createServices = (
 
     const personalDashboardService = new PersonalDashboardService(
         db
-            ? new PersonalDashboardReadModel(db)
+            ? new PersonalDashboardReadModel(db, new ProjectOwnersReadModel(db))
             : new FakePersonalDashboardReadModel(),
     );