Improve Logging (#106)

* Add Check CertificateType match ID Prefix for ValidationRules

* Improve Logging of ValidationRule Controller

docs/software-design-dgc-gateway.md

@@ -205,21 +205,19 @@ These key-value-pairs can be followed by additional attributes. The additional a
 | **Download Interface**
 | Trust List was downloaded by a country | INFO | Downloaded TrustList | downloadedKeys (Number of Keys), downloadedKeysCountry (Downloader Country), downloadedKeysType (optional) |
 | **Validation Rule**
-| A Member State is trying to upload a new ValidationRule | INFO | Upload validation rule. | n/a |
-| Upload of ValidationRule failed | ERROR | Failed to upload validation rule | validationRuleUploadError, validationRuleUploadReason |
-| A Member State has uploaded a new ValidationRule | INFO | Inserted validation rule. | n/a |
-| A Member State is trying to delete a ValidationRule | INFO | Delete validation rules. | n/a |
-| A Member State has deleted ValidationRules | INFO | Deleted validation rules | validationDeleteAmount, validationDownloadId |
-| A Member State is downloading ValidationRules | INFO | Downloading validation rules. | n/a |
-| A Member State has downloaded ValidationRules | INFO | Downloading validation rules. | validationDownloadAmount, validationDownloadRequester, validationDownloadRequested |
+| A Member State is trying to upload a new ValidationRule | INFO | Rule Upload Request | n/a |
+| Upload of ValidationRule failed | ERROR | Rule Upload Failed | validationRuleUploadError, validationRuleUploadReason |
+| A Member State has uploaded a new ValidationRule | INFO | Rule Upload Success | n/a |
+| A Member State is trying to delete a ValidationRule | INFO | Rule Delete Request | n/a |
+| A Member State has deleted ValidationRules | INFO | Rule Delete Success | validationDeleteAmount, validationDownloadId |
+| A Member State is downloading ValidationRules | INFO | Rule Download Request | n/a |
+| A Member State has downloaded ValidationRules | INFO |Rule Download Success | validationDownloadAmount, validationDownloadRequester, validationDownloadRequested |
 
-
-
 # Integration into Data Center Infrastructure
 
 ## Load Balancer Integration
-The load balancer terminates TLS, executes the mutual TLS authentication 
-and forwards the http request to a worker node.
+
+The load balancer terminates TLS, executes the mutual TLS authentication and forwards the http request to a worker node.
 
 The IP of the load balancer is assigned to registered domain name.
 

src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleController.java

@@ -112,7 +112,7 @@ public ResponseEntity<Map<String, List<ValidationRuleDto>>> downloadValidationRu
         @RequestAttribute(CertificateAuthenticationFilter.REQUEST_PROP_COUNTRY) String requesterCountryCode
     ) {
 
-        log.info("Downloading validation rules.");
+        log.info("Rule Download Request");
 
         List<ValidationRuleEntity> validationRuleEntities =
             validationRuleService.getActiveValidationRules(requestedCountryCode);
@@ -126,7 +126,7 @@ public ResponseEntity<Map<String, List<ValidationRuleDto>>> downloadValidationRu
         DgcMdc.put(MDC_VALIDATION_RULE_DOWNLOAD_AMOUNT, validationRuleEntities.size());
         DgcMdc.put(MDC_VALIDATION_RULE_DOWNLOAD_REQUESTER, requesterCountryCode);
         DgcMdc.put(MDC_VALIDATION_RULE_DOWNLOAD_REQUESTED, requestedCountryCode);
-        log.info("Downloaded validation rules.");
+        log.info("Rule Download Success");
 
         return ResponseEntity.ok(map);
     }
@@ -170,7 +170,7 @@ public ResponseEntity<Void> uploadValidationRule(
         @RequestAttribute(CertificateAuthenticationFilter.REQUEST_PROP_THUMBPRINT) String thumbprint
     ) {
 
-        log.info("Upload validation rule.");
+        log.info("Rule Upload Request");
 
         if (!signedJson.isVerified()) {
             throw new DgcgResponseException(HttpStatus.BAD_REQUEST, "0x260", "CMS signature is invalid", "",
@@ -188,7 +188,7 @@ public ResponseEntity<Void> uploadValidationRule(
         } catch (ValidationRuleService.ValidationRuleCheckException e) {
             DgcMdc.put("validationRuleUploadError", e.getMessage());
             DgcMdc.put("validationRuleUploadReason", e.getReason().toString());
-            log.error("Failed to upload validation rule");
+            log.error("Rule Upload Failed");
 
             switch (e.getReason()) {
                 case INVALID_JSON:
@@ -216,7 +216,7 @@ public ResponseEntity<Void> uploadValidationRule(
         }
 
 
-        log.info("Inserted validation rule.");
+        log.info("Rule Upload Success");
 
         auditService.addAuditEvent(
             authenticatedCountryCode,
@@ -273,7 +273,7 @@ public ResponseEntity<Void> deleteValidationRules(
         @RequestAttribute(CertificateAuthenticationFilter.REQUEST_PROP_THUMBPRINT) String thumbprint
     ) {
 
-        log.info("Delete validation rules.");
+        log.info("Rule Delete Request");
 
         if (!signedString.isVerified()) {
             throw new DgcgResponseException(HttpStatus.BAD_REQUEST, "0x260", "CMS signature is invalid", "",
@@ -314,7 +314,7 @@ public ResponseEntity<Void> deleteValidationRules(
 
         DgcMdc.put(MDC_VALIDATION_RULE_DELETE_AMOUNT, deleted);
         DgcMdc.put(MDC_VALIDATION_RULE_DELETE_ID, signedString.getPayloadString());
-        log.info("Deleted validation rules.");
+        log.info("Rule Delete Success");
 
         auditService.addAuditEvent(
             authenticatedCountryCode,

src/main/java/eu/europa/ec/dgc/gateway/service/ValidationRuleService.java

@@ -122,13 +122,7 @@ public List<ValidationRuleEntity> getActiveValidationRules(String country) {
      * @return amount of deleted entities.
      */
     public int deleteByRuleId(String ruleId) {
-        int deleted = validationRuleRepository.deleteByRuleId(ruleId);
-
-        DgcMdc.put("deletedAmount", deleted);
-        DgcMdc.put("ruleId", ruleId);
-        log.info("Deleted Validation Rules");
-
-        return deleted;
+        return validationRuleRepository.deleteByRuleId(ruleId);
     }
 
     /**