From d9cd408dc90bd3b2181b7683288f0c3b6b0c038e Mon Sep 17 00:00:00 2001
From: Michael Schulte <65006436+mschulte-tsi@users.noreply.github.com>
Date: Thu, 27 May 2021 13:32:18 +0200
Subject: [PATCH] fix/fixed fake to return seconds (#231)

---
 .../verification/controller/ExternalTestStateController.java  | 3 ++-
 .../coronawarn/verification/service/FakeRequestService.java   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/app/coronawarn/verification/controller/ExternalTestStateController.java b/src/main/java/app/coronawarn/verification/controller/ExternalTestStateController.java
index 95e2bd13..43100216 100644
--- a/src/main/java/app/coronawarn/verification/controller/ExternalTestStateController.java
+++ b/src/main/java/app/coronawarn/verification/controller/ExternalTestStateController.java
@@ -16,6 +16,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Optional;
 import java.util.concurrent.Executors;
@@ -141,7 +142,7 @@ private TestResult generateReturnTestResult(Integer testResult, String fake, Lon
     if (fake == null) {
       return new TestResult(testResult,cs, RandomStringUtils.randomAlphanumeric(RESPONSE_PADDING_LENGTH));
     }
-    return new TestResult(testResult, System.currentTimeMillis(),
+    return new TestResult(testResult, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC),
       RandomStringUtils.randomAlphanumeric(RESPONSE_PADDING_LENGTH));
   }
 
diff --git a/src/main/java/app/coronawarn/verification/service/FakeRequestService.java b/src/main/java/app/coronawarn/verification/service/FakeRequestService.java
index 6f86a0fb..f7e0d907 100644
--- a/src/main/java/app/coronawarn/verification/service/FakeRequestService.java
+++ b/src/main/java/app/coronawarn/verification/service/FakeRequestService.java
@@ -28,6 +28,8 @@
 import app.coronawarn.verification.model.RegistrationTokenRequest;
 import app.coronawarn.verification.model.Tan;
 import app.coronawarn.verification.model.TestResult;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -108,7 +110,7 @@ public DeferredResult<ResponseEntity<TestResult>> getTestState(
     long delay = fakeDelayService.getLongestJitter();
     DeferredResult<ResponseEntity<TestResult>> deferredResult = new DeferredResult<>();
     scheduledExecutor.schedule(() -> deferredResult.setResult(ResponseEntity
-      .ok(new TestResult(LabTestResult.POSITIVE.getTestResult(), System.currentTimeMillis(),
+      .ok(new TestResult(LabTestResult.POSITIVE.getTestResult(), LocalDateTime.now().toEpochSecond(ZoneOffset.UTC),
         RandomStringUtils.randomAlphanumeric(TEST_RESPONSE_PADDING_LENGTH)))), delay, MILLISECONDS);
     return deferredResult;
   }