Merge pull request #739 from sparrowapp-dev/development

feat: admin app release

Author: Astitva877

src/modules/identity/repositories/user.repository.ts

@@ -66,13 +66,14 @@ export class UserRepository {
         { _id },
         { projection: { password: 0, verificationCode: 0, refresh_tokens: 0 } },
       );
+
     const userObj: DecodedUserObject = {
-      _id: data._id,
-      email: data.email,
-      name: data.name,
+      _id: data?._id,
+      email: data?.email,
+      name: data?.name,
       role: "",
-      teams: data.teams,
-      workspaces: data.workspaces,
+      teams: data?.teams,
+      workspaces: data?.workspaces,
       emailVerificationCodeTimeStamp: data?.emailVerificationCodeTimeStamp,
       lastActive: data?.lastActive,
     };

src/modules/user-admin/services/user-admin.enterprise-user.service.ts

@@ -104,7 +104,10 @@ export class AdminUsersService {
         users: team.users,
       };
     });
-    return { teams: updatedFilteredTeams, users: newestUniqueUsers };
+    return {
+      teams: updatedFilteredTeams,
+      users: newestUniqueUsers.filter((user) => !!user.email),
+    };
   }
   async getUserDetails(
     ownerId: string,

src/modules/user-admin/services/user-admin.hubs.service.ts

@@ -39,6 +39,7 @@ export class AdminHubsService {
         role: matchedUser?.role,
         users: team.users,
         workspaces: team.workspaces,
+        plan: team?.plan?.name
       };
     });
   }

src/modules/user-admin/services/user-admin.workspace.service.ts

@@ -346,6 +346,7 @@ export class AdminWorkspaceService {
       )?.name,
       WorkspaceType: workspace?.workspaceType,
       hubName: hub?.name,
+      plan: hub?.plan?.name,
       nonWorkspaceHubMembers,
     };
     return workspace_summary;

src/modules/workspace/services/ai-assistant.service.ts

@@ -602,7 +602,7 @@ export class AiAssistantService {
       console.error("OpenAI error:", error);
       Sentry.withScope((scope) => {
           scope.setTag("emailId", emailId);
-          scope.setExtra("emailId", emailId);
+          scope.setTag("errorType", "AI");
           Sentry.captureException(error.message);
         });
       client.send(
@@ -651,7 +651,7 @@ export class AiAssistantService {
     if (!this.deepseekClient) {
       Sentry.withScope((scope) => {
           scope.setTag("emailId", emailId);
-          scope.setExtra("emailId", emailId);
+          scope.setTag("errorType", "AI");
           Sentry.captureException("DeepSeek Initialization Failed.");
         });
       throw new InternalServerErrorException(
@@ -674,7 +674,7 @@ export class AiAssistantService {
         console.warn("Failed to parse conversation:", error);
         Sentry.withScope((scope) => {
           scope.setTag("emailId", emailId);
-          scope.setExtra("emailId", emailId);
+          scope.setTag("errorType", "AI");
           Sentry.captureException(error);
         });
       }
@@ -765,7 +765,7 @@ export class AiAssistantService {
               console.warn("Kafka logging failed", e);
               Sentry.withScope((scope) => {
                   scope.setTag("emailId", emailId);
-                  scope.setExtra("emailId", emailId);
+                  scope.setTag("errorType", "AI");
                   Sentry.captureException(e);
                 });
               }
@@ -786,7 +786,7 @@ export class AiAssistantService {
               console.warn("Kafka logging failed", e);
               Sentry.withScope((scope) => {
                   scope.setTag("emailId", emailId);
-                  scope.setExtra("emailId", emailId);
+                  scope.setTag("errorType", "AI");
                   Sentry.captureException(e);
                 });
               }
@@ -799,7 +799,7 @@ export class AiAssistantService {
           console.error("Invalid JSON in event data:", event.data, e);
           Sentry.withScope((scope) => {
             scope.setTag("emailId", emailId);
-            scope.setExtra("emailId", emailId);
+            scope.setTag("errorType", "AI");
             Sentry.captureException(e);
           });
         }
@@ -808,7 +808,7 @@ export class AiAssistantService {
       console.error("DeepSeek error:", error);
       Sentry.withScope((scope) => {
           scope.setTag("emailId", emailId);
-          scope.setExtra("emailId", emailId);
+          scope.setTag("errorType", "AI");
           Sentry.captureException(error);
       });
       client.send(
@@ -1119,7 +1119,7 @@ export class AiAssistantService {
         const endTime = performance.now();
         Sentry.withScope((scope) => {
           scope.setTag("emailId", emailId);
-          scope.setExtra("emailId", emailId);
+          scope.setTag("errorType", "AI");
           Sentry.captureException(error.message);
         });
         const timeTaken = Math.round(endTime - startTime);
@@ -1349,7 +1349,7 @@ export class AiAssistantService {
         const endTime = performance.now();
         Sentry.withScope((scope) => {
           scope.setTag("emailId", emailId);
-          scope.setExtra("emailId", emailId);
+          scope.setTag("errorType", "AI");
           Sentry.captureException(error.message);
         });
         const timeTaken = Math.round(endTime - startTime);
@@ -1540,7 +1540,7 @@ export class AiAssistantService {
         const endTime = performance.now();
         Sentry.withScope((scope) => {
           scope.setTag("emailId", emailId);
-          scope.setExtra("emailId", emailId);
+          scope.setTag("errorType", "AI");
           Sentry.captureException(error.message);
         });
         const timeTaken = Math.round(endTime - startTime);
@@ -1787,7 +1787,7 @@ export class AiAssistantService {
         const endTime = performance.now();
         Sentry.withScope((scope) => {
           scope.setTag("emailId", emailId);
-          scope.setExtra("emailId", emailId);
+          scope.setTag("errorType", "AI");
           Sentry.captureException(error.message);
         });
         const timeTaken = Math.round(endTime - startTime);
@@ -1830,7 +1830,7 @@ export class AiAssistantService {
         } catch (err) {
           Sentry.withScope((scope) => {
             scope.setTag("emailId", parsedData.emailId);
-            scope.setExtra("emailId", parsedData.emailId);
+            scope.setTag("errorType", "AI");
             Sentry.captureException(err);
           });
           client.send(
@@ -2042,7 +2042,8 @@ export class AiAssistantService {
       }
     } catch (error) {
       console.error("Error in WebSocket loop:", error);
-        Sentry.withScope((scope) => {
+      Sentry.withScope((scope) => {
+        scope.setTag("errorType", "AI");
         Sentry.captureException(error);
       });
       if (client.readyState === WebSocket.OPEN) {
@@ -2143,7 +2144,7 @@ export class AiAssistantService {
       console.error("Error processing prompt generation:", error);
       Sentry.withScope((scope) => {
         scope.setTag("emailId", data.emailId);
-        scope.setExtra("emailId", data.emailId);
+        scope.setTag("errorType", "AI");
         Sentry.captureException(error);
       });
       throw new BadRequestException(