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

Risk calculation (EXPOSUREAPP-5698) #2660

Merged
merged 89 commits into from
Mar 31, 2021

Conversation

chiljamgossow
Copy link
Contributor

@chiljamgossow chiljamgossow commented Mar 21, 2021

Can be tested in test menu with mock server (necessary for the risk calculation parameters in the config)

  1. run matcher, wait for result
  2. calculate risk

Tech spec https://github.com/corona-warn-app/cwa-app-tech-spec/blob/proposal/event-registration-mvp/docs/spec/event-registration-client.md#risk-calculation

How it works:

  1. Result of matching is stored on DB table
  2. For all entries, the time overlap is mapped to a normalised time by multiplying with a risk factor
  3. Normalised time is summed up over date, then mapped to a risk state
  4. Risk states per day and check-in are published in the RiskLevelStorage (for contact journal)
  5. Risk states per day of exposure windows and presence tracing are merged (for contact journal)

builds on top of matching PR #2659

@chiljamgossow chiljamgossow requested a review from a team March 21, 2021 08:10
@chiljamgossow chiljamgossow changed the title klint Risk calculation (EXPOSUREAPP-5698) Mar 21, 2021
@chiljamgossow chiljamgossow marked this pull request as draft March 21, 2021 08:12
@chiljamgossow chiljamgossow changed the base branch from feature/5694-matching to release/2.0.x March 21, 2021 08:29
# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragmentViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/riskcalculation/PresenceTracingRiskCalculator.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/riskcalculation/PresenceTracingRiskMapper.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/riskcalculation/PresenceTracingRiskCalculatorTest.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/riskcalculation/PresenceTracingRiskMapperTest.kt
@chiljamgossow chiljamgossow changed the base branch from release/2.0.x to feature/5694-matching March 22, 2021 06:20
@harambasicluka harambasicluka added the maintainers Tag pull requests created by maintainers label Mar 22, 2021
@harambasicluka harambasicluka added this to the 2.0.0 milestone Mar 22, 2021
# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckIn.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRepository.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRepositoryTest.kt
# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragmentViewModel.kt
# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragmentViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/CheckInMatching.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/CheckInWarningMatcher.kt
# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/CheckInWarningMatcher.kt
Copy link
Member

@d4rken d4rken left a comment

Choose a reason for hiding this comment

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

lgtm, would approve after the ColumnInfo comment is addressed:

#2660 (comment)

Base automatically changed from feature/5694-matching to release/2.0.x March 31, 2021 07:15
@chiljamgossow chiljamgossow dismissed janetback’s stale review March 31, 2021 07:15

The base branch was changed.

# Conflicts:
#	Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json
#	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/checkins/download/TraceTimeIntervalWarningPackage.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/download/TraceTimeIntervalWarningRepository.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/split/CheckInSplitter.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/CheckInWarningMatcher.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/PresenceTracingRiskModel.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/CheckInWarningMatcherTest.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/FindMatchesTest.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/OverlapTest.kt
change warningPackageId type to string
Copy link
Member

@d4rken d4rken left a comment

Choose a reason for hiding this comment

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

lgtm

@sonarcloud
Copy link

sonarcloud bot commented Mar 31, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

63.5% 63.5% Coverage
0.0% 0.0% Duplication

@harambasicluka harambasicluka merged commit 170f605 into release/2.0.x Mar 31, 2021
@harambasicluka harambasicluka deleted the feature/5698-risk-calculation branch March 31, 2021 10:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
maintainers Tag pull requests created by maintainers prio PRs to review first.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants