feat(api): Included default workspace details in getSelf function (#414)

.gitignore

@@ -7,7 +7,7 @@ tmp
 
 # dependencies
 node_modules
-
+package-lock.json
 # IDEs and editors
 /.idea
 .project

apps/api/src/user/service/user.service.ts

@@ -6,7 +6,7 @@ import {
   UnauthorizedException
 } from '@nestjs/common'
 import { UpdateUserDto } from '../dto/update.user/update.user'
-import { AuthProvider, User } from '@prisma/client'
+import { AuthProvider, User, Workspace } from '@prisma/client'
 import { PrismaService } from '@/prisma/prisma.service'
 import { CreateUserDto } from '../dto/create.user/create.user'
 import { IMailService, MAIL_SERVICE } from '@/mail/services/interface.service'
@@ -30,7 +30,15 @@ export class UserService {
   }
 
   async getSelf(user: User) {
-    return user
+    const defaultWorkspace: Workspace | null =
+      await this.prisma.workspace.findFirst({
+        where: {
+          ownerId: user.id,
+          isDefault: true
+        }
+      })
+
+    return { ...user, defaultWorkspace }
   }
 
   async updateSelf(user: User, dto: UpdateUserDto) {

apps/api/src/user/user.e2e.spec.ts

@@ -82,7 +82,8 @@ describe('User Controller Tests', () => {
     })
     expect(result.statusCode).toEqual(200)
     expect(JSON.parse(result.body)).toEqual({
-      ...adminUser
+      ...adminUser,
+      defaultWorkspace: null
     })
   })
 
@@ -94,9 +95,23 @@ describe('User Controller Tests', () => {
         'x-e2e-user-email': regularUser.email
       }
     })
+
+    const workspace = await prisma.workspace.findFirst({
+      where: {
+        ownerId: regularUser.id,
+        isDefault: true
+      }
+    })
+
     expect(result.statusCode).toEqual(200)
     expect(JSON.parse(result.body)).toEqual({
-      ...regularUser
+      ...regularUser,
+      defaultWorkspace: expect.any(Object)
+    })
+
+    expect(result.json().defaultWorkspace).toMatchObject({
+      id: workspace.id,
+      name: workspace.name
     })
   })