refactor(backend): migrate geocode third party to clean architecture

GerardPaligot · GerardPaligot · commit 8ba99eefd19f · 2025-06-18T23:32:48.000+02:00
diff --git a/backend/src/main/java/com/paligot/confily/backend/events/application/EventAdminRepositoryDefault.kt b/backend/src/main/java/com/paligot/confily/backend/events/application/EventAdminRepositoryDefault.kt
@@ -3,8 +3,8 @@ package com.paligot.confily.backend.events.application
 import com.paligot.confily.backend.NotAcceptableException
 import com.paligot.confily.backend.events.domain.EventAdminRepository
 import com.paligot.confily.backend.internals.infrastructure.firestore.EventFirestore
-import com.paligot.confily.backend.third.parties.geocode.GeocodeApi
-import com.paligot.confily.backend.third.parties.geocode.convertToEntity
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.GeocodeApi
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.convertToEntity
 import com.paligot.confily.models.inputs.CoCInput
 import com.paligot.confily.models.inputs.EventInput
 import com.paligot.confily.models.inputs.FeaturesActivatedInput
diff --git a/backend/src/main/java/com/paligot/confily/backend/events/application/EventRepositoryDefault.kt b/backend/src/main/java/com/paligot/confily/backend/events/application/EventRepositoryDefault.kt
@@ -5,8 +5,8 @@ import com.paligot.confily.backend.NotFoundException
 import com.paligot.confily.backend.events.domain.EventRepository
 import com.paligot.confily.backend.internals.infrastructure.firestore.EventFirestore
 import com.paligot.confily.backend.internals.infrastructure.storage.EventStorage
-import com.paligot.confily.backend.third.parties.geocode.GeocodeApi
-import com.paligot.confily.backend.third.parties.geocode.convertToEntity
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.GeocodeApi
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.convertToEntity
 import com.paligot.confily.models.CreatedEvent
 import com.paligot.confily.models.Event
 import com.paligot.confily.models.EventList
diff --git a/backend/src/main/java/com/paligot/confily/backend/events/infrastructure/factory/EventModule.kt b/backend/src/main/java/com/paligot/confily/backend/events/infrastructure/factory/EventModule.kt
@@ -4,7 +4,7 @@ import com.paligot.confily.backend.events.application.EventAdminRepositoryDefaul
 import com.paligot.confily.backend.events.application.EventRepositoryDefault
 import com.paligot.confily.backend.internals.infrastructure.factory.FirestoreModule
 import com.paligot.confily.backend.internals.infrastructure.factory.StorageModule
-import com.paligot.confily.backend.third.parties.geocode.GeocodeModule
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.factory.GeocodeModule
 
 object EventModule {
     val eventRepository = lazy {
diff --git a/backend/src/main/java/com/paligot/confily/backend/partners/application/PartnerAdminRepositoryDefault.kt b/backend/src/main/java/com/paligot/confily/backend/partners/application/PartnerAdminRepositoryDefault.kt
@@ -8,8 +8,8 @@ import com.paligot.confily.backend.internals.infrastructure.storage.PartnerStora
 import com.paligot.confily.backend.internals.infrastructure.transcoder.Png
 import com.paligot.confily.backend.internals.infrastructure.transcoder.TranscoderImage
 import com.paligot.confily.backend.partners.domain.PartnerAdminRepository
-import com.paligot.confily.backend.third.parties.geocode.GeocodeApi
-import com.paligot.confily.backend.third.parties.geocode.convertToEntity
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.GeocodeApi
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.convertToEntity
 import com.paligot.confily.models.inputs.PartnerInput
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
diff --git a/backend/src/main/java/com/paligot/confily/backend/partners/infrastructure/factory/PartnerModule.kt b/backend/src/main/java/com/paligot/confily/backend/partners/infrastructure/factory/PartnerModule.kt
@@ -9,7 +9,7 @@ import com.paligot.confily.backend.internals.infrastructure.storage.PartnerStora
 import com.paligot.confily.backend.internals.infrastructure.system.SystemEnv
 import com.paligot.confily.backend.partners.application.PartnerAdminRepositoryDefault
 import com.paligot.confily.backend.partners.application.PartnerRepositoryDefault
-import com.paligot.confily.backend.third.parties.geocode.GeocodeModule
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.factory.GeocodeModule
 import com.paligot.confily.backend.third.parties.welovedevs.infrastructure.factory.JobModule
 
 object PartnerModule {
diff --git a/backend/src/main/java/com/paligot/confily/backend/sessions/application/SessionAdminRepositoryDefault.kt b/backend/src/main/java/com/paligot/confily/backend/sessions/application/SessionAdminRepositoryDefault.kt
@@ -6,8 +6,8 @@ import com.paligot.confily.backend.internals.infrastructure.firestore.EventFires
 import com.paligot.confily.backend.internals.infrastructure.firestore.EventSessionEntity
 import com.paligot.confily.backend.internals.infrastructure.firestore.SessionFirestore
 import com.paligot.confily.backend.sessions.domain.SessionAdminRepository
-import com.paligot.confily.backend.third.parties.geocode.GeocodeApi
-import com.paligot.confily.backend.third.parties.geocode.convertToEntity
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.GeocodeApi
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.convertToEntity
 import com.paligot.confily.models.inputs.EventSessionInput
 import com.paligot.confily.models.inputs.TalkSessionInput
 
diff --git a/backend/src/main/java/com/paligot/confily/backend/sessions/infrastructure/factory/SessionModule.kt b/backend/src/main/java/com/paligot/confily/backend/sessions/infrastructure/factory/SessionModule.kt
@@ -9,7 +9,7 @@ import com.paligot.confily.backend.sessions.application.SessionAdminRepositoryDe
 import com.paligot.confily.backend.sessions.application.SessionAdminVerbatimRepositoryDefault
 import com.paligot.confily.backend.sessions.application.SessionRepositoryDefault
 import com.paligot.confily.backend.speakers.infrastructure.factory.SpeakerModule
-import com.paligot.confily.backend.third.parties.geocode.GeocodeModule
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.factory.GeocodeModule
 
 object SessionModule {
     val sessionFirestore = lazy { SessionFirestore(SystemEnv.projectName, GoogleServicesModule.cloudFirestore.value) }
diff --git a/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/GeocodeModule.kt b/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/GeocodeModule.kt
diff --git a/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/infrastructure/factory/GeocodeModule.kt b/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/infrastructure/factory/GeocodeModule.kt
@@ -0,0 +1,8 @@
+package com.paligot.confily.backend.third.parties.geocode.infrastructure.factory
+
+import com.paligot.confily.backend.internals.infrastructure.factory.InternalModule
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.GeocodeApi
+
+object GeocodeModule {
+    val geocodeApi = lazy { GeocodeApi.Factory.create(InternalModule.secret.value, enableNetworkLogs = true) }
+}
diff --git a/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/infrastructure/provider/GeocodeApi.kt b/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/infrastructure/provider/GeocodeApi.kt
@@ -1,4 +1,4 @@
-package com.paligot.confily.backend.third.parties.geocode
+package com.paligot.confily.backend.third.parties.geocode.infrastructure.provider
 
 import com.paligot.confily.backend.NotAuthorized
 import com.paligot.confily.backend.internals.helpers.secret.Secret
@@ -33,7 +33,7 @@ class GeocodeApi(
         fun create(secret: Secret, enableNetworkLogs: Boolean): GeocodeApi =
             GeocodeApi(
                 client = HttpClient(Java.create()) {
-                    install(ContentNegotiation) {
+                    this.install(ContentNegotiation) {
                         json(
                             Json {
                                 isLenient = true
@@ -42,9 +42,7 @@ class GeocodeApi(
                         )
                     }
                     if (enableNetworkLogs) {
-                        install(
-                            Logging
-                        ) {
+                        this.install(Logging) {
                             logger = Logger.DEFAULT
                             level = LogLevel.INFO
                         }
diff --git a/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/infrastructure/provider/GeocodeMappers.kt b/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/infrastructure/provider/GeocodeMappers.kt
@@ -1,4 +1,4 @@
-package com.paligot.confily.backend.third.parties.geocode
+package com.paligot.confily.backend.third.parties.geocode.infrastructure.provider
 
 import com.paligot.confily.backend.internals.infrastructure.firestore.AddressEntity
 
diff --git a/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/infrastructure/provider/GeocodeNet.kt b/backend/src/main/java/com/paligot/confily/backend/third/parties/geocode/infrastructure/provider/GeocodeNet.kt
@@ -1,4 +1,4 @@
-package com.paligot.confily.backend.third.parties.geocode
+package com.paligot.confily.backend.third.parties.geocode.infrastructure.provider
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/backend/src/test/kotlin/com/paligot/confily/backend/events/EventRepositoryDefaultTest.kt b/backend/src/test/kotlin/com/paligot/confily/backend/events/EventRepositoryDefaultTest.kt
@@ -6,12 +6,12 @@ import com.paligot.confily.backend.events.domain.EventRepository
 import com.paligot.confily.backend.internals.infrastructure.firestore.EventEntity
 import com.paligot.confily.backend.internals.infrastructure.firestore.EventFirestore
 import com.paligot.confily.backend.internals.infrastructure.storage.EventStorage
-import com.paligot.confily.backend.third.parties.geocode.AddressComponent
-import com.paligot.confily.backend.third.parties.geocode.Geocode
-import com.paligot.confily.backend.third.parties.geocode.GeocodeApi
-import com.paligot.confily.backend.third.parties.geocode.Geometry
-import com.paligot.confily.backend.third.parties.geocode.Location
-import com.paligot.confily.backend.third.parties.geocode.Result
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.AddressComponent
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.Geocode
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.GeocodeApi
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.Geometry
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.Location
+import com.paligot.confily.backend.third.parties.geocode.infrastructure.provider.Result
 import com.paligot.confily.models.EventList
 import com.paligot.confily.models.inputs.CreatingEventInput
 import io.mockk.coEvery
