[RELEASE] dev > release 배포 (#142)

* fix: 오탈자 수정

* fix: scheduler 시간 변경

* chore : server-private 수정

* fix : 옷차림 요약 정보 조회 API 실행 시 500 에러 해결

* chore : server-private 최신 업데이트 반영

* fix: 즐겨찾기 목록조회 버그와 기본위치변경 에러 수정 (#139)

* fix: 중기예보조회 500에러 해결 (#141)

---------

Co-authored-by: jwpark <woojang812@gmail.com>
Co-authored-by: jlhyunii <jhpark4692@naver.com>
Co-authored-by: jlhyunii <147504146+jlhyunii@users.noreply.github.com>

Author: 3 people

src/main/java/com/weady/weady/domain/fashion/service/FashionService.java

@@ -9,6 +9,7 @@
 import com.weady.weady.domain.location.entity.Location;
 import com.weady.weady.domain.location.repository.LocationRepository;
 import com.weady.weady.domain.user.entity.User;
+import com.weady.weady.domain.user.repository.UserFavoriteLocationRepository;
 import com.weady.weady.domain.user.repository.UserRepository;
 import com.weady.weady.domain.weather.entity.DailySummary;
 import com.weady.weady.domain.weather.entity.LocationWeatherSnapshot;
@@ -21,6 +22,7 @@
 import com.weady.weady.common.util.SecurityUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -38,6 +40,7 @@ public class FashionService {
     private final UserRepository userRepository;
     private final LocationRepository locationRepository;
     private final DailySummaryRepository dailySummaryRepository;
+    private final UserFavoriteLocationRepository userFavoriteLocationRepository;
 
     /**
      * 홈 화면에서 옷차림 요약 정보를 조회
@@ -52,7 +55,7 @@ public FashionSummaryResponseDto getFashionSummary() {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new BusinessException(UserErrorCode.USER_NOT_FOUND));
 
-        Long locationId = getUserDefaultLocationId(user);
+        Long locationId = getUserDefaultLocationId(userId);
 
         LocalDateTime today = LocalDateTime.now();
         int date = Integer.parseInt(today.format(DateTimeFormatter.ofPattern("yyyyMMdd")));
@@ -67,7 +70,7 @@ public FashionSummaryResponseDto getFashionSummary() {
         Fashion fashion = fashionRepository
                 .findByTemperatureRange(feelTemp)
                 .orElseThrow(() -> new BusinessException(FashionErrorCode.FASHION_NOT_FOUND));
-        
+
         return FashionMapper.toSummaryResponse(locationId, fashion);
     }
 
@@ -85,7 +88,7 @@ public FashionDetailResponseDto getFashionDetail() {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new BusinessException(UserErrorCode.USER_NOT_FOUND));
 
-        Long locationId = getUserDefaultLocationId(user);
+        Long locationId = getUserDefaultLocationId(userId);
 
         LocalDateTime today = LocalDateTime.now();
         int date = Integer.parseInt(today.format(DateTimeFormatter.ofPattern("yyyyMMdd")));
@@ -142,12 +145,9 @@ private Fashion findFashionFor(float feelTmp, List<Fashion> fashions) {
                 .orElseThrow(() -> new BusinessException(FashionErrorCode.FASHION_NOT_FOUND));
     }
 
-    private Long getUserDefaultLocationId(User user){
-        if (user.getDefaultLocation() != null && user.getDefaultLocation().getLocation() != null) {
-            return user.getDefaultLocation().getLocation().getId();
-        }
-        return Optional.ofNullable(user.getNowLocation())
-                .map(Location::getId)
+    @Transactional(readOnly = true)
+    public Long getUserDefaultLocationId(Long userId){
+        return userFavoriteLocationRepository.findDefaultOrNowLocationId(userId)
                 .orElseThrow(() -> new BusinessException(UserErrorCode.USER_DEFAULT_LOCATION_NOT_FOUNT));
     }
-}
+}

src/main/java/com/weady/weady/domain/user/entity/User.java

@@ -29,7 +29,7 @@ public class User extends BaseEntity {
     private Location nowLocation;
 
     @Setter
-    @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "default_location_id")
     private UserFavoriteLocation defaultLocation;
 

src/main/java/com/weady/weady/domain/user/repository/UserFavoriteLocationRepository.java

@@ -9,6 +9,7 @@
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 
 public interface UserFavoriteLocationRepository extends JpaRepository<UserFavoriteLocation, Long> {
 
@@ -17,25 +18,44 @@ public interface UserFavoriteLocationRepository extends JpaRepository<UserFavori
 
     List<UserFavoriteLocation> findByUser(User user);
 
-    /**
-     * --- [성능 최적화] ---
-     * 특정 사용자의 모든 즐겨찾기 정보를 관련 날씨/요약 데이터와 함께 한 번의 쿼리로 조회합니다.
-     * N+1 문제를 해결하기 위해 여러 엔티티를 LEFT JOIN으로 연결합니다.
-     *
-     * @param userId      조회할 사용자의 ID
-     * @param reportDate  조회할 일일 요약 정보의 날짜 (오늘)
-     * @param currentTime 조회할 현재 날씨 정보의 시간 (예: 1500)
-     * @return Object 배열의 리스트. 각 배열은 [UserFavoriteLocation, LocationWeatherShortDetail, DailySummary] 순서로 구성됩니다.
-     */
-    @Query("SELECT uf, lwsd, ds " +
-            "FROM UserFavoriteLocation uf " +
-            "JOIN FETCH uf.location l " +
-            "LEFT JOIN LocationWeatherShortDetail lwsd ON lwsd.location = l AND lwsd.time = :currentTime " +
-            "LEFT JOIN DailySummary ds ON ds.location = l AND ds.reportDate = :reportDate " +
-            "WHERE uf.user.id = :userId")
+
+    @Query("""
+select uf, lwsd, ds
+from UserFavoriteLocation uf
+join uf.location l
+left join LocationWeatherShortDetail lwsd
+       on lwsd.location = l
+      and lwsd.time = :currentTime
+      and lwsd.id = (
+           select max(s.id)
+           from LocationWeatherShortDetail s
+           where s.location = l
+             and s.time = :currentTime
+      )
+left join DailySummary ds
+       on ds.location = l
+      and ds.reportDate = :reportDate
+      and ds.id = (
+           select max(d2.id)
+           from DailySummary d2
+           where d2.location = l
+             and d2.reportDate = :reportDate
+      )
+where uf.user.id = :userId
+""")
     List<Object[]> findFavoritesWithDetailsByUserId(
             @Param("userId") Long userId,
             @Param("reportDate") LocalDate reportDate,
             @Param("currentTime") int currentTime
     );
+
+    @Query("""
+      select coalesce(dl.location.id, nl.id)
+      from User u
+      left join u.defaultLocation dl
+      left join dl.location
+      left join u.nowLocation nl
+      where u.id = :userId
+    """)
+    Optional<Long> findDefaultOrNowLocationId(Long userId);
 }

src/main/java/com/weady/weady/domain/user/service/UserService.java

@@ -137,9 +137,9 @@ public GetUserDefaultLocationResponse getUserDefaultLocation(){
     @Transactional(readOnly = true)
     public boolean checkNicknameDuplication(String nickname) {
         return userRepository.existsUserByName(nickname);
-
     }
 
+
     private void runAfterCommit(Runnable task) {
         if (TransactionSynchronizationManager.isActualTransactionActive()) {
             TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {

src/main/java/com/weady/weady/domain/weather/mapper/WeatherMapper.java

@@ -64,7 +64,7 @@ public static GetLocationWeatherShortDetailResponse toShortWeatherResponse(
 
     public static GetWeatherMidDetailResponse toMidWeatherResponse(WeatherMidDetail weatherMid) {
 
-        LocalDate localDate = LocalDate.parse(String.valueOf(weatherMid.getDate()), DateTimeFormatter.ofPattern("yyyyMMdd"));
+        LocalDate localDate = LocalDate.parse(String.valueOf(weatherMid.getDate()));
 
         return GetWeatherMidDetailResponse.builder()
                 .dayOfWeek(localDate.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.KOREAN))