Skip to content

PIR: Ensure next scan date is not in the past #2694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 1, 2025
+16 −1
Merged

PIR: Ensure next scan date is not in the past #2694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07216e3
Ensure next scan date is not in the past
quanganhdo Nov 28, 2025
ef3027c
Merge branch 'main' into anh/shared/pir/no-past-date
quanganhdo Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...e/Sources/DataBrokerProtectionCore/UIWeb/DBPUICommunicationModelScanStateExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,9 @@ public extension DBPUIScanAndOptOutMaintenanceState {
laterDate: eightDaysAfterToday)

let earliestScanPreferredRunDate = nonRemovedBrokerProfileQueryData.earliestScanPreferredRunDate() ?? currentDate
let displayDate = max(earliestScanPreferredRunDate, currentDate)

return DBPUIScanDate(date: earliestScanPreferredRunDate.timeIntervalSince1970, dataBrokers: brokers)
return DBPUIScanDate(date: displayDate.timeIntervalSince1970, dataBrokers: brokers)
}
}

Expand Down
14 changes: 14 additions & 0 deletions ...s/DataBrokerProtectionCoreTests/DBPUICommunicationViewModelScanStateExtensionsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,20 @@ final class DBPUICommunicationViewModelScanStateExtensionsTests: XCTestCase {
XCTAssertTrue(areDatesEqualsOnDayMonthAndYear(date1: Date().tomorrow, date2: Date(timeIntervalSince1970: result.scanSchedule.nextScan.date)))
}

func testNextScans_whenPreferredRunDateIsInThePast_thenDisplayDateIsClampedToNow() {
let pastPreferredRunDate = Date().addingTimeInterval(-3600)
let now = Date()

let brokerProfileQueryData: [BrokerProfileQueryData] = [
.mock(dataBrokerName: "Broker #1", url: "broker1.com", preferredRunDate: pastPreferredRunDate)
]

let result = DBPUIScanAndOptOutMaintenanceState(from: brokerProfileQueryData)

let nextScanDate = Date(timeIntervalSince1970: result.scanSchedule.nextScan.date)
XCTAssertGreaterThanOrEqual(nextScanDate, now)
}

func testBrokersWithMixedScanProgress_areOrderedByLastRunDate_andHaveCorrectStatus() {

// Given
Expand Down
Loading