change foreign rules sync schedule

admin-ch · Mar 25, 2022 · 326caa3 · 326caa3
1 parent 38a1c4c
commit 326caa3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.../ch/admin/bag/covidcertificate/backend/verifier/sync/config/SyncSchedulingBaseConfig.java b/.../ch/admin/bag/covidcertificate/backend/verifier/sync/config/SyncSchedulingBaseConfig.java
@@ -86,7 +86,7 @@ public void valueSetCleanCron() {
         valueSetDataService.deleteOldValueSets();
     }
 
-    @Scheduled(cron = "${foreign-rules.sync.cron:0 0 0 ? * *}")
+    @Scheduled(cron = "${foreign-rules.sync.cron:0 39 * ? * *}")
     @SchedulerLock(name = "foreign_rules_sync", lockAtLeastFor = "PT15S")
     public void foreignRulesSyncCron() {
         LockAssert.assertLocked();

diff --git a/...h/admin/bag/covidcertificate/backend/verifier/ws/controller/ForeignRulesControllerV2.java b/...h/admin/bag/covidcertificate/backend/verifier/ws/controller/ForeignRulesControllerV2.java
@@ -48,7 +48,7 @@ public ForeignRulesControllerV2(
         this.valueSetDataService = valueSetDataService;
     }
 
-    @GetMapping(value = "/countries")
+    @GetMapping(value = "/foreignRules")
     public @ResponseBody ResponseEntity<List<String>> getCountries(WebRequest request) {
         return ResponseEntity.ok(foreignRulesDataService.getCountries());
     }
@@ -62,6 +62,9 @@ public ForeignRulesControllerV2(
 
         // Add rules to output
         var foreignRules = foreignRulesDataService.getRulesForCountry(country);
+        if(foreignRules.isEmpty()){
+            return ResponseEntity.notFound().build();
+        }
 
         var rules =
                 foreignRules.stream()

diff --git a/...min/bag/covidcertificate/backend/verifier/ws/controller/ForeignRulesControllerV2Test.java b/...min/bag/covidcertificate/backend/verifier/ws/controller/ForeignRulesControllerV2Test.java
@@ -25,7 +25,7 @@ public class ForeignRulesControllerV2Test extends BaseControllerTest {
     protected MediaType acceptMediaType = MediaType.APPLICATION_JSON;
 
     private String atRulesUrl = "/trust/v2/foreignRules/AT";
-    private String countryListUrl = "/trust/v2/countries";
+    private String countryListUrl = "/trust/v2/foreignRules";
 
     @BeforeAll
     static void setup(){