DMP-4583: ARM Performance Analysis (#2623)

hmcts · Mar 3, 2025 · 47e4c98 · 47e4c98
1 parent 2605352
commit 47e4c98
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/src/integrationTest/java/uk/gov/hmcts/darts/testutils/PostgresIntegrationBase.java b/src/integrationTest/java/uk/gov/hmcts/darts/testutils/PostgresIntegrationBase.java
@@ -19,7 +19,7 @@
  * Base class for integration tests running against a containerized Postgres with Testcontainers.
  */
 @SpringBootTest
-@ActiveProfiles({"intTest"})
+@ActiveProfiles({"intTest", "in-memory-caching"})
 @Import(IntegrationTestConfiguration.class)
 public class PostgresIntegrationBase {
 
@@ -52,6 +52,10 @@ public class PostgresIntegrationBase {
         ).withDatabaseName("darts")
             .withUsername("darts")
             .withPassword("darts");
+        POSTGRES.setCommand("postgres", "-c", String.format("max_connections=%d", SERVER_MAX_CONNECTIONS));
+
+        // container will be automatically stopped
+        POSTGRES.start();
     }
 
     @DynamicPropertySource
@@ -61,12 +65,6 @@ static void configureProperties(DynamicPropertyRegistry registry) {
         registry.add("spring.datasource.password", POSTGRES::getPassword);
     }
 
-    static {
-        POSTGRES.setCommand("postgres", "-c", String.format("max_connections=%d", SERVER_MAX_CONNECTIONS));
-
-        // container will be automatically stopped
-        POSTGRES.start();
-    }
 
     @BeforeEach
     void clearDb() {

diff --git a/src/main/java/uk/gov/hmcts/darts/arm/helper/DataStoreToArmHelper.java b/src/main/java/uk/gov/hmcts/darts/arm/helper/DataStoreToArmHelper.java
@@ -34,7 +34,6 @@
 import java.util.UUID;
 
 import static java.util.Objects.nonNull;
-import static uk.gov.hmcts.darts.common.enums.ExternalLocationTypeEnum.ARM;
 import static uk.gov.hmcts.darts.common.enums.ObjectRecordStatusEnum.ARM_INGESTION;
 import static uk.gov.hmcts.darts.common.enums.ObjectRecordStatusEnum.ARM_RAW_DATA_FAILED;
 import static uk.gov.hmcts.darts.common.util.EodHelper.equalsAnyStatus;
@@ -135,9 +134,8 @@ public void updateExternalObjectDirectoryStatus(ExternalObjectDirectoryEntity ar
     public ExternalObjectDirectoryEntity createArmExternalObjectDirectoryEntity(ExternalObjectDirectoryEntity externalObjectDirectory,
                                                                                 ObjectRecordStatusEntity status,
                                                                                 UserAccountEntity userAccount) {
-
         ExternalObjectDirectoryEntity armExternalObjectDirectoryEntity = new ExternalObjectDirectoryEntity();
-        armExternalObjectDirectoryEntity.setExternalLocationType(externalLocationTypeRepository.getReferenceById(ARM.getId()));
+        armExternalObjectDirectoryEntity.setExternalLocationType(EodHelper.armLocation());
         armExternalObjectDirectoryEntity.setStatus(status);
         armExternalObjectDirectoryEntity.setExternalLocation(externalObjectDirectory.getExternalLocation());
         armExternalObjectDirectoryEntity.setVerificationAttempts(1);

diff --git a/src/main/java/uk/gov/hmcts/darts/common/config/SimpleCacheConfig.java b/src/main/java/uk/gov/hmcts/darts/common/config/SimpleCacheConfig.java
@@ -19,6 +19,4 @@ public CacheManager cacheManager() {
         log.debug("Using in memory caching ...");
         return new ConcurrentMapCacheManager();
     }
-
-
 }
diff --git a/src/main/java/uk/gov/hmcts/darts/common/repository/ExternalLocationTypeRepository.java b/src/main/java/uk/gov/hmcts/darts/common/repository/ExternalLocationTypeRepository.java
@@ -1,10 +1,20 @@
 package uk.gov.hmcts.darts.common.repository;
 
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import uk.gov.hmcts.darts.common.entity.ExternalLocationTypeEntity;
 
+import java.util.Optional;
+
 @Repository
 public interface ExternalLocationTypeRepository extends JpaRepository<ExternalLocationTypeEntity, Integer> {
 
+    @Cacheable("externalLocationTypeEntity")
+    @Override
+    ExternalLocationTypeEntity getReferenceById(Integer id);
+
+    @Cacheable("externalLocationTypeEntityOptional")
+    @Override
+    Optional<ExternalLocationTypeEntity> findById(Integer id);
 }
diff --git a/src/main/java/uk/gov/hmcts/darts/common/repository/ObjectRecordStatusRepository.java b/src/main/java/uk/gov/hmcts/darts/common/repository/ObjectRecordStatusRepository.java
@@ -1,12 +1,14 @@
 package uk.gov.hmcts.darts.common.repository;
 
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import uk.gov.hmcts.darts.common.entity.ObjectRecordStatusEntity;
 import uk.gov.hmcts.darts.common.enums.ObjectRecordStatusEnum;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface ObjectRecordStatusRepository extends JpaRepository<ObjectRecordStatusEntity, Integer> {
@@ -19,4 +21,11 @@ default List<ObjectRecordStatusEntity> getReferencesByStatus(List<ObjectRecordSt
         return responseList;
     }
 
+    @Cacheable("objectRecordStatusEntity")
+    @Override
+    ObjectRecordStatusEntity getReferenceById(Integer id);
+
+    @Cacheable("objectRecordStatusEntityOptional")
+    @Override
+    Optional<ObjectRecordStatusEntity> findById(Integer id);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,4 @@ public CacheManager cacheManager() { @@
             log.debug("Using in memory caching ...");
             return new ConcurrentMapCacheManager();
         }
     }