Merge branch 'develop' of https://github.com/MAKAR-iOS/MAKAR-BE into …

…develop
MAKAR-iOS · Aug 1, 2024 · 19745e9 · 19745e9
2 parents 2694a02 + 301635d
commit 19745e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/main/java/makar/dev/converter/UserConverter.java b/src/main/java/makar/dev/converter/UserConverter.java
@@ -1,13 +1,10 @@
 package makar.dev.converter;
 
-import makar.dev.domain.Noti;
 import makar.dev.domain.Route;
 import makar.dev.domain.User;
 import makar.dev.dto.response.NotiResponse;
 import makar.dev.dto.response.UserResponse;
 
-import java.util.List;
-
 public class UserConverter {
 
     public static UserResponse.HomeDto toRouteSetHomeDto(NotiResponse.NotiListDto notiListDto, Route route){

diff --git a/src/main/java/makar/dev/domain/Noti.java b/src/main/java/makar/dev/domain/Noti.java
@@ -34,9 +34,9 @@ public class Noti implements Comparable<Noti>{
     @Override
     public int compareTo(Noti noti) {
         if (noti.getNoti_minute() < noti_minute)
-            return 1;
-        else if (noti.getNoti_minute() > noti_minute)
             return -1;
+        else if (noti.getNoti_minute() > noti_minute)
+            return 1;
         return 0;
     }
 }