Merge pull request #103 from aelimited/feature/#102-clubResponse

[FIX] #102 - clubResponse에 club detailedIntroduction 추가
Linkup-3mw · Jun 10, 2024 · 8045a15 · 8045a15
2 parents 2922a89 + 3e08d00
commit 8045a15
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/core/linkup/club/club/converter/ClubConverter.java b/src/main/java/com/core/linkup/club/club/converter/ClubConverter.java
@@ -24,7 +24,7 @@ public ClubSearchResponse toClubResponses(Club club, Member member) {
         return ClubSearchResponse.builder()
                 .id(club.getId())
                 .title(club.getTitle())
-                .introduction(club.getIntroduction())
+                .detailIntroduction(club.getDetailedIntroduction())
                 .clubType(club.getCategory().getClubCategoryName())
                 .recruitCount(club.getRecruitCount())
                 .memberId(member.getId()) //소모임을 생성함 멤버의 아이디
@@ -39,6 +39,7 @@ public ClubSearchResponse toClubResponses(Club club, Member member, boolean like
                 .id(club.getId())
                 .title(club.getTitle())
                 .introduction(club.getIntroduction())
+                .detailIntroduction(club.getDetailedIntroduction())
                 .clubType(club.getCategory().getClubCategoryName())
                 .recruitCount(club.getRecruitCount())
                 .memberId(member.getId()) //소모임을 생성함 멤버의 아이디
@@ -79,6 +80,7 @@ public ClubSearchResponse toClubResponse(Club club, Member member, List<ClubMemb
                 .id(club.getId())
                 .title(club.getTitle())
                 .introduction(club.getIntroduction())
+                .detailIntroduction(club.getDetailedIntroduction())
                 .clubType(club.getCategory().getClubCategoryName())
                 .recruitCount(club.getRecruitCount())
                 .memberId(member.getId())

diff --git a/src/main/java/com/core/linkup/club/club/response/ClubSearchResponse.java b/src/main/java/com/core/linkup/club/club/response/ClubSearchResponse.java
@@ -13,6 +13,7 @@ public record ClubSearchResponse(
         String profileImage,
         String title,
         String introduction,
+        String detailIntroduction,
         String clubAccessibility,
         String clubThumbnail,
         String clubType,

diff --git a/src/main/java/com/core/linkup/club/clubnotice/converter/ClubBoardConverter.java b/src/main/java/com/core/linkup/club/clubnotice/converter/ClubBoardConverter.java
@@ -31,7 +31,6 @@ public ClubBoardResponse toClubBoardResponse(ClubNotice clubNotice, MemberDetail
                 .title(clubNotice.getTitle())
                 .content(clubNotice.getContent())
                 .type(clubNotice.getType())
-                .noticeId(clubNotice.getId())
                 .clubMemberId(member.getId())
                 .clubMemberName(member.getName())
                 .clubMemberThumbnail(member.getProfileImage())
@@ -49,7 +48,6 @@ public ClubBoardResponse toClubBoardResponse(
                 .title(clubNotice.getTitle())
                 .content(clubNotice.getContent())
                 .type(clubNotice.getType())
-                .noticeId(clubNotice.getId())
                 .clubMemberId(member.getId())
                 .clubMemberName(member.getName())
                 .clubMemberThumbnail(member.getProfileImage())

diff --git a/src/main/java/com/core/linkup/club/clubnotice/response/ClubBoardResponse.java b/src/main/java/com/core/linkup/club/clubnotice/response/ClubBoardResponse.java
@@ -10,7 +10,6 @@
 @Builder
 public record ClubBoardResponse (
         Long id,
-        Long noticeId,
         String title,
         String content,
         NotificationType type,