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>
2023-09-16 01:32:58 +01:00
parent 0a7a0ac6cb
commit 549335054a
23 changed files with 890 additions and 115 deletions
--- a/server/src/core/user/user.service.ts
+++ b/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',