Merge pull request #27 from admin-ch/develop

New Debug Log Information
admin-ch · Jun 23, 2020 · 610a39f · 610a39f
2 parents 8ad88fb + 8c16d37
commit 610a39f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...ain/java/ch/admin/bag/covidcode/authcodegeneration/service/AuthCodeGenerationService.java b/...ain/java/ch/admin/bag/covidcode/authcodegeneration/service/AuthCodeGenerationService.java
@@ -15,6 +15,9 @@
 import java.security.SecureRandom;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+import static net.logstash.logback.argument.StructuredArguments.kv;
 
 @Service
 @Transactional(readOnly = true)
@@ -45,7 +48,7 @@ public AuthorizationCodeResponseDto create(AuthorizationCodeCreateDto createDto)
         AuthorizationCode authorizationCode = new AuthorizationCode(authCode, createDto.getOnsetDate(), createDto.getOnsetDate().minusDays(onsetSubtractionDays), ZonedDateTime.now().plusMinutes(codeExpirationDelay));
         authorizationCodeRepository.saveAndFlush(authorizationCode);
         log.info("New authorizationCode saved with id '{}'.", authorizationCode.getId());
-        log.debug("New authorizationCode saved with id '{}' and code '{}' and onset '{}'.", authorizationCode.getId(), authorizationCode.getCode(), authorizationCode.getOnsetDate());
+        log.debug("New authorizationCode saved: {}, {}, {}.", kv("id", authorizationCode.getId()), kv("creationDateTime", authorizationCode.getCreationDateTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)), kv("onsetDate",authorizationCode.getOnsetDate()));
         return new AuthorizationCodeResponseDto(authorizationCode.getCode());
     }
 

diff --git a/...n/java/ch/admin/bag/covidcode/authcodegeneration/service/AuthCodeVerificationService.java b/...n/java/ch/admin/bag/covidcode/authcodegeneration/service/AuthCodeVerificationService.java
@@ -12,6 +12,8 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
+import static net.logstash.logback.argument.StructuredArguments.kv;
+
 @Service
 @Transactional(readOnly = true)
 @Slf4j
@@ -48,6 +50,7 @@ public AuthorizationCodeVerifyResponseDto verify(String code, String fake) {
         }
 
         existingCode.incrementCallCount();
+        log.debug("AuthorizationCode verified: '{}', '{}'", kv("id", existingCode.getId()), kv("callCount", existingCode.getCallCount()));
         return new AuthorizationCodeVerifyResponseDto(tokenProvider.createToken(existingCode.getOnsetDate().format(DATE_FORMATTER), fake));
 
     }