Show img in diary too

backend/controllers/memberController.js

@@ -53,7 +53,6 @@ const getMemberImage = async (req, res) => {
     try {
         const { clubId, memberId } = req.params;
         const { authcode: userToken } = req.headers;
-        console.log('-------------------->', clubId, memberId, userToken);
         const result = await MemberService.getMemberImage(userToken, clubId, memberId);
         if (result.status === 200) {
             res.sendFile(result.imagePath);

backend/server.js

@@ -33,7 +33,7 @@ app.use(express.json());
 
 app.use('/api/auth', authRoutes);
 app.use('/api/clubs', clubRoutes);
-app.use('/api/clubmembers', memberRoutes);
+app.use('/api/clubmembers', memberRoutes); 
 app.use('/api/diary', diaryRoutes);
 app.use('/api/participants', participantRoutes);
 app.use('/api/activities', activityRoutes);

backend/services/memberService.js

@@ -17,18 +17,34 @@ class MemberService {
             where: {
                 clubId: clubId,
                 approved: false,
-                userId: user.id 
+                userId: user.id
             }
         });
     }
 
-    async getClubMembers(userToken, clubId) {
+    getClubMembers(userToken, clubId) {
         console.log('[getClubMembers] - Check access');
-        await checkAccess(userToken, clubId);
+        checkAccess(userToken, clubId);
         console.log('[getClubMembers] - Find members');
-        const members = await Member.findAll({ where: { clubId: clubId }});
-        console.log('[getClubMembers] - return members');
-        return members;
+        return Member.findAll({ where: { clubId: clubId } })
+            .then(members => {
+                return members.map(member => {
+                    const imagePath = path.join('images', 'members', `${member.id}.jpg`);
+                    const hasImage = fs.existsSync(imagePath);
+                    return {
+                        ...member.toJSON(),
+                        hasImage: hasImage
+                    };
+                });
+            })
+            .then(membersWithImageStatus => {
+                console.log('[getClubMembers] - return members');
+                return membersWithImageStatus;
+            })
+            .catch(error => {
+                console.error('[getClubMembers] - Error:', error);
+                throw error;
+            });
     }
 
     async setClubMember(userToken, clubId, memberId, firstName, lastName, street, city, birthdate, phone, email, active = true) {