Skip to content
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

Update opt out retry interval to every 5 days #3536

Merged
merged 3 commits into from
Nov 18, 2024
Merged

Update opt out retry interval to every 5 days #3536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7a2402
Update retry interval to 5 days
quanganhdo Nov 12, 2024
1dddb47
Display OptOutAttemptDB in DB Browser (#3555)
quanganhdo Nov 18, 2024
b53d3ee
addAttempt workaround (#3556)
quanganhdo Nov 18, 2024
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
12 changes: 12 additions & 0 deletions ...BrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public protocol DataBrokerProtectionRepository {
func fetchOptOutHistoryEvents(brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws -> [HistoryEvent]
func hasMatches() throws -> Bool

func fetchAllAttempts() throws -> [AttemptInformation]
func fetchAttemptInformation(for extractedProfileId: Int64) throws -> AttemptInformation?
func addAttempt(extractedProfileId: Int64, attemptUUID: UUID, dataBroker: String, lastStageDate: Date, startTime: Date) throws
}
Expand Down Expand Up @@ -487,6 +488,17 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
}
}

func fetchAllAttempts() throws -> [AttemptInformation] {
do {
let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
return try vault.fetchAllAttempts()
} catch {
Logger.dataBrokerProtection.error("Database error: fetchAllAttempts, error: \(error.localizedDescription, privacy: .public)")
pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchAllAttempts"))
throw error
}
}

func fetchAttemptInformation(for extractedProfileId: Int64) throws -> AttemptInformation? {
do {
let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
Expand Down
28 changes: 26 additions & 2 deletions ...ces/DataBrokerProtection/DebugUI/DataBaseBrowser/DataBrokerDatabaseBrowserViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ final class DataBrokerDatabaseBrowserViewModel: ObservableObject {
guard let dataManager = self.dataManager else { return }

Task {
guard let data = try? dataManager.fetchBrokerProfileQueryData(ignoresCache: true) else {
guard let data = try? dataManager.fetchBrokerProfileQueryData(ignoresCache: true),
let attempts = try? dataManager.fetchAllOptOutAttempts() else {
assertionFailure("DataManager error during DataBrokerDatavaseBrowserViewModel.updateTables")
return
}
Expand All @@ -68,9 +69,10 @@ final class DataBrokerDatabaseBrowserViewModel: ObservableObject {
let optOutsTable = createTable(using: optOutJobs, tableName: "OptOutOperation")
let extractedProfilesTable = createTable(using: extractedProfiles, tableName: "ExtractedProfile")
let eventsTable = createTable(using: events.sorted(by: { $0.date < $1.date }), tableName: "Events")
let attemptsTable = createTable(using: attempts.sorted(by: <), tableName: "OptOutAttempts")

DispatchQueue.main.async {
self.tables = [brokersTable, profileQueriesTable, scansTable, optOutsTable, extractedProfilesTable, eventsTable]
self.tables = [brokersTable, profileQueriesTable, scansTable, optOutsTable, extractedProfilesTable, eventsTable, attemptsTable]
}
}
}
Expand Down Expand Up @@ -136,3 +138,25 @@ struct DataBrokerDatabaseBrowserData {
}

}

extension DataBrokerProtectionDataManager {
func fetchAllOptOutAttempts() throws -> [AttemptInformation] {
try database.fetchAllAttempts()
}
}

extension AttemptInformation: Comparable {
public static func < (lhs: AttemptInformation, rhs: AttemptInformation) -> Bool {
if lhs.extractedProfileId != rhs.extractedProfileId {
return lhs.extractedProfileId < rhs.extractedProfileId
} else if lhs.dataBroker != rhs.dataBroker {
return lhs.dataBroker < rhs.dataBroker
} else {
return lhs.startDate < rhs.startDate
}
}

public static func == (lhs: AttemptInformation, rhs: AttemptInformation) -> Bool {
lhs.attemptId == rhs.attemptId
}
}
8 changes: 4 additions & 4 deletions ...tion/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,10 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
profileQueryId: profileQueryId)

try database.addAttempt(extractedProfileId: extractedProfileId,
attemptUUID: stageDurationCalculator.attemptId,
dataBroker: stageDurationCalculator.dataBroker,
lastStageDate: stageDurationCalculator.lastStateTime,
startTime: stageDurationCalculator.startTime)
attemptUUID: stageDurationCalculator.attemptId,
dataBroker: stageDurationCalculator.dataBroker,
lastStageDate: stageDurationCalculator.lastStateTime,
startTime: stageDurationCalculator.startTime)
try database.add(.init(extractedProfileId: extractedProfileId, brokerId: brokerId, profileQueryId: profileQueryId, type: .optOutRequested))
try incrementAttemptCountIfNeeded(
database: database,
Expand Down
2 changes: 1 addition & 1 deletion ...rProtection/Sources/DataBrokerProtection/Resources/JSON/advancedbackgroundchecks.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/backgroundcheck.run.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/centeda.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/clubset.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/clustrmaps.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...kages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/councilon.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/curadvisor.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...okerProtection/Sources/DataBrokerProtection/Resources/JSON/cyberbackgroundchecks.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...kages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/dataveria.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/fakebroker.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 0,
"maintenanceScan": 240
"maintenanceScan": 120
},
"addedDatetime": 1725632531153,
"version": "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion ...BrokerProtection/Sources/DataBrokerProtection/Resources/JSON/fastbackgroundcheck.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/fastpeoplesearch.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...BrokerProtection/Sources/DataBrokerProtection/Resources/JSON/freepeopledirectory.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ckages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/inforver.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...lPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/kwold.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...Packages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/mylife.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ges/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/neighbor.report.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/newenglandfacts.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ges/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/officialusa.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...erProtection/Sources/DataBrokerProtection/Resources/JSON/people-background-check.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...s/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/people-wizard.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...s/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplefinders.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplesearchnow.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...s/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ges/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...ges/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...kages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
2 changes: 1 addition & 1 deletion ...es/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"schedulingConfig": {
"retryError": 48,
"confirmOptOutScan": 72,
"maintenanceScan": 240,
"maintenanceScan": 120,
"maxAttempts": -1
}
}
Loading
Loading