Skip to content

Commit d7149e1

Browse files
authored
[PAL-694] issue report includes 100 most recent alerts (#690)
* issue report includes 100 most recent alerts * added default value to keep unit tests the same
1 parent ebe4d78 commit d7149e1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Loop/Managers/Alerts/AlertManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ extension AlertManager {
507507
await withCheckedContinuation { continuation in
508508
let startDate = Date() - .days(3.5) // Report the last 3 and half days of alerts
509509
let header = "## Alerts\n"
510-
alertStore.executeQuery(since: startDate, limit: 100) { result in
510+
alertStore.executeQuery(since: startDate, limit: 100, ascending: false) { result in
511511
switch result {
512512
case .failure:
513513
continuation.resume(returning: header)

Loop/Managers/Alerts/AlertStore.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,15 +422,15 @@ extension AlertStore {
422422
case failure(Error)
423423
}
424424

425-
func executeQuery(fromQueryAnchor queryAnchor: QueryAnchor? = nil, since date: Date, excludingFutureAlerts: Bool = true, now: Date = Date(), limit: Int, completion: @escaping (AlertQueryResult) -> Void) {
425+
func executeQuery(fromQueryAnchor queryAnchor: QueryAnchor? = nil, since date: Date, excludingFutureAlerts: Bool = true, now: Date = Date(), limit: Int, ascending: Bool = true, completion: @escaping (AlertQueryResult) -> Void) {
426426
let sinceDateFilter = SinceDateFilter(predicateExpressionNotYetExpired: predicateExpressionNotYetExpired,
427427
date: date,
428428
excludingFutureAlerts: excludingFutureAlerts,
429429
now: now)
430-
executeAlertQuery(fromQueryAnchor: queryAnchor, queryFilter: sinceDateFilter, limit: limit, completion: completion)
430+
executeAlertQuery(fromQueryAnchor: queryAnchor, queryFilter: sinceDateFilter, limit: limit, ascending: ascending, completion: completion)
431431
}
432432

433-
func executeAlertQuery(fromQueryAnchor queryAnchor: QueryAnchor?, queryFilter: QueryFilter? = nil, limit: Int, completion: @escaping (AlertQueryResult) -> Void) {
433+
func executeAlertQuery(fromQueryAnchor queryAnchor: QueryAnchor?, queryFilter: QueryFilter? = nil, limit: Int, ascending: Bool = true, completion: @escaping (AlertQueryResult) -> Void) {
434434
var queryAnchor = queryAnchor ?? QueryAnchor()
435435
var queryResult = [SyncAlertObject]()
436436
var queryError: Error?
@@ -449,7 +449,7 @@ extension AlertStore {
449449
} else {
450450
storedRequest.predicate = queryAnchorPredicate
451451
}
452-
storedRequest.sortDescriptors = [NSSortDescriptor(key: "modificationCounter", ascending: true)]
452+
storedRequest.sortDescriptors = [NSSortDescriptor(key: "modificationCounter", ascending: ascending)]
453453
storedRequest.fetchLimit = limit
454454

455455
do {

0 commit comments

Comments
 (0)