From a21a05ccafb688e355c50ef749719917e40bfd6a Mon Sep 17 00:00:00 2001
From: changha <mentenseoul@gmail.com>
Date: Sat, 25 Nov 2023 22:52:34 +0900
Subject: [PATCH] =?UTF-8?q?feat=20:=20=EB=82=B4=20=EB=8F=99=EC=95=84?=
 =?UTF-8?q?=EB=A6=AC=20=EC=A0=95=EB=B3=B4=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../back/controller/MemberController.java     |  6 +++++
 .../java/com/donggram/back/entity/Club.java   |  2 +-
 .../donggram/back/service/MemberService.java  | 25 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/donggram/back/controller/MemberController.java b/src/main/java/com/donggram/back/controller/MemberController.java
index 44ddbbd..14c1556 100644
--- a/src/main/java/com/donggram/back/controller/MemberController.java
+++ b/src/main/java/com/donggram/back/controller/MemberController.java
@@ -51,5 +51,11 @@ public ResponseEntity<?> updateProfile(@RequestHeader("Access_Token") String tok
         return ResponseEntity.ok(memberDetails);
     }
 
+    @GetMapping("/member/clubs")
+    public ResponseEntity getClubList(@RequestHeader("Access_Token") String token){
+        ResponseDto clubList = memberService.getClubList(token);
+        return ResponseEntity.ok(clubList);
+    }
+
 
 }
diff --git a/src/main/java/com/donggram/back/entity/Club.java b/src/main/java/com/donggram/back/entity/Club.java
index fdf179e..431d304 100644
--- a/src/main/java/com/donggram/back/entity/Club.java
+++ b/src/main/java/com/donggram/back/entity/Club.java
@@ -45,7 +45,7 @@ public class Club {
     private String recruitment_period;
 
     @OneToOne(fetch = FetchType.LAZY, orphanRemoval = true)
-    @JoinColumn(name = "imageClub_id")
+    @JoinColumn(name = "image_club_id")
     private ImageClub imageClub;
 
     @OneToOne(fetch = FetchType.LAZY, orphanRemoval = true)
diff --git a/src/main/java/com/donggram/back/service/MemberService.java b/src/main/java/com/donggram/back/service/MemberService.java
index d9a32f2..f752079 100644
--- a/src/main/java/com/donggram/back/service/MemberService.java
+++ b/src/main/java/com/donggram/back/service/MemberService.java
@@ -157,6 +157,31 @@ public ResponseDto getMemberDetails(String token){
         }
     }
 
+    @Transactional
+    public ResponseDto getClubList(String token){
+        Member member = memberRepository.findByStudentId(jwtTokenProvider.getUserPk(token)).get();
+
+        List<ClubDto> clubListDtos = new ArrayList<>();
+
+        for (ClubJoin clubJoin : member.getClubJoinList()){
+            Club club = clubJoin.getClub();
+
+            clubListDtos.add(ClubDto.builder()
+                    .clubId(club.getId())
+                    .clubName(club.getClubName())
+                    .college(club.getCollege().getName())
+                    .division(club.getDivision().getName())
+                    .isRecruitment(club.isRecruitment())
+                    .build());
+        }
+
+        return ResponseDto.builder()
+                .status(200)
+                .responseMessage("내 동아리 정보 API")
+                .data(clubListDtos)
+                .build();
+    }
+
     @Transactional
     public ResponseDto updateDetails(String token, MultipartFile multipartFile) {
         Member member = memberRepository.findByStudentId(jwtTokenProvider.getUserPk(token)).get();