Merge pull request #80 from codegasms/shubh-groups-integration

Fix groups crud integration

Author: aahnik

app/[orgId]/groups/page.tsx

@@ -61,6 +61,7 @@ const fields: Field[] = [
   { name: "users", label: "Users (one email per line)", type: "textarea" },
 ];
 
+
 export default function GroupsPage() {
   const params = useParams();
   const orgId = params.orgId as string;
@@ -132,39 +133,56 @@ export default function GroupsPage() {
 
   const saveGroup = async (group: Group) => {
     try {
+      // Create a copy of the group object to avoid mutating the original
+      const groupToSave = { ...group };
+      
+      // Convert users from string to array of strings (splitting at newlines)
+      if (typeof groupToSave.users === 'string') {
+        groupToSave.users = groupToSave.users
+          .split('\n')
+          .map(user => user.trim())
+          .filter(user => user.length > 0); // Remove empty lines
+      }
+      
+      console.log("groups", groupToSave);
+      
       const url = selectedGroup
         ? `/api/orgs/${orgId}/groups/${group.nameId}`
         : `/api/orgs/${orgId}/groups`;
-
+      
       const response = await fetch(url, {
         method: selectedGroup ? "PATCH" : "POST",
         headers: {
           "Content-Type": "application/json",
         },
-        body: JSON.stringify(group),
+        body: JSON.stringify(groupToSave),
       });
-
+  
       if (!response.ok) {
         const errorData = await response.json().catch(() => ({}));
         throw new Error(formatValidationErrors(errorData));
       }
-
+  
       const savedGroup = await response.json();
-
+      // console.log('saved groups',savedGroup);
+      
+  
       if (selectedGroup) {
         setGroups(groups.map((g) => (g.id === savedGroup.id ? savedGroup : g)));
         toast({
           title: "Success",
           description: "Group updated successfully",
         });
       } else {
+        console.log("savedgroups",savedGroup);
+        
         setGroups([...groups, savedGroup]);
         toast({
           title: "Success",
           description: "Group created successfully",
         });
       }
-
+  
       setIsEditorOpen(false);
     } catch (error) {
       console.error("Error saving group:", error);

app/[orgId]/submissions/page.tsx

@@ -30,6 +30,8 @@ export default function SubmissionsPage({
   const fetchSubmissions = useCallback(async () => {
     try {
       const response = await fetch(`/api/orgs/${params.orgId}/submissions`);
+      console.log('submission',response);
+      
       if (!response.ok) {
         const errorData = await response.json().catch(() => ({}));
         throw new Error(formatValidationErrors(errorData));

app/api/orgs/[orgId]/groups/[groupId]/service.ts

@@ -46,6 +46,8 @@ export async function updateGroupMembers(
       .where(and(eq(groups.id, groupId), eq(groups.orgId, orgId)))
       .limit(1);
 
+      console.log("group selected",group);
+      
     if (group.length === 0) {
       throw new Error("Group not found");
     }
@@ -56,8 +58,11 @@ export async function updateGroupMembers(
       .from(users)
       .where(inArray(users.email, emails));
 
+      console.log("users to keep",users_to_keep);
+      
     const user_ids_to_keep = users_to_keep.map((u) => u.id);
 
+    console.log("users ids to keep",user_ids_to_keep);
     // Remove members not in the new list
     await tx
       .delete(groupMemberships)

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

@@ -25,9 +25,29 @@ export async function POST(
   { params }: { params: { orgId: string } },
 ) {
   try {
+    // console.log("request",await request.json());
+   
+    
     const orgId = await getOrgIdFromNameId(NameIdSchema.parse(params.orgId));
-    const { emails, ...rest } = createGroupSchema.parse(await request.json());
-
+    const requestData = await request.json();
+    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);
+    
+    // Now validate with your schema
+    const { emails, ...rest } = createGroupSchema.parse(processedData);
+    
+    console.log("emails", emails);
+    console.log("rest", rest);
+    
+    
     const group = await groupsService.createGroup(orgId, rest);
 
     if (emails) {

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

@@ -19,8 +19,12 @@ export async function GET(
 
     // Get numeric orgId
     const orgId = await getOrgIdFromNameId(orgNameId);
-
+    console.log("orgid=",orgId);
+    
     const submissions = await submissionService.getOrgSubmissions(orgId);
+    console.log('sub',submissions);
+    
+    
     return NextResponse.json(submissions);
   } catch (error) {
     if (error instanceof z.ZodError) {