📝 CodeRabbit Chat: Refactor CaptchaService to use AtomicLong counter for invalidated payloads

Author: coderabbitai[bot]

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

@@ -12,6 +12,7 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.Gauge;
+import java.util.concurrent.atomic.AtomicLong;
 import lombok.extern.slf4j.Slf4j;
 import org.altcha.altcha.Altcha;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -29,6 +30,7 @@ public class CaptchaService {
     private final Counter challengeCounter;
     private final Counter verifySuccessCounter;
     private final DistributionSummary tookTimeSummary;
+    private final AtomicLong invalidatedPayloadCount = new AtomicLong(0);
 
     @SuppressFBWarnings(value = { "EI_EXPOSE_REP2" }, justification = "Dependency Injection")
     public CaptchaService(final CaptchaProperties captchaProperties, final DifficultyService difficultyService,
@@ -37,6 +39,9 @@ public CaptchaService(final CaptchaProperties captchaProperties, final Difficult
         this.invalidatedPayloadRepository = invalidatedPayloadRepository;
         this.difficultyService = difficultyService;
 
+        // Initialize counter with current count from database
+        this.invalidatedPayloadCount.set(invalidatedPayloadRepository.countByExpiresAtGreaterThan(Instant.now()));
+
         // Initialize metrics
         this.challengeCounter = Counter.builder("captcha.challenge.requests")
                 .description("Counter for captcha challenge requests")
@@ -47,7 +52,7 @@ public CaptchaService(final CaptchaProperties captchaProperties, final Difficult
         this.tookTimeSummary = DistributionSummary.builder("captcha.verify.took.time")
                 .description("Summary of the time taken to verify captcha payloads")
                 .register(registry);
-        Gauge.builder("captcha.invalidated.payloads", invalidatedPayloadRepository, repo -> repo.countByExpiresAtGreaterThan(Instant.now()))
+        Gauge.builder("captcha.invalidated.payloads", invalidatedPayloadCount, AtomicLong::get)
                 .description("Gauge for the number of currently invalidated payloads")
                 .register(registry);
     }
@@ -92,6 +97,7 @@ public boolean verify(final String siteKey, final ExtendedPayload payload) {
     public void invalidatePayload(final Altcha.Payload payload) {
         final String payloadHash = getPayloadHash(payload);
         final InvalidatedPayload invalidatedPayload = new InvalidatedPayload(payloadHash, Instant.now().plusSeconds(captchaProperties.captchaTimeoutSeconds()));
+        invalidatedPayloadCount.incrementAndGet();
         invalidatedPayloadRepository.save(invalidatedPayload);
         log.debug("Invalidated payloadHash: {}", payloadHash);
     }
@@ -113,4 +119,14 @@ private static String getPayloadHash(final Altcha.Payload payload) {
                 payload.signature));
     }
 
+
+    /**
+     * Decrements the invalidated payload counter when expired payloads are cleaned up.
+     * This method should be called by the ExpiredDataService when it removes expired entries.
+     * 
+     * @param count the number of expired payloads that were removed
+     */
+    public void decrementInvalidatedPayloadCount(long count) {
+        invalidatedPayloadCount.addAndGet(-count);
+    }
 }

captchaservice-backend/src/main/java/de/muenchen/captchaservice/service/expireddata/ExpiredDataService.java

@@ -2,6 +2,7 @@
 
 import de.muenchen.captchaservice.repository.CaptchaRequestRepository;
 import de.muenchen.captchaservice.repository.InvalidatedPayloadRepository;
+import de.muenchen.captchaservice.service.captcha.CaptchaService;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import jakarta.transaction.Transactional;
 import lombok.extern.slf4j.Slf4j;
@@ -14,11 +15,13 @@
 public class ExpiredDataService {
     private final CaptchaRequestRepository captchaRequestRepository;
     private final InvalidatedPayloadRepository invalidatedPayloadRepository;
+    private final CaptchaService captchaService;
 
     @SuppressFBWarnings(value = { "EI_EXPOSE_REP2" }, justification = "Dependency Injection")
-    public ExpiredDataService(final CaptchaRequestRepository captchaRequestRepository, final InvalidatedPayloadRepository invalidatedPayloadRepository) {
+    public ExpiredDataService(final CaptchaRequestRepository captchaRequestRepository, final InvalidatedPayloadRepository invalidatedPayloadRepository, final CaptchaService captchaService) {
         this.captchaRequestRepository = captchaRequestRepository;
         this.invalidatedPayloadRepository = invalidatedPayloadRepository;
+        this.captchaService = captchaService;
     }
 
     @Transactional
@@ -31,6 +34,7 @@ public void deleteExpiredData() {
         final long deletedInvalidatedPayloadCount = invalidatedPayloadRepository.deleteByExpiresAtLessThan(now);
         if (deletedInvalidatedPayloadCount > 0) {
             log.info("Deleted {} expired InvalidatedPayloads", deletedInvalidatedPayloadCount);
+            captchaService.decrementInvalidatedPayloadCount(deletedInvalidatedPayloadCount);
         }
     }
 }