Merge pull request #33 from corona-warn-app/feat/user-agent-logging

Feat: Improve User Agent Logging
corona-warn-app · Apr 13, 2022 · 7e3d444 · 7e3d444
2 parents ff8ce77 + a8c4b65
commit 7e3d444
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/businessrule/repository/UserAgentLogRepository.java b/src/main/java/eu/europa/ec/dgc/businessrule/repository/UserAgentLogRepository.java
@@ -33,6 +33,10 @@ public interface UserAgentLogRepository extends JpaRepository<UserAgentLogEntity
     Optional<UserAgentLogEntity> getFirstByTimestampAndUserAgentAndAndRequestString(
         ZonedDateTime timestamp, String userAgent, String requestString);
 
+    @Query("UPDATE UserAgentLogEntity e SET e.count = :count WHERE e.id = :id")
+    @Modifying
+    int updateCount(@Param("id") Long id, @Param("count") Long count);
+
     @Query("DELETE FROM UserAgentLogEntity e WHERE e.timestamp < :threshold")
     @Modifying
     int cleanup(@Param("threshold") ZonedDateTime threshold);

diff --git a/src/main/java/eu/europa/ec/dgc/businessrule/service/UserAgentLogPersistenceService.java b/src/main/java/eu/europa/ec/dgc/businessrule/service/UserAgentLogPersistenceService.java
@@ -54,8 +54,7 @@ public void increaseCount(ZonedDateTime timestamp, String userAgent, String requ
         if (existingEntityOptional.isPresent()) {
             log.debug("Entity for K/V Pair already exists, increasing count.");
             UserAgentLogEntity existingEntity = existingEntityOptional.get();
-            existingEntity.setCount(existingEntity.getCount() + amount);
-            userAgentLogRepository.save(existingEntity);
+            userAgentLogRepository.updateCount(existingEntity.getId(), existingEntity.getCount() + amount);
         } else {
             log.debug("Entity for K/V Pair does not exist, creating new one.");
             userAgentLogRepository.save(
@@ -69,6 +68,7 @@ public void increaseCount(ZonedDateTime timestamp, String userAgent, String requ
      * @param threshold Threshold timestamp
      * @return Number of deleted entities
      */
+    @Transactional
     public int cleanup(ZonedDateTime threshold) {
         return userAgentLogRepository.cleanup(threshold);
     }