Refactor: Organize network related classes

Author: yesshreyes

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/network/api/GeminiApiService.kt renamed to composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/network/detailsGenerator/api/GeminiApiService.kt

@@ -1,8 +1,8 @@
-package com.developersbreach.kotlindictionarymultiplatform.core.network.api
+package com.developersbreach.kotlindictionarymultiplatform.core.network.detailsGenerator.api
 
 import com.developersbreach.kotlindictionarymultiplatform.Log
-import com.developersbreach.kotlindictionarymultiplatform.core.network.parser.GeminiJsonParser
-import com.developersbreach.kotlindictionarymultiplatform.core.network.request.GeminiPromptBuilder
+import com.developersbreach.kotlindictionarymultiplatform.core.network.detailsGenerator.parser.GeminiJsonParser
+import com.developersbreach.kotlindictionarymultiplatform.core.network.detailsGenerator.request.GeminiPromptBuilder
 import com.developersbreach.kotlindictionarymultiplatform.data.detail.model.KotlinTopicDetails
 import io.ktor.client.HttpClient
 import io.ktor.client.request.post

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/network/parser/GeminiJsonParser.kt renamed to composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/network/detailsGenerator/parser/GeminiJsonParser.kt

@@ -1,4 +1,4 @@
-package com.developersbreach.kotlindictionarymultiplatform.core.network.parser
+package com.developersbreach.kotlindictionarymultiplatform.core.network.detailsGenerator.parser
 
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/network/request/GeminiPromptBuilder.kt renamed to composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/network/detailsGenerator/request/GeminiPromptBuilder.kt

@@ -1,4 +1,4 @@
-package com.developersbreach.kotlindictionarymultiplatform.core.network.request
+package com.developersbreach.kotlindictionarymultiplatform.core.network.detailsGenerator.request
 
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/network/topicSource/FirestoreConstants.kt

@@ -0,0 +1,6 @@
+package com.developersbreach.kotlindictionarymultiplatform.core.network.topicSource
+
+object FirestoreConstants {
+    private const val ROOT_URL = "https://firestore.googleapis.com/v1/projects/kotlin-dictionary/databases/(default)/documents"
+    const val TOPICS_URL = "$ROOT_URL/topics"
+}

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/detail/repository/DetailRepository.kt

@@ -1,7 +1,7 @@
 package com.developersbreach.kotlindictionarymultiplatform.data.detail.repository
 
 import arrow.core.Either
-import com.developersbreach.kotlindictionarymultiplatform.core.network.api.GeminiApiService
+import com.developersbreach.kotlindictionarymultiplatform.core.network.detailsGenerator.api.GeminiApiService
 import com.developersbreach.kotlindictionarymultiplatform.data.detail.model.KotlinTopicDetails
 import com.developersbreach.kotlindictionarymultiplatform.getOpenApiKey
 

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/model/FirestoreResponse.kt

@@ -17,3 +17,10 @@ data class RawField(
 data class Response(
     @SerialName("documents") val topics: List<RawTopic>,
 )
+
+fun RawTopic.toTopic(): Topic {
+    return Topic(
+        name = fields["name"]?.value.orEmpty(),
+        description = fields["description"]?.value.orEmpty(),
+    )
+}

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/repository/TopicRepository.kt

@@ -3,27 +3,36 @@ package com.developersbreach.kotlindictionarymultiplatform.data.topic.repository
 import arrow.core.Either
 import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Response
 import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Topic
-import com.developersbreach.kotlindictionarymultiplatform.data.topic.utils.FirestoreConstants
-import com.developersbreach.kotlindictionarymultiplatform.data.topic.utils.toTopic
+import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.toTopic
+import com.developersbreach.kotlindictionarymultiplatform.core.network.topicSource.FirestoreConstants
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json
 
-object TopicRepository {
+//object TopicRepository {
+//
+//    private val client = HttpClient {
+//        install(ContentNegotiation) {
+//            json(Json { ignoreUnknownKeys = true })
+//        }
+//    }
+//
+//    suspend fun getTopics(): Either<Throwable, List<Topic>> {
+//        return Either.catch {
+//            val response: Response = client.get(FirestoreConstants.TOPICS_URL).body()
+//            response.topics.map { it.toTopic() }
+//        }
+//    }
+//}
 
-    private val client = HttpClient {
-        install(ContentNegotiation) {
-            json(Json { ignoreUnknownKeys = true })
-        }
-    }
-
-    suspend fun getTopics(): Either<Throwable, List<Topic>> {
-        return Either.catch {
-            val response: Response = client.get(FirestoreConstants.TOPICS_URL).body()
+class TopicRepository(
+    private val httpClient: HttpClient
+){
+    suspend fun getTopics(): Either<Throwable, List<Topic>> = Either.catch {
+            val response: Response = httpClient.get(FirestoreConstants.TOPICS_URL).body()
             response.topics.map { it.toTopic() }
-        }
     }
 }

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/utils/FirestoreConstants.kt

@@ -1,6 +1,6 @@
 package com.developersbreach.kotlindictionarymultiplatform.di
 
-import com.developersbreach.kotlindictionarymultiplatform.core.network.api.GeminiApiService
+import com.developersbreach.kotlindictionarymultiplatform.core.network.detailsGenerator.api.GeminiApiService
 import org.koin.dsl.module
 
 internal val apiModule = module {