Merge pull request #117 from SwissCovid/feature/checkin-update-notifi…

…cation New Flag for notification.
SwissCovid · Jun 17, 2021 · 5dc06f2 · 5dc06f2
2 parents c3c2b35 + 197a716
commit 5dc06f2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/...ackend/src/main/java/org/dpppt/switzerland/backend/sdk/config/ws/config/WSBaseConfig.java b/...ackend/src/main/java/org/dpppt/switzerland/backend/sdk/config/ws/config/WSBaseConfig.java
@@ -62,6 +62,8 @@ public abstract class WSBaseConfig implements SchedulingConfigurer, WebMvcConfig
 
 	@Value("${ws.retentiondays: 21}")
 	int retentionDays;
+	@Value("${ws.checkinupdatenotificationenabled: true}")
+	boolean checkInUpdateNotificationEnabled;
 
 	@Value("#{${ws.security.headers: {'X-Content-Type-Options':'nosniff', 'X-Frame-Options':'DENY','X-Xss-Protection':'1; mode=block'}}}")
 	Map<String,String> additionalHeaders;
@@ -79,7 +81,7 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 
 	@Bean
 	public GaenConfigController gaenConfigController(Messages messages) {
-		return new GaenConfigController(messages,  interOpsCountryCodes);
+		return new GaenConfigController(messages,  interOpsCountryCodes, checkInUpdateNotificationEnabled);
 	}
 
 	@Bean

diff --git a/...n/java/org/dpppt/switzerland/backend/sdk/config/ws/config/mock/MockForceUpdateConfig.java b/...n/java/org/dpppt/switzerland/backend/sdk/config/ws/config/mock/MockForceUpdateConfig.java
@@ -29,7 +29,7 @@ public GaenConfigController gaenConfigController(Messages messages) {
 	public class MockForceUpdateController extends GaenConfigController {
 
 		public MockForceUpdateController(Messages messages) {
-			super(messages, interOpsCountryCodes);
+			super(messages, interOpsCountryCodes, false);
 		}
 
 		@Override

diff --git a/.../main/java/org/dpppt/switzerland/backend/sdk/config/ws/config/mock/MockInfoBoxConfig.java b/.../main/java/org/dpppt/switzerland/backend/sdk/config/ws/config/mock/MockInfoBoxConfig.java
@@ -30,7 +30,7 @@ public GaenConfigController gaenConfigController(Messages messages) {
 	public class MockInfoBoxController extends GaenConfigController {
 
 		public MockInfoBoxController(Messages messages) {
-			super(messages, interOpsCountryCodes);
+			super(messages, interOpsCountryCodes, false);
 		}
 
 		@Override

diff --git a/...ain/java/org/dpppt/switzerland/backend/sdk/config/ws/controller/GaenConfigController.java b/...ain/java/org/dpppt/switzerland/backend/sdk/config/ws/controller/GaenConfigController.java
@@ -96,12 +96,14 @@ public class GaenConfigController {
 	protected final Messages messages;
 	private final List<String> interOpsCountryCodes;
 	private final TestLocationHelper testLocationHelper;
+	private final boolean checkInUpdateNotificationEnabled;
 
 	public GaenConfigController(Messages messages,
-			List<String> interOpsCountryCodes) {
+			List<String> interOpsCountryCodes, boolean checkInUpdateNotificationEnabled) {
 		this.messages = messages;
 		this.interOpsCountryCodes = interOpsCountryCodes;
 		this.testLocationHelper = new TestLocationHelper(messages);
+		this.checkInUpdateNotificationEnabled = checkInUpdateNotificationEnabled;
 	}
 
 	@Documentation(description = "Echo endpoint", responses = { "200 => Hello from DP3T Config WS" })
@@ -121,6 +123,7 @@ public GaenConfigController(Messages messages,
 			@Documentation(description = "Version of the OS", example = "ios13.6") @RequestParam String osversion,
 			@Documentation(description = "Build number of the app", example = "ios-200619.2333.175") @RequestParam String buildnr) {
 		ConfigResponse config = new ConfigResponse();
+		config.setCheckInUpdateNotificationEnabled(this.checkInUpdateNotificationEnabled);
 		config.setInterOpsCountries(interOpsCountryCodes);
 		config.setTestInformationUrls(testLocationHelper.getTestInfoUrls());
 		config.setWhatToDoPositiveTestTexts(whatToDoPositiveTestTexts(messages));

diff --git a/...ckend/src/main/java/org/dpppt/switzerland/backend/sdk/config/ws/model/ConfigResponse.java b/...ckend/src/main/java/org/dpppt/switzerland/backend/sdk/config/ws/model/ConfigResponse.java
@@ -44,6 +44,9 @@ public class ConfigResponse {
     @Documentation(description = "Localized urls to test information website")   
     private Map<String, String> testInformationUrls;
 
+	@Documentation(description = "Flag to enable notifications informing users about the new checkin feature")
+	private boolean checkInUpdateNotificationEnabled = false;
+
 	public boolean isForceUpdate() {
 		return forceUpdate;
 	}
@@ -107,4 +110,12 @@ public Map<String, String> getTestInformationUrls() {
 	public void setTestInformationUrls(Map<String, String> testInformationUrls) {
 		this.testInformationUrls = testInformationUrls;
 	}
+
+	public void setCheckInUpdateNotificationEnabled(boolean checkInUpdateNotificationEnabled) {
+		this.checkInUpdateNotificationEnabled = checkInUpdateNotificationEnabled;
+	}
+
+	public boolean isCheckInUpdateNotificationEnabled() {
+		return checkInUpdateNotificationEnabled;
+	}
 }