Fixed members handling

backend/services/memberService.js

@@ -17,16 +17,22 @@ class MemberService {
             where: {
                 clubId: clubId,
                 approved: false,
-                userId: user.id
+                userId: user.id 
             }
-        });
+        }); 
     }
 
-    getClubMembers(userToken, clubId) {
+    getClubMembers(userToken, clubId, showAll) {
         console.log('[getClubMembers] - Check access');
         checkAccess(userToken, clubId);
         console.log('[getClubMembers] - Find members');
-        return Member.findAll({ where: { clubId: clubId } })
+        const where = {
+            clubId: clubId
+        };
+        if (!showAll) {
+            where.active = true;
+        }
+        return Member.findAll({ where })
             .then(members => {
                 return members.map(member => {
                     const imagePath = path.join('images', 'members', `${member.id}.jpg`);
@@ -66,7 +72,7 @@ class MemberService {
                 member.birthDate = birthdate;
                 member.phone = phone;
                 member.email = email;
-                member.active = active;  // Active status setzen
+                member.active = active; 
                 await member.save();
             } else {
                 await Member.create({
@@ -78,15 +84,13 @@ class MemberService {
                     phone: phone,
                     email: email,
                     clubId: clubId,
-                    active: active  // Active status setzen
+                    active: active 
                 });
             }
-            console.log('[setClubMembers] - load club members');
-            const members = await this.getClubMembers(userToken, clubId);
             console.log('[setClubMembers] - return response');
             return {
                 status: 200,
-                response: members,
+                response: { result: "success" },
             }
         } catch (error) {
             console.log(error);