migrate to cosmos mongo db reactive

pagopa · Nov 28, 2024 · 6598639 · 6598639
1 parent 29466ce
commit 6598639
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 141 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,15 +29,14 @@ ext {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+	implementation 'org.springframework.boot:spring-boot-starter-data-mongodb-reactive'
 
 //   spring security + oauth2 resource server
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
 	implementation 'org.springframework.security:spring-security-oauth2-jose'
-	implementation("org.springframework.boot:spring-boot-starter-actuator")
 
 //	implementation 'com.azure.spring:spring-cloud-azure-starter-actuator'
-	implementation 'com.azure.spring:spring-cloud-azure-starter-data-cosmos'
 	implementation("io.swagger.core.v3:swagger-annotations:2.2.8")
 	implementation("org.openapitools:jackson-databind-nullable:0.2.6")
 	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")

diff --git a/src/main/java/it/gov/pagopa/rtp/activator/configuration/CosmosDBConfig.java b/src/main/java/it/gov/pagopa/rtp/activator/configuration/CosmosDBConfig.java
diff --git a/src/main/java/it/gov/pagopa/rtp/activator/configuration/CosmosPropertiesConfig.java b/src/main/java/it/gov/pagopa/rtp/activator/configuration/CosmosPropertiesConfig.java
diff --git a/src/main/java/it/gov/pagopa/rtp/activator/repository/ActivationDB.java b/src/main/java/it/gov/pagopa/rtp/activator/repository/ActivationDB.java
@@ -1,9 +1,13 @@
 package it.gov.pagopa.rtp.activator.repository;
 
-import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository;
+
+
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
+import org.springframework.stereotype.Repository;
 
 import reactor.core.publisher.Mono;
 
-public interface ActivationDB extends ReactiveCosmosRepository<ActivationEntity, String> {
+@Repository
+public interface ActivationDB extends ReactiveMongoRepository<ActivationEntity, String> {
     Mono<ActivationEntity> findByFiscalCode(String fiscalCode);
 }
diff --git a/src/main/java/it/gov/pagopa/rtp/activator/repository/ActivationEntity.java b/src/main/java/it/gov/pagopa/rtp/activator/repository/ActivationEntity.java
@@ -2,8 +2,8 @@
 
 import java.time.Instant;
 
-import com.azure.spring.data.cosmos.core.mapping.Container;
-import com.azure.spring.data.cosmos.core.mapping.PartitionKey;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -14,12 +14,12 @@
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Container(containerName = "activations", autoCreateContainer = false)
+@Document("activations")
 public class ActivationEntity {
+    @Id
     private String id;
     private String rtpSpId;
     private Instant effectiveActivationDate;
 
-    @PartitionKey
     private String fiscalCode;
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -10,7 +10,6 @@ management.endpoint.health.probes.enabled=true
 
 #repository
 
-azure.cosmos.uri=${COSMOS_ACCOUNT_RTP_ENDPOINT:}
-azure.cosmos.key=${AZURE_COSMOS_KEY:}
-azure.cosmos.database=${DB_NAME:rtp}
+spring.data.mongodb.uri=${COSMOS_ACCOUNT_RTP_CONNECTION_STRING:}
+spring.data.mongodb.database=${DB_NAME:rtp}
 activation.base-url=${BASE_URL:http://localhost}
diff --git a/src/main/terraform/env/cstar-d-weu-rtp/terraform.tfvars b/src/main/terraform/env/cstar-d-weu-rtp/terraform.tfvars
@@ -43,7 +43,7 @@ rtp_activator_base_url                          = "https://mil-d-apim.azure-api.
 
 
 rtp_environment_secrets = {
-  COSMOS_ACCOUNT_RTP_ENDPOINT           : "cosmosdb-account-rtp-endpoint"
+  COSMOS_ACCOUNT_RTP_CONNECTION_STRING  : "cosmosdb-account-rtp-connection-string"
   AZURE_COSMOS_KEY                      : "azure-cosmos-key"
   APPLICATIONINSIGHTS_CONNECTION_STRING : "appinsights-connection-string"
 }

diff --git a/src/main/terraform/env/cstar-p-weu-rtp/terraform.tfvars b/src/main/terraform/env/cstar-p-weu-rtp/terraform.tfvars
@@ -42,7 +42,7 @@ rtp_activator_min_replicas                      = 1
 rtp_activator_base_url                          = "https://mil-d-apim.azure-api.net/rtp_activator"
 
 rtp_environment_secrets = {
-  COSMOS_ACCOUNT_RTP_ENDPOINT           : "cosmosdb-account-rtp-endpoint"
+  COSMOS_ACCOUNT_RTP_CONNECTION_STRING  : "cosmosdb-account-rtp-connection-string"
   APPLICATIONINSIGHTS_CONNECTION_STRING : "appinsights-connection-string"
   AZURE_COSMOS_KEY                      : "azure-cosmos-key"
 }

diff --git a/src/main/terraform/env/cstar-u-weu-rtp/terraform.tfvars b/src/main/terraform/env/cstar-u-weu-rtp/terraform.tfvars
@@ -43,7 +43,7 @@ rtp_activator_base_url                          = "https://mil-d-apim.azure-api.
 
 
 rtp_environment_secrets = {
-  COSMOS_ACCOUNT_RTP_ENDPOINT           : "cosmosdb-account-rtp-endpoint"
+  COSMOS_ACCOUNT_RTP_CONNECTION_STRING  : "cosmosdb-account-rtp-connection-string"
   APPLICATIONINSIGHTS_CONNECTION_STRING : "appinsights-connection-string"
   AZURE_COSMOS_KEY                      : "azure-cosmos-key"
 }

diff --git a/src/test/java/it/gov/pagopa/rtp/activator/configuration/CosmosDBConfigTest.java b/src/test/java/it/gov/pagopa/rtp/activator/configuration/CosmosDBConfigTest.java
diff --git a/src/test/java/it/gov/pagopa/rtp/activator/configuration/CosmosPropertiesConfigTest.java b/src/test/java/it/gov/pagopa/rtp/activator/configuration/CosmosPropertiesConfigTest.java