Merge pull request #116 from FixLog/develop

Develop

Author: semsemin

src/main/java/com/example/FixLog/dto/follow/response/FollowerListResponseDto.java

@@ -14,4 +14,5 @@ public class FollowerListResponseDto {
     private Long followerId;
 
     private String nickname;
+    private String profileImage;
 }

src/main/java/com/example/FixLog/dto/follow/response/FollowingListResponseDto.java

@@ -14,4 +14,5 @@ public class FollowingListResponseDto {
     private Long followingId;
 
     private String nickname;
+    private String profileImage;
 }

src/main/java/com/example/FixLog/service/FollowService.java

@@ -22,6 +22,12 @@ public class FollowService {
     private final FollowRepository followRepository;
     private final MemberRepository memberRepository;
 
+    public String getDefaultProfile(String image) {
+        return (image == null || image.isBlank())
+                ? "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png"
+                : image;
+    }
+
     // 팔로우하기
     @Transactional
     public FollowResponseDto follow(String requesterEmail, Long targetMemberId){
@@ -78,7 +84,8 @@ public List<FollowerListResponseDto> getMyFollowers(String requesterEmail) {
                 .map(follow -> new FollowerListResponseDto(
                         follow.getFollowId(),
                         follow.getFollowerId().getUserId(),
-                        follow.getFollowerId().getNickname()
+                        follow.getFollowerId().getNickname(),
+                        getDefaultProfile(follow.getFollowerId().getProfileImageUrl())
                 ))
                 .toList();
     }
@@ -95,7 +102,8 @@ public List<FollowingListResponseDto> getMyFollowings(String requesterEmail) {
                 .map(follow -> new FollowingListResponseDto(
                         follow.getFollowId(),
                         follow.getFollowingId().getUserId(),
-                        follow.getFollowingId().getNickname()
+                        follow.getFollowingId().getNickname(),
+                        getDefaultProfile(follow.getFollowingId().getProfileImageUrl())
                 ))
                 .toList();
     }

src/main/resources/application.properties

@@ -28,7 +28,7 @@ spring.application.name=FixLog
 ## Spring Security
 #logging.level.org.springframework.security=DEBUG
 
-##### [PROD] #####
+###### [PROD] #####
 server.port=8083
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver