Unify: send fields email to backend for both POST and PATCH of groups

Author: aahnik

app/[orgId]/groups/mockData.ts

@@ -6,6 +6,7 @@ export interface Group {
   about?: string;
   avatar?: string;
   users: string; // user emails seperated by newline
+  userEmails: string[];
   usersCount?: number;
 }
 
@@ -19,6 +20,11 @@ export const mockGroups: Group[] = [
     avatar: "https://api.dicebear.com/7.x/initials/svg?seed=ET",
     users:
       "[email protected]\[email protected]\[email protected]",
+    userEmails: [
+      "[email protected]",
+      "[email protected]",
+      "[email protected]",
+    ],
   },
   {
     id: 2,
@@ -28,6 +34,7 @@ export const mockGroups: Group[] = [
     about: "Product design and UX team",
     avatar: "https://api.dicebear.com/7.x/initials/svg?seed=DT",
     users: "[email protected]\[email protected]",
+    userEmails: ["[email protected]", "[email protected]"],
   },
   {
     id: 3,
@@ -38,6 +45,11 @@ export const mockGroups: Group[] = [
     avatar: "https://api.dicebear.com/7.x/initials/svg?seed=MT",
     users:
       "[email protected]\[email protected]\[email protected]",
+    userEmails: [
+      "[email protected]",
+      "[email protected]",
+      "[email protected]",
+    ],
   },
   {
     id: 4,
@@ -47,5 +59,6 @@ export const mockGroups: Group[] = [
     about: "Product management and strategy",
     avatar: "https://api.dicebear.com/7.x/initials/svg?seed=PT",
     users: "[email protected]\[email protected]",
+    userEmails: ["[email protected]", "[email protected]"],
   },
 ];

app/[orgId]/groups/page.tsx

@@ -140,10 +140,12 @@ export default function GroupsPage() {
 
       // Convert users from string to array of strings (splitting at newlines)
       if (typeof groupToSave.users === "string") {
-        groupToSave.users = groupToSave.users
+        groupToSave.emails = groupToSave.users
           .split("\n")
           .map((user) => user.trim())
           .filter((user) => user.length > 0); // Remove empty lines
+        // groupToSave.users = null;
+        console.log("groupToSave.users", groupToSave.users);
       }
 
       console.log("groups", groupToSave);

app/api/orgs/[orgId]/groups/route.ts

@@ -32,23 +32,25 @@ export async function POST(
     console.log("request data", requestData);
 
     // Rename 'users' to 'emails' in the request data
-    const { users, ...restRequestData } = requestData;
-    const processedData = {
-      ...restRequestData,
-      emails: users, // Rename 'users' to 'emails'
-    };
-    console.log("emails", processedData.emails);
-    console.log("emails", restRequestData);
+    // const { users, ...restRequestData } = requestData;
+    // console.log("*****users", users);
+    // const processedData = {
+    //   ...restRequestData,
+    //   emails: users, // Rename 'users' to 'emails'
+    // };
+    // console.log("emails", processedData.emails);
+    // console.log("restRequestData", restRequestData);
 
     // Now validate with your schema
-    const { emails, ...rest } = createGroupSchema.parse(processedData);
+    const { emails, ...rest } = createGroupSchema.parse(requestData);
 
-    console.log("emails", emails);
-    console.log("rest", rest);
+    console.log("emails after validation parsed", emails);
+    console.log("rest after validation parsed", rest);
 
     const group = await groupsService.createGroup(orgId, rest);
 
     if (emails) {
+      console.log("BAK BAK emails", emails);
       const groupWithUserEmails = await groupService.updateGroupMembers(
         orgId,
         group.id,