Update parameters for risk calculation (#1260)

* chore: align risk calc params to latest model

* set version

* add missing log parameter

Co-authored-by: Hilmar Falkenberg <hilmar.falkenberg@sap.com>

Author: mlenkeit

.mvn/maven.config

@@ -1,4 +1,4 @@
--Drevision=1.15.0
+-Drevision=1.15.1
 -Dlicense.projectName=Corona-Warn-App
 -Dlicense.inceptionYear=2020
 -Dlicense.licenseName=apache_v2

services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters-1.15.yaml

@@ -15,45 +15,45 @@ minutes-at-attenuation-weights:
   -
     attenuation-range:
       min: 0
-      max: 55
-      max-exclusive: true
-    weight: 1.0
-  -
-    attenuation-range:
-      min: 55
       max: 63
       max-exclusive: true
-    weight: 0.5
+    weight: 0.8
   -
     attenuation-range:
       min: 63
       max: 73
       max-exclusive: true
-    weight: 0.3
+    weight: 1.0
+  -
+    attenuation-range:
+      min: 73
+      max: 79
+      max-exclusive: true
+    weight: 0.1
 
 normalized-time-per-e-w-to-risk-level-mapping:
   -
     normalized-time-range:
       min: 0
-      max: 15
+      max: 13
       max-exclusive: true
     risk-level: 1
   -
     normalized-time-range:
-      min: 15
+      min: 13
       max: 9999
     risk-level: 2
 
 normalized-time-per-day-to-risk-level-mapping:
   -
     normalized-time-range:
       min: 5
-      max: 15
+      max: 13
       max-exclusive: true
     risk-level: 1
   -
     normalized-time-range:
-      min: 15
+      min: 13
       max: 99999
     risk-level: 2
 

services/distribution/src/main/resources/main-config/v2/risk-calculation-parameters.yaml

@@ -11,7 +11,7 @@ minutes-at-attenuation-filters:
   -
     attenuation-range:
       min: 0
-      max: 73
+      max: 79
       max-exclusive: true
     drop-if-minutes-in-range:
       min: 0
@@ -28,39 +28,45 @@ minutes-at-attenuation-weights:
   -
     attenuation-range:
       min: 0
-      max: 55
+      max: 63
+      max-exclusive: true
+    weight: 0.8
+  -
+    attenuation-range:
+      min: 63
+      max: 73
       max-exclusive: true
     weight: 1.0
   -
     attenuation-range:
-      min: 55
-      max: 63
+      min: 73
+      max: 79
       max-exclusive: true
-    weight: 0.5
+    weight: 0.1
 
 normalized-time-per-e-w-to-risk-level-mapping:
   -
     normalized-time-range:
       min: 0
-      max: 15
+      max: 13
       max-exclusive: true
     risk-level: 1
   -
     normalized-time-range:
-      min: 15
+      min: 13
       max: 9999
     risk-level: 2
 
 normalized-time-per-day-to-risk-level-mapping:
   -
     normalized-time-range:
       min: 0
-      max: 15
+      max: 13
       max-exclusive: true
     risk-level: 1
   -
     normalized-time-range:
-      min: 15
+      min: 13
       max: 99999
     risk-level: 2
 

services/download/src/main/java/app/coronawarn/server/services/download/FederationBatchProcessor.java

@@ -210,7 +210,7 @@ private Optional<String> processBatchAndReturnNextBatchId(
         }
         int insertedKeys = diagnosisKeyService.saveDiagnosisKeys(validDiagnosisKeys);
         logger.info("Successfully inserted {} {} keys for date {} and batchTag {}", batchInfo.getSourceSystem(),
-            insertedKeys, date);
+            insertedKeys, date, batchTag);
       }, () -> logger.info("{} batch for date {} and batchTag {} did not contain any keys",
           batchInfo.getSourceSystem(), date, batchTag));
       batchInfoService.updateStatus(batchInfo, batchContainsInvalidKeys.get() ? PROCESSED_WITH_ERROR : PROCESSED);