From 449efd7434b345d815942ef4ce7b7b89d3011657 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Mon, 11 Dec 2023 15:58:33 +0000
Subject: [PATCH] fix: workspace and base user cache

---
 packages/nocodb/src/models/BaseUser.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/nocodb/src/models/BaseUser.ts b/packages/nocodb/src/models/BaseUser.ts
index d8bcce7843..e7256ae4b0 100644
--- a/packages/nocodb/src/models/BaseUser.ts
+++ b/packages/nocodb/src/models/BaseUser.ts
@@ -1,6 +1,6 @@
 import { ProjectRoles } from 'nocodb-sdk';
 import type { BaseType } from 'nocodb-sdk';
-import type User from '~/models/User';
+import User from '~/models/User';
 import Base from '~/models/Base';
 import {
   CacheDelDirection,
@@ -45,7 +45,7 @@ export default class BaseUser {
       true,
     );
 
-    const res = this.get(base_id, fk_user_id, ncMeta);
+    const res = await this.get(base_id, fk_user_id, ncMeta);
 
     await NocoCache.appendToList(
       CacheScope.BASE_USER,
@@ -72,10 +72,14 @@ export default class BaseUser {
         fk_user_id: userId,
         base_id: baseId,
       });
-      await NocoCache.set(
-        `${CacheScope.BASE_USER}:${baseId}:${userId}`,
-        baseUser,
-      );
+      if (baseUser) {
+        const user = await User.get(userId, ncMeta);
+        baseUser = { ...user, ...baseUser };
+        await NocoCache.set(
+          `${CacheScope.BASE_USER}:${baseId}:${userId}`,
+          baseUser,
+        );
+      }
     }
     return this.castType(baseUser);
   }