Chore: Duplicate certain user fields to workspaceMember (#1514)

* Move certain user fields to workspaceMember

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Merge main

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Refactor according to review

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Refactor according to review

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Refactor according to review

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Update the generated GraphQL

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Update hooks

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Refactor according to review

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Refactor according to review

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Refactor according to review

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Refactor according to review

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Refactor according to review

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>

* Rework typing

* Fix tests

* Remove console logs

---------

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: chiazokam <chiazokamecheta@gmail.com>
Co-authored-by: Charles Bochet <charles@twenty.com>

server/src/core/auth/services/auth.service.ts

@@ -89,11 +89,6 @@ export class AuthService {
             email: signUpInput.email,
             passwordHash,
             locale: 'en',
-            settings: {
-              create: {
-                locale: 'en',
-              },
-            },
           },
         } as Prisma.UserCreateArgs,
         workspace.id,
@@ -105,11 +100,6 @@ export class AuthService {
         email: signUpInput.email,
         passwordHash,
         locale: 'en',
-        settings: {
-          create: {
-            locale: 'en',
-          },
-        },
       },
     } as Prisma.UserCreateArgs);
   }

server/src/core/user/user.service.ts

@@ -67,6 +67,12 @@ export class UserService {
 
     assert(workspace, 'workspace is missing', BadRequestException);
 
+    const userSettings = await this.prismaService.client.userSettings.create({
+      data: { locale: 'en' },
+    });
+
+    const settings = { connect: { id: userSettings.id } };
+
     // Create user
     const user = await this.prismaService.client.user.upsert({
       where: {
@@ -74,12 +80,14 @@ export class UserService {
       },
       create: {
         ...(args.data as Prisma.UserCreateInput),
+        settings,
 
         workspaceMember: {
           create: {
             workspace: {
               connect: { id: workspace.id },
             },
+            settings,
           },
         },
         locale: 'en',

server/src/core/workspace/resolvers/workspace-member.resolver.ts

@@ -2,6 +2,7 @@ import { Args, Query, Resolver, Mutation } from '@nestjs/graphql';
 import { UseGuards } from '@nestjs/common';
 
 import { accessibleBy } from '@casl/prisma';
+import { Prisma } from '@prisma/client';
 
 import { WorkspaceMember } from 'src/core/@generated/workspace-member/workspace-member.model';
 import { AbilityGuard } from 'src/guards/ability.guard';
@@ -9,6 +10,7 @@ import { CheckAbilities } from 'src/decorators/check-abilities.decorator';
 import {
   DeleteWorkspaceMemberAbilityHandler,
   ReadWorkspaceMemberAbilityHandler,
+  UpdateWorkspaceMemberAbilityHandler,
 } from 'src/ability/handlers/workspace-member.ability-handler';
 import { FindManyWorkspaceMemberArgs } from 'src/core/@generated/workspace-member/find-many-workspace-member.args';
 import { UserAbility } from 'src/decorators/user-ability.decorator';
@@ -22,6 +24,7 @@ import { DeleteOneWorkspaceMemberArgs } from 'src/core/@generated/workspace-memb
 import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
 import { AuthUser } from 'src/decorators/auth-user.decorator';
 import { User } from 'src/core/@generated/user/user.model';
+import { UpdateOneWorkspaceMemberArgs } from 'src/core/@generated/workspace-member/update-one-workspace-member.args';
 
 @UseGuards(JwtAuthGuard)
 @Resolver(() => WorkspaceMember)
@@ -81,4 +84,19 @@ export class WorkspaceMemberResolver {
       select: prismaSelect.value,
     });
   }
+
+  @Mutation(() => WorkspaceMember)
+  @UseGuards(AbilityGuard)
+  @CheckAbilities(UpdateWorkspaceMemberAbilityHandler)
+  async UpdateOneWorkspaceMember(
+    @Args() args: UpdateOneWorkspaceMemberArgs,
+    @PrismaSelector({ modelName: 'WorkspaceMember' })
+    prismaSelect: PrismaSelect<'WorkspaceMember'>,
+  ): Promise<Partial<WorkspaceMember>> {
+    return this.workspaceMemberService.update({
+      data: args.data,
+      where: args.where,
+      select: prismaSelect.value,
+    } as Prisma.WorkspaceMemberUpdateArgs);
+  }
 }