diff --git a/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedListService.java b/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedListService.java index 58df6fd..c868992 100644 --- a/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedListService.java +++ b/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedListService.java @@ -5,9 +5,9 @@ import com.investment.findfriend.domain.friend.domain.Friend; import com.investment.findfriend.domain.friend.exception.FriendNotFoundException; import com.investment.findfriend.domain.friend.repository.FriendRepository; +import com.investment.findfriend.global.properties.ServerProperties; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -17,8 +17,7 @@ @RequiredArgsConstructor public class GetFeedListService { - @Value("${SERVER.URL}") - private String serverURL; + private final ServerProperties serverProperties; private final FeedRepository feedRepository; private final FriendRepository friendRepository; @@ -30,7 +29,7 @@ public ResponseEntity> execute(Long friendId) { return ResponseEntity.ok(feedRepository.findAllByFriend(friend).stream() .map(feed -> FeedListResponse.builder() .id(feed.getId()) - .url(serverURL + "/image?feedId=" + feed.getId()) + .url(serverProperties.getPath() + "/file?fileId=" + feed.getFile().getId()) .build()).toList()); } } diff --git a/src/main/java/com/investment/findfriend/domain/friend/presentation/dto/response/FriendResponse.java b/src/main/java/com/investment/findfriend/domain/friend/presentation/dto/response/FriendResponse.java index 1c3b433..83a9f82 100644 --- a/src/main/java/com/investment/findfriend/domain/friend/presentation/dto/response/FriendResponse.java +++ b/src/main/java/com/investment/findfriend/domain/friend/presentation/dto/response/FriendResponse.java @@ -11,5 +11,5 @@ public class FriendResponse { private String name; private String statusMessage; private Authority authority; - private String path; + private String url; } diff --git a/src/main/java/com/investment/findfriend/domain/friend/service/GetFriendListService.java b/src/main/java/com/investment/findfriend/domain/friend/service/GetFriendListService.java index 7ed7d6c..f3d9751 100644 --- a/src/main/java/com/investment/findfriend/domain/friend/service/GetFriendListService.java +++ b/src/main/java/com/investment/findfriend/domain/friend/service/GetFriendListService.java @@ -8,6 +8,7 @@ import com.investment.findfriend.domain.user.domain.User; import com.investment.findfriend.domain.user.repository.UserRepository; import com.investment.findfriend.global.jwt.util.JwtUtil; +import com.investment.findfriend.global.properties.ServerProperties; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; @@ -22,6 +23,7 @@ public class GetFriendListService { private final FriendRepository friendRepository; private final UserRepository userRepository; private final JwtUtil jwtUtil; + private final ServerProperties serverProperties; public ResponseEntity> execute(HttpServletRequest httpServletRequest) { User user = userRepository.findByEmail(jwtUtil.extractEmail(httpServletRequest)).orElseThrow( @@ -40,7 +42,7 @@ public ResponseEntity> execute(HttpServletRequest httpServl .authority(friend.getAuthority()) .statusMessage(friend.getStatusMessage()) .name(friend.getName()) - .path(friend.getFile().getPath()) + .url(serverProperties.getPath() + "/file?fileId=" + friend.getFile().getId()) .build()) .toList()); } diff --git a/src/main/java/com/investment/findfriend/domain/user/service/GetUserInfoService.java b/src/main/java/com/investment/findfriend/domain/user/service/GetUserInfoService.java index 8747d6e..0f8aee4 100644 --- a/src/main/java/com/investment/findfriend/domain/user/service/GetUserInfoService.java +++ b/src/main/java/com/investment/findfriend/domain/user/service/GetUserInfoService.java @@ -6,6 +6,7 @@ import com.investment.findfriend.domain.user.presentation.dto.response.UserResponse; import com.investment.findfriend.domain.user.repository.UserRepository; import com.investment.findfriend.global.jwt.util.JwtUtil; +import com.investment.findfriend.global.properties.ServerProperties; import jakarta.servlet.http.HttpServletRequest; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; @@ -18,6 +19,7 @@ public class GetUserInfoService { private final UserRepository userRepository; private final JwtUtil jwtUtil; + private final ServerProperties serverProperties; @Transactional public ResponseEntity execute(HttpServletRequest httpServletRequest) { @@ -33,7 +35,7 @@ public ResponseEntity execute(HttpServletRequest httpServletReques .name(friend.getName()) .statusMessage(friend.getStatusMessage()) .authority(friend.getAuthority()) - .path(user.getFile().getPath()) + .url(serverProperties.getPath() + "/file?fileId=" + user.getFile().getId()) .build()) .toList()) .build()); diff --git a/src/main/java/com/investment/findfriend/global/properties/ServerProperties.java b/src/main/java/com/investment/findfriend/global/properties/ServerProperties.java new file mode 100644 index 0000000..96bd212 --- /dev/null +++ b/src/main/java/com/investment/findfriend/global/properties/ServerProperties.java @@ -0,0 +1,12 @@ +package com.investment.findfriend.global.properties; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter +@ConfigurationProperties(prefix = "root") +@AllArgsConstructor +public class ServerProperties { + private String path; +}