fix: docs uses APP_PSEUDOMYMIZE_GPAS_PID_DOMAIN (#184)

(cherry picked from commit 7f7304ebca5744edd8423e1486adcf77d623a745)

4 files changed, 60 insertions, 1 deletions

diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/config/GPasConfigPropertiesTest.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/config/GPasConfigPropertiesTest.kt
new file mode 100644
index 0000000..66e0660
--- /dev/null
+++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/config/GPasConfigPropertiesTest.kt
@@ -0,0 +1,54 @@
+package dev.dnpm.etl.processor.config
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.springframework.boot.context.properties.EnableConfigurationProperties
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.context.runner.ApplicationContextRunner
+import org.springframework.test.context.ContextConfiguration
+
+
+@SpringBootTest
+@ContextConfiguration(
+    classes = [
+        GPasConfigProperties::class,
+    ]
+)
+class GPasConfigPropertiesTest {
+
+    @EnableConfigurationProperties(GPasConfigProperties::class)
+    class TestConfig {}
+
+    @Test
+    fun shouldUseConfiguredPatientDomainIfPidDomainGiven() {
+        ApplicationContextRunner()
+            .withUserConfiguration(TestConfig::class.java)
+            .withPropertyValues(
+                "app.pseudonymize.gpas.uri=http://localhost/",
+                "app.pseudonymize.gpas.pid-domain=test-pid-domain"
+            )
+            .run { context ->
+                val properties = context.getBean(GPasConfigProperties::class.java)
+
+                assertThat(properties).isNotNull
+                assertThat(properties.patientDomain).isEqualTo("test-pid-domain")
+            }
+    }
+
+    @Test
+    fun shouldUseConfiguredPatientDomain() {
+        ApplicationContextRunner()
+            .withUserConfiguration(TestConfig::class.java)
+            .withPropertyValues(
+                "app.pseudonymize.gpas.uri=http://localhost/",
+                "app.pseudonymize.gpas.patient-domain=test-patient-domain"
+            )
+            .run { context ->
+                val properties = context.getBean(GPasConfigProperties::class.java)
+
+                assertThat(properties).isNotNull
+                assertThat(properties.patientDomain).isEqualTo("test-patient-domain")
+            }
+    }
+
+}
\ No newline at end of file
diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGeneratorTest.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGeneratorTest.kt
index c2a8ba6..10f2359 100644
--- a/src/integrationTest/kotlin/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGeneratorTest.kt
+++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGeneratorTest.kt
@@ -50,6 +50,7 @@ class GpasPseudonymGeneratorTest {
         val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
         val gPasConfigProperties = GPasConfigProperties(
             "https://localhost:9990/ttp-fhir/fhir/gpas",
+            null,
             "test", "test2",
             null,
             null
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt
index 395dbd2..e5db63e 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt
@@ -21,6 +21,7 @@ package dev.dnpm.etl.processor.config
 
 import dev.dnpm.etl.processor.security.Role
 import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.boot.context.properties.DeprecatedConfigurationProperty
 
 @ConfigurationProperties(AppConfigProperties.NAME)
 data class AppConfigProperties(
@@ -47,7 +48,9 @@ data class PseudonymizeConfigProperties(
 @ConfigurationProperties(GPasConfigProperties.NAME)
 data class GPasConfigProperties(
     val uri: String?,
-    val patientDomain: String = "etl-processor",
+    @get:DeprecatedConfigurationProperty(since = "0.12")
+    val pidDomain: String?,
+    val patientDomain: String = pidDomain ?: "etl-processor",
     val genomDeTanDomain: String = "ccdn",
     val username: String?,
     val password: String?,
diff --git a/src/test/kotlin/dev/dnpm/etl/processor/monitoring/ConnectionCheckServiceTest.kt b/src/test/kotlin/dev/dnpm/etl/processor/monitoring/ConnectionCheckServiceTest.kt
index 788ca6a..7205714 100644
--- a/src/test/kotlin/dev/dnpm/etl/processor/monitoring/ConnectionCheckServiceTest.kt
+++ b/src/test/kotlin/dev/dnpm/etl/processor/monitoring/ConnectionCheckServiceTest.kt
@@ -74,6 +74,7 @@ class ConnectionCheckServiceTest {
 
             val gpasTargetProperties = GPasConfigProperties(
                 "http://localhost/gpas",
+                null,
                 "patientDomain",
                 "genomDeTanDomain",
                 "username",