applied coderabbit reviews

Author: tobiasholler

captchaservice-backend/src/main/java/de/muenchen/captchaservice/entity/CaptchaRequest.java

@@ -14,7 +14,8 @@
 @Entity
 @Table(
         indexes = {
-                @Index(name = "idx_captcha_request_source_address_hash", columnList = "sourceAddressHash")
+                @Index(name = "idx_captcha_request_source_address_hash", columnList = "sourceAddressHash"),
+                @Index(name = "idx_captcha_request_valid_until", columnList = "validUntil")
         }
 )
 

captchaservice-backend/src/main/java/de/muenchen/captchaservice/entity/InvalidatedPayload.java

@@ -14,7 +14,8 @@
 @Entity
 @Table(
         indexes = {
-                @Index(name = "idx_invalidated_payload_payload_hash", columnList = "payloadHash")
+                @Index(name = "idx_invalidated_payload_payload_hash", columnList = "payloadHash"),
+                @Index(name = "idx_invalidated_payload_valid_until", columnList = "validUntil")
         }
 )
 // Definition of getter, setter, ...

captchaservice-backend/src/main/java/de/muenchen/captchaservice/repository/CaptchaRequestRepository.java

@@ -12,5 +12,5 @@ public interface CaptchaRequestRepository extends PagingAndSortingRepository<Cap
 
     long deleteByValidUntilLessThan(Instant validUntil);
 
-    int countBySourceAddressHash(String sourceAddressHash);
+    int countBySourceAddressHashIgnoreCase(String sourceAddressHash);
 }

captchaservice-backend/src/main/java/de/muenchen/captchaservice/service/difficulty/DifficultyService.java

@@ -32,7 +32,7 @@ public void registerRequest(final SourceAddress sourceAddress) {
         final CaptchaRequest captchaRequest = new CaptchaRequest(sourceAddressHash,
                 Instant.now().plusSeconds(captchaProperties.sourceAddressWindowSeconds()));
         captchaRequestRepository.save(captchaRequest);
-        log.debug("Poked source address with hash {}", sourceAddressHash);
+        log.debug("Registered request for source address with hash {}", sourceAddressHash);
     }
 
     public long getDifficultyForSourceAddress(final String siteKey, final SourceAddress sourceAddress) {

captchaservice-backend/src/main/java/de/muenchen/captchaservice/service/invalidateddate/InvalidatedDataService.java

@@ -23,11 +23,12 @@ public InvalidatedDataService(final CaptchaRequestRepository captchaRequestRepos
 
     @Transactional
     public void deleteInvalidatedData() {
-        final long deletedCaptchaRequestCount = captchaRequestRepository.deleteByValidUntilLessThan(Instant.now());
+        Instant now = Instant.now();
+        final long deletedCaptchaRequestCount = captchaRequestRepository.deleteByValidUntilLessThan(now);
         if (deletedCaptchaRequestCount > 0) {
             log.info("Deleted {} invalid CaptchaRequests", deletedCaptchaRequestCount);
         }
-        final long deletedInvalidatedPayloadCount = invalidatedPayloadRepository.deleteByValidUntilLessThan(Instant.now());
+        final long deletedInvalidatedPayloadCount = invalidatedPayloadRepository.deleteByValidUntilLessThan(now);
         if (deletedInvalidatedPayloadCount > 0) {
             log.info("Deleted {} invalid InvalidatedPayloads", deletedInvalidatedPayloadCount);
         }

captchaservice-backend/src/main/java/de/muenchen/captchaservice/task/DeleteInvalidatedDataTask.java

@@ -20,6 +20,10 @@ public DeleteInvalidatedDataTask(final InvalidatedDataService invalidatedDataSer
 
     @Scheduled(fixedRate = 1, timeUnit = TimeUnit.HOURS)
     public void deleteInvalidatedData() {
-        invalidatedDataService.deleteInvalidatedData();
+        try {
+            invalidatedDataService.deleteInvalidatedData();
+        } catch (Exception e) {
+            log.error("Failed to delete invalidated data", e);
+        }
     }
 }

captchaservice-backend/src/main/resources/db/migration/schema/V001__Init.sql

@@ -16,4 +16,8 @@ CREATE TABLE invalidated_payload
 
 CREATE INDEX idx_captcha_request_source_address_hash ON captcha_request (source_address_hash);
 
-CREATE INDEX idx_invalidated_payload_payload_hash ON invalidated_payload (payload_hash);
+CREATE INDEX idx_captcha_request_valid_until ON captcha_request (valid_until);
+
+CREATE INDEX idx_invalidated_payload_payload_hash ON invalidated_payload (payload_hash);
+
+CREATE INDEX idx_invalidated_payload_valid_until ON invalidated_payload (valid_until);

captchaservice-backend/src/test/java/de/muenchen/captchaservice/service/invalidateddate/InvalidatedDataServiceTest.java

@@ -67,7 +67,7 @@ void deleteInvalidatedData() {
 
         assertEquals(2, invalidatedPayloadRepository.count());
         assertEquals(2, captchaRequestRepository.count());
-        assertEquals(2, captchaRequestRepository.countBySourceAddressHash(validHash));
+        assertEquals(2, captchaRequestRepository.countBySourceAddressHashIgnoreCase(validHash));
         assertEquals(2, invalidatedPayloadRepository.countByPayloadHash(validHash));
     }
 

captchaservice-backend/src/test/resources/application-test.yml

@@ -1,7 +1,17 @@
 spring:
   jpa:
     hibernate:
-      ddl-auto: create-drop
+      # schema is managed by Flyway, only validate
+      ddl-auto: validate
+  flyway:
+    locations:
+      - classpath:db/migration/schema
+
+# Uncomment for testing purposes
+#spring:
+#  jpa:
+#    hibernate:
+#      ddl-auto: create-drop
 
 security:
   # possible values: none, all, changing (With changing, only changing requests such as POST, PUT, DELETE are logged)