Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ public class MainController {
+ "\"data\": {"
+ "\"following\": [],"
+ "\"profile\": {"
+ "\"coverImage\": \"https://example.com/bg.jpg\","
+ "\"userId\": 1,"
+ "\"coverImage\": null,"
+ "\"profileImage\": \"https://example.com/profile.jpg\","
+ "\"name\": \"홍길동\","
+ "\"intro\": \"안녕하세요! 개발 공부 중입니다.\","
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public class MainPageResponseDTO {
@NoArgsConstructor
@AllArgsConstructor
public static class ProfileDTO {
private Long userId;
private String coverImage;
private String profileImage;
private String name;
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/org/example/studylog/service/MainService.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public MainPageResponseDTO getMainPageData(User user) {

// 2. 프로필 정보 생성
MainPageResponseDTO.ProfileDTO profile = MainPageResponseDTO.ProfileDTO.builder()
.coverImage(user.getBackImage() != null ? user.getBackImage() : "https://example.com/bg.jpg")
.userId(user.getId())
.coverImage(user.getBackImage()) // null이면 null 반환
.profileImage(user.getProfileImage())
.name(user.getNickname())
.intro(user.getIntro())
Expand Down Expand Up @@ -123,6 +124,7 @@ private List<MainPageResponseDTO.CategoryCountDTO> getCategoryCountData(User use
.name(category.getName())
.count(categoryCountMap.getOrDefault(category.getId(), 0))
.build())
.sorted((a, b) -> b.getCount().compareTo(a.getCount())) // count 기준 내림차순 정렬
.toList();
}

Expand All @@ -135,7 +137,8 @@ public MainPageResponseDTO getMainPageDataWithFollowStatus(User targetUser, User
List<FriendResponseDTO> following = friendRepositoryImpl.findFriendListByUser(targetUser);

MainPageResponseDTO.ProfileDTO profile = MainPageResponseDTO.ProfileDTO.builder()
.coverImage(targetUser.getBackImage() != null ? targetUser.getBackImage() : "https://example.com/bg.jpg")
.userId(targetUser.getId())
.coverImage(targetUser.getBackImage()) // null이면 null 반환
.profileImage(targetUser.getProfileImage())
.name(targetUser.getNickname())
.intro(targetUser.getIntro())
Expand Down