Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Warning package download & scheduling (EXPOSUREAPP-5695,EXPOSUREAPP-5696) #2707

Merged
merged 86 commits into from
Apr 7, 2021
Merged

Warning package download & scheduling (EXPOSUREAPP-5695,EXPOSUREAPP-5696) #2707

merged 86 commits into from
Apr 7, 2021

Conversation

chiljamgossow
Copy link
Contributor

@chiljamgossow chiljamgossow commented Mar 29, 2021 •
edited by d4rken
Loading

This PR adds the download of warnings for tracelocations, wires up the download/calculation logic to be regularly executed. Some additional refactoring and and polishing too.

  • Adds a worker to regularly launch a Task that downloads TraceWarningPackage's and processes them if they have not yet been processed.
  • The worker calls the TraceWarningPackageSyncTool
    • It will clean up inconsistent data states and revoke data if necessary.
    • It compares: Our Check Ins <> What The Server Has <> What We Have Already Processed and download any missing data.
    • New data is unprocessed and thus be available to the CheckInWarningMatcher.
  • Unprocessed packages are given to the CheckInWarningMatcher
    • It will compare them against local CheckIns and possible generate a high risk state by adding data to PresenceTracingRiskRepository.
    • Processed packages are marked, deleted and will not be processed again.

This PR contains #2739.

Testing hints

  • The test menu has entries to execute the task which would trigger both download and matching.
  • Filter log for Warning and TraceWarning.

@chiljamgossow chiljamgossow requested a review from a team March 29, 2021 11:41
@chiljamgossow chiljamgossow marked this pull request as draft March 29, 2021 11:41
@chiljamgossow chiljamgossow changed the title Feature/5696 warning download Downloag warning packages (EXPOSUREAPP-5696) Mar 29, 2021
@chiljamgossow chiljamgossow changed the title Downloag warning packages (EXPOSUREAPP-5696) Download warning packages (EXPOSUREAPP-5696) Mar 29, 2021
@harambasicluka harambasicluka added the maintainers Tag pull requests created by maintainers label Mar 29, 2021
@harambasicluka harambasicluka added this to the 2.0.0 milestone Mar 29, 2021
@d4rken d4rken self-assigned this Mar 30, 2021
d4rken added 7 commits March 31, 2021 10:34
@d4rken
TraceTimeWarning Download, Draft2
5cfbcf2
@d4rken
TraceTimeWarning Download, Draft3
aef1a27
@d4rken
Offer only new warning packages via API.
d10d508
@d4rken
Merge branch 'release/2.0.x' into feature/5696-warning-download
302dcfd 
# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragmentViewModel.kt
#	Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
@d4rken
Remove duplicate test menu entry.
736fee5
@d4rken
TraceTimeWarning Download, Draft5
712194e
@d4rken
Adapt CheckInWarningMatcher to mark processed packages.
bf896f8
@d4rken d4rken removed their assignment Apr 1, 2021
@d4rken d4rken added the prio PRs to review first. label Apr 1, 2021
d4rken added 5 commits April 1, 2021 11:28
@d4rken
Fix failing unit tests.
4d19f41
@d4rken
Unit Test Skeletons
63979e9
@d4rken
Merge branch 'release/2.0.x' into feature/5696-warning-download
a665527 
# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/worker/WorkerBinder.kt
@d4rken
Back BackgroundScheduler non-static and injected.
fbcf083
@d4rken
Refactored and combined diagnosis and tracing periodic workers.
00caf97
@chiljamgossow chiljamgossow mentioned this pull request Apr 1, 2021
Merged
@d4rken d4rken changed the title Download warning packages (EXPOSUREAPP-5696) Warning package download & scheduling (EXPOSUREAPP-5695,EXPOSUREAPP-5696) Apr 1, 2021
d4rken added 2 commits April 2, 2021 09:12
@d4rken
Merge branch 'release/2.0.x' into feature/5696-warning-download
309fb3e 
# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/download/TraceTimeIntervalWarningRepository.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/CheckInWarningMatcher.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/CheckInWarningMatcherTest.kt
@d4rken
Adapt marking packages as processed to upstream CheckInWarningMatcher…
4563d1b 
… changes.
@mtwalli mtwalli self-assigned this Apr 7, 2021
BMItr
BMItr previously approved these changes Apr 7, 2021
View reviewed changes
Copy link
Contributor

@BMItr BMItr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx for addressing comments.
lgtm

@d4rken d4rken added the author merge PR to be merged by author label Apr 7, 2021
mtwalli
mtwalli reviewed Apr 7, 2021
View reviewed changes
.../src/androidTest/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalPeriodicWorkerTest.kt Outdated Show resolved Hide resolved
...ava/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragmentViewModel.kt Outdated Show resolved Hide resolved
...Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/KeyDownloadParametersMapper.kt Outdated Show resolved Hide resolved
...Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/KeyDownloadParametersMapper.kt Outdated Show resolved Hide resolved
...src/main/java/de/rki/coronawarnapp/presencetracing/risk/calculation/CheckInWarningMatcher.kt Show resolved Hide resolved
...ain/java/de/rki/coronawarnapp/presencetracing/risk/calculation/PresenceTracingConversions.kt Outdated Show resolved Hide resolved
.../main/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTask.kt Show resolved Hide resolved
.../main/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTask.kt Outdated Show resolved Hide resolved
...main/java/de/rki/coronawarnapp/presencetracing/risk/storage/PresenceTracingRiskRepository.kt Outdated Show resolved Hide resolved
...main/java/de/rki/coronawarnapp/presencetracing/risk/storage/PresenceTracingRiskRepository.kt Outdated Show resolved Hide resolved
harambasicluka and others added 11 commits April 7, 2021 13:41
@harambasicluka
Merge branch 'release/2.0.x' into feature/5696-warning-download
4a123a3
@d4rken
Remove unused test.
3eab8c7
@d4rken
Use time measuring function.
eecac96
@d4rken
Simplify error case handling for revoked metadata packages.
798dc7a
@d4rken
Turn createMatchingLaunchers into runMatchingLaunchers
4bf498b
@d4rken
Use TimeUnit.MINUTES
4ee8314
@d4rken
Remove extra deletion call.
3b0acf3 
If there are no CheckIns, the SyncTool will have deleted all matches already.
@d4rken
Use flatMap instead of flatten.
0549218
@d4rken
Use more specific names (toCheckInWarningOverlap/toTraceTimeIntervalM…
8b2ee5e 
…atchEntity)
@d4rken
Merge branch 'release/2.0.x' into feature/5696-warning-download
66fb75e 
# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModelTest.kt
@d4rken
Merge remote-tracking branch 'origin/feature/5696-warning-download' i…
c82cd49 
…nto feature/5696-warning-download
@d4rken d4rken dismissed stale reviews from BMItr, jurajkusnier, and AlexanderAlferov via c82cd49 April 7, 2021 12:58
@sonarcloud
Copy link

sonarcloud bot commented Apr 7, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 3 Code Smells

29.2% 29.2% Coverage
0.0% 0.0% Duplication

mtwalli
mtwalli approved these changes Apr 7, 2021
View reviewed changes
Copy link
Contributor

@mtwalli mtwalli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@d4rken d4rken merged commit 63050ac into release/2.0.x Apr 7, 2021
@d4rken d4rken deleted the feature/5696-warning-download branch April 7, 2021 13:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@d4rken d4rken d4rken left review comments

@AlexanderAlferov AlexanderAlferov AlexanderAlferov approved these changes

@BMItr BMItr BMItr approved these changes

@mtwalli mtwalli mtwalli approved these changes

@jurajkusnier jurajkusnier jurajkusnier left review comments

Assignees

@jurajkusnier jurajkusnier

@mtwalli mtwalli

@BMItr BMItr

@AlexanderAlferov AlexanderAlferov

Labels
author merge PR to be merged by author maintainers Tag pull requests created by maintainers prio PRs to review first.
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.
7 participants
@chiljamgossow @d4rken @jurajkusnier @mtwalli @BMItr @AlexanderAlferov @harambasicluka