Add resetInvalidatedPayloadCount method and update tests to utilize it

Author: Fabinatix97

captchaservice-backend/src/main/java/de/muenchen/captchaservice/service/captcha/CaptchaService.java

@@ -122,4 +122,10 @@ private static String getPayloadHash(final Altcha.Payload payload) {
     public void decrementInvalidatedPayloadCount(long count) {
         invalidatedPayloadCount.addAndGet(-count);
     }
+
+    public void resetInvalidatedPayloadCount() {
+        this.invalidatedPayloadCount.set(
+            invalidatedPayloadRepository.countByExpiresAtGreaterThan(java.time.Instant.now())
+        );
+    }
 }

captchaservice-backend/src/test/java/de/muenchen/captchaservice/controller/captcha/CaptchaControllerTest.java

@@ -6,6 +6,8 @@
 import de.muenchen.captchaservice.controller.captcha.request.PostVerifyRequest;
 import de.muenchen.captchaservice.data.ExtendedPayload;
 import de.muenchen.captchaservice.repository.CaptchaRequestRepository;
+import de.muenchen.captchaservice.service.captcha.CaptchaService;
+import de.muenchen.captchaservice.service.expireddata.ExpiredDataService;
 import de.muenchen.captchaservice.util.DatabaseTestUtil;
 import lombok.SneakyThrows;
 import org.altcha.altcha.Altcha;
@@ -83,6 +85,12 @@ class CaptchaControllerTest {
     @Value("${captcha.captcha-timeout-seconds}")
     private int captchaTimeoutSeconds;
 
+    @Autowired
+    private ExpiredDataService expiredDataService;
+
+    @Autowired
+    private CaptchaService captchaService;
+
     @Test
     void postChallenge_basic() {
         final Altcha.ChallengeOptions challengeOptions = new Altcha.ChallengeOptions();
@@ -304,6 +312,7 @@ void testVerifyMetricsIncrement() {
     @SneakyThrows
     void testInvalidatedPayloadsGauge() {
         databaseTestUtil.clearDatabase();
+        captchaService.resetInvalidatedPayloadCount();
         final PostVerifyRequest verifyRequest = new PostVerifyRequest(TEST_SITE_KEY, TEST_SITE_SECRET, TEST_PAYLOAD);
         final String verifyRequestBody = objectMapper.writeValueAsString(verifyRequest);
 
@@ -324,7 +333,9 @@ void testInvalidatedPayloadsGauge() {
                     .andExpect(status().isOk())
                     .andExpect(jsonPath("$.measurements[0].value", is(1.0)));
 
-            Thread.sleep(captchaTimeoutSeconds * 1000); // Wait for the payload to expire
+            // Simulate the expiration of the payload
+            Thread.sleep(captchaTimeoutSeconds * 1000);
+            expiredDataService.deleteExpiredData();
 
             mockMvc.perform(get("/actuator/metrics/captcha.invalidated.payloads"))
                     .andExpect(status().isOk())