Add zero points for the different DSOS mappings

DP-3T · Mar 18, 2021 · a0b4a84 · a0b4a84
1 parent d343fb4
commit a0b4a84
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...d-sdk/dpppt-backend-sdk-model/src/main/java/org/dpppt/backend/sdk/utils/EfgsDsosUtil.java b/...d-sdk/dpppt-backend-sdk-model/src/main/java/org/dpppt/backend/sdk/utils/EfgsDsosUtil.java
@@ -17,13 +17,17 @@
 
 public class EfgsDsosUtil {
 
+  public static int DSOS_SYMPTOMATIC_UNKNOWN_ONSET_ZERO_POINT = 2000;
+  public static int DSOS_ASYMPTOMATIC_ZERO_POINT = 3000;
+  public static int DSOS_UNKNOWN_SYMPTOM_STATUS_ZERO_POINT = 2000;
+
   public static int calculateDefaultDsosMapping(GaenKeyForInterops gaenKey) {
     LocalDateTime rollingStartNumber =
         UTCInstant.of(gaenKey.getRollingStartNumber(), GaenUnit.TenMinutes).getLocalDateTime();
     LocalDateTime receivedAt = gaenKey.getReceivedAt().getLocalDateTime();
 
     int daysSinceSubmission =
         Period.between(receivedAt.toLocalDate(), rollingStartNumber.toLocalDate()).getDays();
-    return daysSinceSubmission + 2000;
+    return DSOS_SYMPTOMATIC_UNKNOWN_ONSET_ZERO_POINT + daysSinceSubmission;
   }
 }
diff --git a/...k/dpppt-backend-sdk-model/src/test/java/org/dpppt/backend/sdk/utils/EfgsDsosUtilTest.java b/...k/dpppt-backend-sdk-model/src/test/java/org/dpppt/backend/sdk/utils/EfgsDsosUtilTest.java
@@ -1,5 +1,6 @@
 package org.dpppt.backend.sdk.utils;
 
+import static org.dpppt.backend.sdk.utils.EfgsDsosUtil.DSOS_SYMPTOMATIC_UNKNOWN_ONSET_ZERO_POINT;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -27,22 +28,22 @@ void testWithSubmissionTime(UTCInstant submissionTime) {
     submissionDateKey.setRollingStartNumber(
         (int) submissionTime.atStartOfDay().get10MinutesSince1970());
 
-    assertEquals(2000, EfgsDsosUtil.calculateDefaultDsosMapping(submissionDateKey));
+    assertEquals(DSOS_SYMPTOMATIC_UNKNOWN_ONSET_ZERO_POINT, EfgsDsosUtil.calculateDefaultDsosMapping(submissionDateKey));
 
     GaenKeyForInterops submissionPlus3Key = new GaenKeyForInterops();
     submissionPlus3Key.setGaenKey(new GaenKey());
     submissionPlus3Key.setReceivedAt(submissionTime);
     submissionPlus3Key.setRollingStartNumber(
         (int) submissionTime.plusDays(3).atStartOfDay().get10MinutesSince1970());
 
-    assertEquals(2000 + 3, EfgsDsosUtil.calculateDefaultDsosMapping(submissionPlus3Key));
+    assertEquals(DSOS_SYMPTOMATIC_UNKNOWN_ONSET_ZERO_POINT + 3, EfgsDsosUtil.calculateDefaultDsosMapping(submissionPlus3Key));
 
     GaenKeyForInterops submissionMinus10Key = new GaenKeyForInterops();
     submissionMinus10Key.setGaenKey(new GaenKey());
     submissionMinus10Key.setReceivedAt(submissionTime);
     submissionMinus10Key.setRollingStartNumber(
         (int) submissionTime.minusDays(10).atStartOfDay().get10MinutesSince1970());
 
-    assertEquals(2000 - 10, EfgsDsosUtil.calculateDefaultDsosMapping(submissionMinus10Key));
+    assertEquals(DSOS_SYMPTOMATIC_UNKNOWN_ONSET_ZERO_POINT - 10, EfgsDsosUtil.calculateDefaultDsosMapping(submissionMinus10Key));
   }
 }