Merge pull request #115 from FixLog/feat/#114-follow-profile-image

[FEAT] 팔로워/팔로잉 목록 프로필 이미지 추가

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

@@ -29,26 +29,26 @@ spring.application.name=FixLog
 #logging.level.org.springframework.security=DEBUG
 
 ###### [PROD] #####
-#server.port=8083
-#
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.url=${MYSQL_URL}
-#spring.datasource.username=${MYSQL_USERNAME}
-#spring.datasource.password=${MYSQL_PASSWORD}
-#
-#spring.jpa.hibernate.ddl-auto=update
-#spring.jpa.show-sql=true
-#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-#spring.jpa.properties.hibernate.format_sql=true
-#
-#cloud.aws.credentials.access-key=${AWS_ACCESS_KEY_ID}
-#cloud.aws.credentials.secret-key=${AWS_SECRET_ACCESS_KEY}
-#cloud.aws.region.static=${AWS_REGION}
-#cloud.aws.s3.bucket=${AWS_S3_BUCKET}
-#
-#jwt.secret=${JWT_KEY}
-#
-#logging.level.root=INFO
-#logging.level.com.example.FixLog=DEBUG
-#logging.level.org.springframework.web.servlet.DispatcherServlet=DEBUG
-#logging.file.name=logs/app.log
+server.port=8083
+
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=${MYSQL_URL}
+spring.datasource.username=${MYSQL_USERNAME}
+spring.datasource.password=${MYSQL_PASSWORD}
+
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
+spring.jpa.properties.hibernate.format_sql=true
+
+cloud.aws.credentials.access-key=${AWS_ACCESS_KEY_ID}
+cloud.aws.credentials.secret-key=${AWS_SECRET_ACCESS_KEY}
+cloud.aws.region.static=${AWS_REGION}
+cloud.aws.s3.bucket=${AWS_S3_BUCKET}
+
+jwt.secret=${JWT_KEY}
+
+logging.level.root=INFO
+logging.level.com.example.FixLog=DEBUG
+logging.level.org.springframework.web.servlet.DispatcherServlet=DEBUG
+logging.file.name=logs/app.log