Merge branch 'fix/disaster_list_order' into dev-check

Team-NumberOne · Apr 9, 2024 · 22b91e4 · 22b91e4
2 parents 4019b6c + 09488ac
commit 22b91e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/daepiro-api/src/main/java/com/numberone/backend/domain/disaster/service/DisasterService.java b/daepiro-api/src/main/java/com/numberone/backend/domain/disaster/service/DisasterService.java
@@ -38,7 +38,7 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 @Slf4j
-public class DisasterService {
+public class DisasterService {//todo: 리팩토링 필요, 성능 이슈
     private final DisasterRepository disasterRepository;
     private final LocationProvider locationProvider;
     private final MemberRepository memberRepository;
@@ -113,7 +113,7 @@ private boolean isValidDisasterType(DisasterType disasterType, List<Notification
     }
 
     public SituationHomeResponse getSituationHome() {
-        Set<Disaster> disasters = new HashSet<>();
+        List<Disaster> disasters = new ArrayList<>();
         long id = SecurityContextProvider.getAuthenticatedUserId();
         Member member = memberRepository.findById(id)
                 .orElseThrow(NotFoundMemberException::new);
@@ -122,7 +122,7 @@ public SituationHomeResponse getSituationHome() {
             disasters.addAll(disasterRepository.findDisastersInAddressAfterTime(notificationRegion.getLocation(), time));
         }
         disasters.removeIf(disaster -> !isValidDisasterType(disaster.getDisasterType(), member.getNotificationDisasters()));
-
+        disasters.sort((a, b) -> (b.getGeneratedAt().compareTo(a.getGeneratedAt())));
 
         List<SituationResponse> situationResponses = new ArrayList<>();
         for (Disaster disaster : disasters) {

diff --git a/daepiro-auth/src/main/java/com/numberone/backend/provider/KakaoAuthenticationProvider.java b/daepiro-auth/src/main/java/com/numberone/backend/provider/KakaoAuthenticationProvider.java
@@ -27,9 +27,7 @@ public Authentication authenticate(Authentication authentication) throws Authent
             throw new BadCredentialsException("유효하지 않은 OAuth 토큰입니다.");
         }
         Member member = memberRepository.findByKakaoId(kakaoId)
-                .orElse(null);
-        if (member == null)
-            member = memberRepository.save(Member.ofKakao(kakaoId));
+                .orElseGet(() -> memberRepository.save(Member.ofKakao(kakaoId)));
         return UsernamePasswordAuthenticationToken.authenticated(member.getId(), null, null);
     }
 

diff --git a/daepiro-auth/src/main/java/com/numberone/backend/provider/NaverAuthenticationProvider.java b/daepiro-auth/src/main/java/com/numberone/backend/provider/NaverAuthenticationProvider.java
@@ -28,9 +28,7 @@ public Authentication authenticate(Authentication authentication) throws Authent
             throw new BadCredentialsException("유효하지 않은 OAuth 토큰입니다.");
         }
         Member member = memberRepository.findByNaverId(naverId)
-                .orElse(null);
-        if (member == null)
-            member = memberRepository.save(Member.ofNaver(naverId));
+                .orElseGet(() -> memberRepository.save(Member.ofNaver(naverId)));
         return UsernamePasswordAuthenticationToken.authenticated(member.getId(), null, null);
     }