Refactor AppealDiscord to simplify appeal list processing using Comparator and optimize imports.
This commit is contained in:
parent
9c0a298145
commit
186a26fae1
|
|
@ -23,10 +23,7 @@ import org.springframework.stereotype.Service;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.time.ZoneId;
|
import java.time.ZoneId;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|
@ -258,9 +255,10 @@ public class AppealDiscord {
|
||||||
Optional<AppealList> optionalNextAppealList = appealList
|
Optional<AppealList> optionalNextAppealList = appealList
|
||||||
.stream()
|
.stream()
|
||||||
.filter(entry -> entry.userId() > assignTo.userId())
|
.filter(entry -> entry.userId() > assignTo.userId())
|
||||||
.sorted()
|
.min(Comparator.comparing(AppealList::userId));
|
||||||
.findFirst();
|
AppealList nextAppealList = optionalNextAppealList.orElse(appealList.stream()
|
||||||
AppealList nextAppealList = optionalNextAppealList.orElse(appealList.stream().sorted().findFirst().orElse(assignTo));
|
.min(Comparator.comparing(AppealList::userId))
|
||||||
|
.orElse(assignTo));
|
||||||
mapper.updateNext(assignTo.userId(), false);
|
mapper.updateNext(assignTo.userId(), false);
|
||||||
mapper.updateNext(nextAppealList.userId(), true);
|
mapper.updateNext(nextAppealList.userId(), true);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user