diff --git a/src/main/java/com/safeqr/app/gmail/dto/ScannedGmailResponseDto.java b/src/main/java/com/safeqr/app/gmail/dto/ScannedGmailResponseDto.java index 07e2f85..bbd001e 100644 --- a/src/main/java/com/safeqr/app/gmail/dto/ScannedGmailResponseDto.java +++ b/src/main/java/com/safeqr/app/gmail/dto/ScannedGmailResponseDto.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import java.util.Comparator; import java.util.List; @Builder diff --git a/src/main/java/com/safeqr/app/gmail/service/GmailService.java b/src/main/java/com/safeqr/app/gmail/service/GmailService.java index 4a4dceb..4ec26aa 100644 --- a/src/main/java/com/safeqr/app/gmail/service/GmailService.java +++ b/src/main/java/com/safeqr/app/gmail/service/GmailService.java @@ -411,6 +411,7 @@ public class GmailService { emailMessageList.add(emailMessage); }); + emailMessageList.sort(Comparator.comparing(EmailMessage::getDate, Comparator.nullsLast(Comparator.reverseOrder()))); } return ScannedGmailResponseDto.builder().messages(emailMessageList).build(); } diff --git a/src/main/java/com/safeqr/app/qrcode/service/URLVerificationService.java b/src/main/java/com/safeqr/app/qrcode/service/URLVerificationService.java index b2f8e98..3b54460 100644 --- a/src/main/java/com/safeqr/app/qrcode/service/URLVerificationService.java +++ b/src/main/java/com/safeqr/app/qrcode/service/URLVerificationService.java @@ -469,6 +469,7 @@ public class URLVerificationService { "uow.edu.au", "nus.edu.sg", "sim.edu.sg", - "sp.edu.sg" + "sp.edu.sg", + "go.gov.sg" ); } \ No newline at end of file