TF-2464 Sort list new emails push notification by receivedAt

Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit 44a1f4a44c9bc5612cef610334ce01dbaff9e051)
This commit is contained in:
dab246
2024-01-17 11:33:29 +07:00
committed by Dat PHAM HOANG
parent f7a2fd903d
commit eb8c27d38e
6 changed files with 54 additions and 22 deletions
@@ -9,4 +9,24 @@ extension String {
}
return nil
}
func convertUTCDateToLocalDate() -> Date? {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
dateFormatter.timeZone = TimeZone(identifier: "UTC")
if let utcDate = dateFormatter.date(from: self) {
TwakeLogger.shared.log(message: "UTC Date: \(utcDate)")
dateFormatter.timeZone = TimeZone.current
let localDateString = dateFormatter.string(from: utcDate)
TwakeLogger.shared.log(message: "Local Date: \(localDateString)")
if let localDate = dateFormatter.date(from: localDateString) {
return localDate
}
return nil
} else {
TwakeLogger.shared.log(message: "Error converting UTC date string to Date.")
return nil
}
}
}
+15 -2
View File
@@ -83,8 +83,10 @@ class JmapClient {
interceptor: authenticationInterceptor,
onSuccess: { (data: JmapResponseObject<Email>) in
if let response = data.parsing(methodName: JmapConstants.EMAIL_GET_METHOD_NAME, methodCallId: "c1") {
if let listEmail = response.list, !listEmail.isEmpty {
self.totalListEmails.append(contentsOf: listEmail)
if let listEmail = response.list,
!listEmail.isEmpty {
let sortedListEmails = self.sortListEmails(currentListEmails: listEmail)
self.totalListEmails.append(contentsOf: sortedListEmails)
}
self.hasMoreChanges = response.hasMoreChanges ?? false
self.currentSinceState = response.newState
@@ -107,4 +109,15 @@ class JmapClient {
}
)
}
private func sortListEmails(currentListEmails: [Email]) -> [Email] {
let sortedListEmails = currentListEmails.sorted(by: { (email1, email2) -> Bool in
if let date1 = email1.receivedAt?.convertUTCDateToLocalDate(),
let date2 = email2.receivedAt?.convertUTCDateToLocalDate() {
return date1 < date2
}
return false
})
return sortedListEmails
}
}
@@ -5,4 +5,5 @@ struct Email: Codable {
let subject: String?
let preview: String?
let from: [EmailAddress]?
let receivedAt: String?
}
+2 -1
View File
@@ -13,7 +13,8 @@ class JmapConstants {
"id",
"subject",
"preview",
"from"
"from",
"receivedAt"
]
static let EMAIL_ID = "email_id"