Gestions des utilisateurs dans le formulaire du groupe backend et frontend, ajout d'un état disabled

Author: sonar888

backend/src/entities/GroupMember.ts

@@ -39,18 +39,7 @@ export class GroupMember extends BaseEntity {
   @Field()
   isGroupAdmin: boolean;
 
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  firstName?: string;
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  lastName?: string;
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  email?: string;
-
+  @Field(() => User)
   @ManyToOne(
     () => User,
     (user) => user.groupMember, {

backend/src/resolvers/GroupResolver.ts

@@ -65,6 +65,15 @@ class UpdateGroupInput {
 
 }
 
+@InputType()
+class RemoveMembersInput {
+  @Field(() => [Number], { nullable: true })
+  userIds?: number[];
+
+  @Field(() => [String], { nullable: true })
+  userEmails?: string[];
+}
+
 @ObjectType()
 export class MyGroupsResponse {
   @Field(() => [Group])
@@ -88,7 +97,9 @@ export default class GroupResolver {
           user: { id: ctx.user?.id },
         },
       },
-      relations: { groupMember: true, user_admin: true, user_beneficiary: true },
+      relations: { groupMember: {
+        user: true, // 👈 THIS is the key
+      }, user_admin: true, user_beneficiary: true },
       order: { id: "DESC" },
     });
 
@@ -103,7 +114,13 @@ export default class GroupResolver {
   async getGroupById(@Arg("id") id: number) {
     const group = await Group.findOne({ 
       where: { id: id },
-      relations: { user_admin: true, user_beneficiary: true, groupMember: true },
+      relations: { 
+        user_admin: true, 
+        user_beneficiary: true, 
+        groupMember: {
+          user: true,
+        },
+      },
      });
     if (!group) throw new Error("Groupe non trouvé");
     return group;
@@ -113,6 +130,7 @@ export default class GroupResolver {
   async groupMember(@Root() group: Group) {
     const groupMembers = await GroupMember.find({
       where: { groupId: group.id },
+      relations: { user: true },
     });
 
     return groupMembers || []; // >>> not null
@@ -252,12 +270,20 @@ export default class GroupResolver {
 
   @UseMiddleware(RoleMiddleware())
   @Mutation(() => String)
-  async removeMembersFromGroup(@Arg("groupId", () => Number) groupId: number,
-  @Arg("userIds", () => [Number]) userIds: number[], @Ctx() ctx: ContextType ): Promise<string> {
+  async removeMembersFromGroup(
+    @Arg("groupId", () => Number) groupId: number,
+    @Arg("data") data: RemoveMembersInput,
+    @Ctx() ctx: ContextType
+  ): Promise<string> {
     if (!ctx.user) {
       throw new Error("Utilisateur non connecté");
     }
 
+    // Ensure at least one input is provided
+    if ((!data.userIds || data.userIds.length === 0) && (!data.userEmails || data.userEmails.length === 0)) {
+      throw new Error("Vous devez fournir au moins un identifiant utilisateur ou un email");
+    }
+
     const group = await Group.findOne({
       where: {
         id: groupId
@@ -268,55 +294,69 @@ export default class GroupResolver {
     if (!group) {
       throw new Error("Groupe introuvable ou accès refusé");
     }
-    const currentUserId = ctx.user.id
-    const isAdmin = ctx.user.id === group.user_admin.id
+
+    const currentUserId = ctx.user.id;
+    const isAdmin = ctx.user.id === group.user_admin.id;
+
+    // Convert emails to user IDs if provided
+    let userIdsToRemove: number[] = [];
 
-   
-    //Admin cannot remove itself from a group
-    if (isAdmin && userIds.length > 0 && userIds.includes(group?.user_admin.id)) {
-      throw new Error ("L'administrateur du groupe ne peut pas être supprimer. Supprimer plutôt le groupe")
+    if (data.userEmails && data.userEmails.length > 0) {
+      await Promise.all(
+        data.userEmails.map(async (email) => {
+          const user = await User.findOne({ where: { email } });
+          if (user) {
+            userIdsToRemove.push(user.id);
+          }
+        })
+      );
+    }
+
+    // Add direct user IDs if provided
+    if (data.userIds && data.userIds.length > 0) {
+      userIdsToRemove.push(...data.userIds);
+    }
+
+    // Remove duplicates
+    userIdsToRemove = [...new Set(userIdsToRemove)];
+
+    if (userIdsToRemove.length === 0) {
+      throw new Error("Aucun utilisateur valide trouvé");
+    }
+
+    // Admin cannot remove itself from a group
+    if (isAdmin && userIdsToRemove.includes(group.user_admin.id)) {
+      throw new Error("L'administrateur du groupe ne peut pas être supprimé. Supprimez plutôt le groupe");
     }
 
-     //Remove myself from a group 
-    if(!isAdmin && userIds.length > 0 && userIds.every((id) => (id === currentUserId))) {
+    // Remove myself from a group
+    if (!isAdmin && userIdsToRemove.length === 1 && userIdsToRemove[0] === currentUserId) {
       try {
-        removeMembersFromGroup({
+        await removeMembersFromGroup({
           userIds: [currentUserId],
           groupId,
-        })
-
-        return "Succès! Vous ne faites plus partie du groupe!"
-
+        });
+        return "Succès! Vous ne faites plus partie du groupe!";
       } catch (err) {
-        console.error("deleteGroup error:", err);
+        console.error("removeMembersFromGroup error:", err);
         throw new Error("Une erreur est survenue, nous n'avons pas pu vous supprimer du groupe");
       }
-      
     }
-    
-    //Admin removes users from a group
-    if (isAdmin && userIds.length > 0 && !userIds.includes(group?.user_admin.id) ) {
+
+    // Admin removes users from a group
+    if (isAdmin && userIdsToRemove.length > 0 && !userIdsToRemove.includes(group.user_admin.id)) {
       try {
-        removeMembersFromGroup({
-          userIds,
+        await removeMembersFromGroup({
+          userIds: userIdsToRemove,
           groupId,
-        })
-
-        return "Succès! Les utilisateurs ont été supprimé du groupe!"
-
+        });
+        return "Succès! Les utilisateurs ont été supprimés du groupe!";
       } catch (err) {
-        console.error("deleteGroup error:", err);
+        console.error("removeMembersFromGroup error:", err);
         throw new Error("Une erreur est survenue, nous n'avons pas pu supprimer les utilisateurs du groupe");
       }
-
     }
 
-    return "Un problème est survenu"
-
-   
-
-
+    throw new Error("Vous n'avez pas les permissions nécessaires pour effectuer cette action");
   }
-  
-  
 }

backend/src/resolvers/MessageResolver.ts

@@ -97,7 +97,7 @@ export default class MessageResolver {
 
     if (!userId) throw new Error("Utilisateur non authentifié");
 
-    const group = await GroupMember.findOne({ where: { user: { id: userId }, group: { id: groupId } } });
+    const group = await GroupMember.findOne({ where: { userId: userId, groupId: groupId } });
     // verifier que l'utilisateur fait bien partie du groupe
     if (!group) throw new Error("Groupe non trouvé");
 

backend/src/services/groupMemberService.ts

@@ -47,26 +47,23 @@ export async function addMembersToGroup({ userEmails, groupId }: AddMembersInput
 }
 
 export async function removeMembersFromGroup({ userIds, groupId }: RemoveMembersInput) {
-  if (!userIds.length) return;
+  if (!userIds || userIds.length === 0) return;
 
+  // Remove all group members
   await Promise.all(
     userIds.map(async (userId) => {
-      const groupMember = await GroupMember.findOne({ where: { id: userId , groupId: groupId}})
-
-      if (!groupMember) return
-
-  try {
-    await GroupMember.remove(groupMember);
-    return "L'utilisateur a été supprimé du groupe";
-  } catch (err) {
-    console.error("removeMembersFromGroup error:", err);
-    throw new Error("Une erreur est survenue lors de la suppression de l'utilisateur du groupe");
-  }
-
-    }))
-
-  
-
+      const groupMember = await GroupMember.findOne({ 
+        where: { userId: userId, groupId: groupId }
+      });
 
+      if (!groupMember) return;
 
+      try {
+        await GroupMember.remove(groupMember);
+      } catch (err) {
+        console.error("removeMembersFromGroup error:", err);
+        throw new Error("Une erreur est survenue lors de la suppression de l'utilisateur du groupe");
+      }
+    })
+  );
 }

frontend/src/components/forms/groups/GroupForm.tsx

@@ -15,11 +15,13 @@ type GroupFormProps = {
   isEdit: boolean;
   handleChange: any;
   checked: boolean;
-  setChecked: any
+  setChecked: any;
+  isAdmin: boolean;
 };
 
 
-export default function GroupForm({ formData, errors, checked, setChecked, isEdit, handleChange }: GroupFormProps) {
+export default function GroupForm({ formData, errors, checked, setChecked, isEdit, handleChange, isAdmin }: GroupFormProps) {
+  const disabled = isEdit && !isAdmin;
 
   return (
         <>
@@ -31,6 +33,7 @@ export default function GroupForm({ formData, errors, checked, setChecked, isEdi
           </div>
           <div className="flex flex-col gap-4 px-20">
             <Input
+              disabled={disabled}
               name="name"
               type="text"
               value={formData.name}
@@ -41,6 +44,7 @@ export default function GroupForm({ formData, errors, checked, setChecked, isEdi
             />
 
             <SearchSelectInput
+              disabled={disabled}
               name="event_type"
               value={formData.event_type}
               onChange={(val) =>
@@ -56,6 +60,7 @@ export default function GroupForm({ formData, errors, checked, setChecked, isEdi
             />
 
             <Input
+              disabled={disabled}
               name="piggy_bank"
               type="number"
               value={String(formData.piggy_bank)}
@@ -66,6 +71,7 @@ export default function GroupForm({ formData, errors, checked, setChecked, isEdi
             />
 
             <InputWithToggle
+              disabled={disabled}
               checked={checked}
               onCheckedChange={() => {
                 setChecked(!checked);
@@ -79,6 +85,7 @@ export default function GroupForm({ formData, errors, checked, setChecked, isEdi
             />
 
             <Input
+              disabled={disabled}
               name="deadline"
               type="date"
               value={formData.deadline}

frontend/src/components/forms/groups/GroupFormTemplate.tsx

@@ -7,12 +7,14 @@ type GroupFormTemplateProps = {
   right?: React.ReactNode;
   isEdit: boolean;
   submitError:any;
-  errors: any
+  errors: any;
+  onSuccess: () => void;
+  isAdmin: boolean;
 };
 
-export default function GroupFormTemplate({ onSubmit, left, right, isEdit, submitError, errors }: GroupFormTemplateProps) {
+export default function GroupFormTemplate({ onSubmit, onSuccess, left, right, isEdit, submitError, errors, isAdmin }: GroupFormTemplateProps) {
   return (
-    <form className="relative flex w-full h-full rounded-2xl" onSubmit={onSubmit} autoComplete="off">
+    <form className="relative flex w-full h-full rounded-2xl" onSubmit={(e)=> {onSubmit(e); onSuccess()}} autoComplete="off">
       <div className="bg-green w-1/2 h-full flex flex-col justify-center pt-10 pb-5 rounded-tl-2xl rounded-bl-2xl">
         {left}
       </div>
@@ -21,7 +23,16 @@ export default function GroupFormTemplate({ onSubmit, left, right, isEdit, submi
         {right}
       </div>
       <div className="absolute bottom-4 left-1/2 -translate-x-1/2 flex flex-col items-center gap-2">
-        <Button colour="dark" rounded type="submit">{isEdit ? "Mettre à jour" : "Créer le groupe"}</Button>
+        {isEdit && isAdmin && (
+          <Button colour="dark" rounded type="submit">Mettre à jour</Button>
+        )}
+
+        {!isEdit && (
+          <Button colour="dark" rounded type="submit">Créer le groupe</Button>
+
+        ) }
+
+        
         {submitError && (
           <p className="text-orange font-inter text-sm pt-1 text-center">
             {submitError}