[#76] Refactoring sorting

Nexters · Feb 17, 2023 · 445af99 · 445af99
1 parent a68a552
commit 445af99
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 36 deletions.
diff --git a/src/main/java/com/promise8/wwwbe/model/dto/res/MeetingGetResDto.java b/src/main/java/com/promise8/wwwbe/model/dto/res/MeetingGetResDto.java
@@ -60,13 +60,7 @@ public static MeetingGetResDto of(
             Long currentUserId,
             Boolean isJoined) {
         List<Map.Entry<String, List<String>>> userVoteList = new ArrayList<>(userVoteHashMap.entrySet());
-
-        Collections.sort(userVoteList, new Comparator<Map.Entry<String, List<String>>>() {
-            @Override
-            public int compare(Map.Entry<String, List<String>> o1, Map.Entry<String, List<String>> o2) {
-                return o2.getValue().size() - o1.getValue().size();
-            }
-        });
+        userVoteList.sort((o1, o2) -> o2.getValue().size() - o1.getValue().size());
 
         boolean isNoMeetingUser = meetingEntity.getMeetingUserEntityList() == null || meetingEntity.getMeetingUserEntityList().isEmpty();
         return MeetingGetResDto.builder()

diff --git a/src/main/java/com/promise8/wwwbe/model/dto/res/MeetingMainGetResDtoWrapper.java b/src/main/java/com/promise8/wwwbe/model/dto/res/MeetingMainGetResDtoWrapper.java
@@ -41,32 +41,30 @@ public static MeetingMainGetResDtoWrapper of(List<MeetingEntity> meetingEntityLi
             }
         }
 
-        Collections.sort(meetingMainIngGetResDtoList, new Comparator<MeetingMainGetResDto>() {
-            @Override
-            public int compare(MeetingMainGetResDto o1, MeetingMainGetResDto o2) {
-                if (o1.getMeetingStatus().equals(o2.getMeetingStatus())) {
-                    if (MeetingStatus.CONFIRMED.equals(o1.getMeetingStatus())) {
-                        if (o1.getConfirmedDate().equals(o2.getConfirmedDate())) {
-                            if (o1.getConfirmedTime().equals(o2.getConfirmedTime())) {
-                                return o2.getCreatedDatetime().compareTo(o1.getCreatedDatetime());
-                            } else {
-                                return o1.getConfirmedTime().getPriority() - o2.getConfirmedTime().getPriority();
-                            }
-                        } else {
-                            return o1.getConfirmedTime().getPriority() - o2.getConfirmedTime().getPriority();
-                        }
-                    } else {
+        meetingMainIngGetResDtoList.sort(MeetingMainGetResDtoWrapper::sorting);
+        return MeetingMainGetResDtoWrapper.builder()
+                .meetingIngList(meetingMainIngGetResDtoList)
+                .meetingEndList(meetingMainEndGetResDtoList)
+                .build();
+    }
+
+    private static int sorting(MeetingMainGetResDto o1, MeetingMainGetResDto o2) {
+        if (o1.getMeetingStatus().equals(o2.getMeetingStatus())) {
+            if (MeetingStatus.CONFIRMED.equals(o1.getMeetingStatus())) {
+                if (o1.getConfirmedDate().equals(o2.getConfirmedDate())) {
+                    if (o1.getConfirmedTime().equals(o2.getConfirmedTime())) {
                         return o2.getCreatedDatetime().compareTo(o1.getCreatedDatetime());
+                    } else {
+                        return o1.getConfirmedTime().getPriority() - o2.getConfirmedTime().getPriority();
                     }
                 } else {
-                    return o2.getMeetingStatus().getPriority() - o1.getMeetingStatus().getPriority();
+                    return o1.getConfirmedTime().getPriority() - o2.getConfirmedTime().getPriority();
                 }
+            } else {
+                return o2.getCreatedDatetime().compareTo(o1.getCreatedDatetime());
             }
-        });
-
-        return MeetingMainGetResDtoWrapper.builder()
-                .meetingIngList(meetingMainIngGetResDtoList)
-                .meetingEndList(meetingMainEndGetResDtoList)
-                .build();
+        } else {
+            return o2.getMeetingStatus().getPriority() - o1.getMeetingStatus().getPriority();
+        }
     }
 }
diff --git a/src/main/java/com/promise8/wwwbe/service/MeetingService.java b/src/main/java/com/promise8/wwwbe/service/MeetingService.java
@@ -242,13 +242,7 @@ private List<UserPromiseTimeResDto> getUserPromiseTimeList(MeetingEntity meeting
             });
         });
 
-        Collections.sort(userPromiseTimeResDtoList, new Comparator<UserPromiseTimeResDto>() {
-            @Override
-            public int compare(UserPromiseTimeResDto o1, UserPromiseTimeResDto o2) {
-                return o2.getUserNameList().size() - o1.getUserNameList().size();
-            }
-        });
-
+        userPromiseTimeResDtoList.sort((o1, o2) -> o2.getUserNameList().size() - o1.getUserNameList().size());
         return userPromiseTimeResDtoList;
     }