Separate Character and Episode API Services (#66)

mohsenoid · Jul 8, 2024 · 8f87404 · 8f87404
1 parent 026f7dd
commit 8f87404
Show file tree

Hide file tree

Showing 32 changed files with 213 additions and 185 deletions.
diff --git a/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/DataModule.kt b/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/DataModule.kt
@@ -12,14 +12,14 @@ private val dataModule =
     module {
         single<EpisodeRepository> {
             EpisodeRepositoryImpl(
-                apiService = get(),
+                episodeApiService = get(),
                 episodeDao = get(),
             )
         }
 
         single<CharacterRepository> {
             CharacterRepositoryImpl(
-                apiService = get(),
+                characterApiService = get(),
                 characterDao = get(),
             )
         }

diff --git a/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/characters/CharacterRepositoryImpl.kt b/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/characters/CharacterRepositoryImpl.kt
@@ -1,10 +1,10 @@
 package com.mohsenoid.rickandmorty.data.characters
 
-import com.mohsenoid.rickandmorty.data.characters.dao.CharacterDao
+import com.mohsenoid.rickandmorty.data.characters.db.dao.CharacterDao
 import com.mohsenoid.rickandmorty.data.characters.mapper.CharacterMapper.toCharacter
 import com.mohsenoid.rickandmorty.data.characters.mapper.CharacterMapper.toCharacterEntity
-import com.mohsenoid.rickandmorty.data.remote.ApiService
-import com.mohsenoid.rickandmorty.data.remote.model.CharacterRemoteModel
+import com.mohsenoid.rickandmorty.data.characters.remote.CharacterApiService
+import com.mohsenoid.rickandmorty.data.characters.remote.model.CharacterRemoteModel
 import com.mohsenoid.rickandmorty.domain.NoInternetConnectionException
 import com.mohsenoid.rickandmorty.domain.characters.CharacterRepository
 import com.mohsenoid.rickandmorty.domain.characters.model.Character
@@ -15,7 +15,7 @@ import java.net.UnknownHostException
 import java.util.SortedMap
 
 internal class CharacterRepositoryImpl(
-    private val apiService: ApiService,
+    private val characterApiService: CharacterApiService,
     private val characterDao: CharacterDao,
 ) : CharacterRepository {
     private val charactersCache: SortedMap<Int, Character> = sortedMapOf()
@@ -44,25 +44,26 @@ internal class CharacterRepositoryImpl(
         return getCharactersFromCache(charactersIds)
     }
 
-    private suspend fun getCharactersFromRemote(charactersIds: Set<Int>): Result<List<Character>> {
-        val missingCharactersIds = charactersIds - charactersCache.keys
-        val missingCharactersIdsString = missingCharactersIds.joinToString(",")
-
-        return try {
-            val response = apiService.getCharacters(missingCharactersIdsString)
-            val remoteCharacters: List<CharacterRemoteModel>? = response.body()
-            if (response.isSuccessful && remoteCharacters != null) {
-                handleSuccessfulRemoteResponse(remoteCharacters)
-                getCharactersFromCache(charactersIds)!! // All characters should be cached
-            } else {
-                Result.failure(Exception(response.message().ifEmpty { "Unknown Error" }))
+    private suspend fun getCharactersFromRemote(charactersIds: Set<Int>): Result<List<Character>> =
+        withContext(Dispatchers.IO) {
+            val missingCharactersIds = charactersIds - charactersCache.keys
+            val missingCharactersIdsString = missingCharactersIds.joinToString(",")
+
+            try {
+                val response = characterApiService.getCharacters(missingCharactersIdsString)
+                val remoteCharacters: List<CharacterRemoteModel>? = response.body()
+                if (response.isSuccessful && remoteCharacters != null) {
+                    handleSuccessfulRemoteResponse(remoteCharacters)
+                    getCharactersFromCache(charactersIds)!! // All characters should be cached
+                } else {
+                    Result.failure(Exception(response.message().ifEmpty { "Unknown Error" }))
+                }
+            } catch (e: UnknownHostException) {
+                Result.failure(NoInternetConnectionException(e.message))
+            } catch (e: SocketTimeoutException) {
+                Result.failure(NoInternetConnectionException(e.message))
             }
-        } catch (e: UnknownHostException) {
-            Result.failure(NoInternetConnectionException(e.message))
-        } catch (e: SocketTimeoutException) {
-            Result.failure(NoInternetConnectionException(e.message))
         }
-    }
 
     private suspend fun handleSuccessfulRemoteResponse(remoteCharacters: List<CharacterRemoteModel>) {
         val charactersEntity = remoteCharacters.map { it.toCharacterEntity() }
@@ -94,25 +95,26 @@ internal class CharacterRepositoryImpl(
         }
     }
 
-    private suspend fun getCharacterFromRemote(characterId: Int): Result<Character> {
-        return try {
-            val response = apiService.getCharacter(characterId)
-            val remoteCharacter: CharacterRemoteModel? = response.body()
-            if (response.isSuccessful && remoteCharacter != null) {
-                val characterEntity = remoteCharacter.toCharacterEntity()
-                characterDao.insertCharacter(characterEntity)
-                val character = characterEntity.toCharacter()
-                charactersCache += character.id to character
-                Result.success(character)
-            } else {
-                Result.failure(Exception(response.message().ifEmpty { "Unknown Error" }))
+    private suspend fun getCharacterFromRemote(characterId: Int): Result<Character> =
+        withContext(Dispatchers.IO) {
+            try {
+                val response = characterApiService.getCharacter(characterId)
+                val remoteCharacter: CharacterRemoteModel? = response.body()
+                if (response.isSuccessful && remoteCharacter != null) {
+                    val characterEntity = remoteCharacter.toCharacterEntity()
+                    characterDao.insertCharacter(characterEntity)
+                    val character = characterEntity.toCharacter()
+                    charactersCache += character.id to character
+                    Result.success(character)
+                } else {
+                    Result.failure(Exception(response.message().ifEmpty { "Unknown Error" }))
+                }
+            } catch (e: UnknownHostException) {
+                Result.failure(NoInternetConnectionException(e.message))
+            } catch (e: SocketTimeoutException) {
+                Result.failure(NoInternetConnectionException(e.message))
             }
-        } catch (e: UnknownHostException) {
-            Result.failure(NoInternetConnectionException(e.message))
-        } catch (e: SocketTimeoutException) {
-            Result.failure(NoInternetConnectionException(e.message))
         }
-    }
 
     override suspend fun updateCharacterStatus(
         characterId: Int,

diff --git a/...morty/data/characters/dao/CharacterDao.kt → ...ty/data/characters/db/dao/CharacterDao.kt b/...morty/data/characters/dao/CharacterDao.kt → ...ty/data/characters/db/dao/CharacterDao.kt
@@ -1,10 +1,10 @@
-package com.mohsenoid.rickandmorty.data.characters.dao
+package com.mohsenoid.rickandmorty.data.characters.db.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.mohsenoid.rickandmorty.data.characters.entity.CharacterEntity
+import com.mohsenoid.rickandmorty.data.characters.db.entity.CharacterEntity
 
 @Dao
 internal interface CharacterDao {

diff --git a/...data/characters/entity/CharacterEntity.kt → ...a/characters/db/entity/CharacterEntity.kt b/...data/characters/entity/CharacterEntity.kt → ...a/characters/db/entity/CharacterEntity.kt
@@ -1,4 +1,4 @@
-package com.mohsenoid.rickandmorty.data.characters.entity
+package com.mohsenoid.rickandmorty.data.characters.db.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/characters/mapper/CharacterMapper.kt b/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/characters/mapper/CharacterMapper.kt
@@ -1,7 +1,7 @@
 package com.mohsenoid.rickandmorty.data.characters.mapper
 
-import com.mohsenoid.rickandmorty.data.characters.entity.CharacterEntity
-import com.mohsenoid.rickandmorty.data.remote.model.CharacterRemoteModel
+import com.mohsenoid.rickandmorty.data.characters.db.entity.CharacterEntity
+import com.mohsenoid.rickandmorty.data.characters.remote.model.CharacterRemoteModel
 import com.mohsenoid.rickandmorty.domain.characters.model.Character
 
 internal object CharacterMapper {

diff --git a/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/characters/remote/CharacterApiService.kt b/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/characters/remote/CharacterApiService.kt
@@ -0,0 +1,19 @@
+package com.mohsenoid.rickandmorty.data.characters.remote
+
+import com.mohsenoid.rickandmorty.data.characters.remote.model.CharacterRemoteModel
+import com.mohsenoid.rickandmorty.data.characters.remote.model.CharactersResponse
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Path
+
+internal interface CharacterApiService {
+    @GET("character/{characterIds}")
+    suspend fun getCharacters(
+        @Path("characterIds") characterIds: String,
+    ): Response<CharactersResponse>
+
+    @GET("character/{characterId}")
+    suspend fun getCharacter(
+        @Path("characterId") characterId: Int,
+    ): Response<CharacterRemoteModel>
+}
diff --git a/...data/remote/model/CharacterRemoteModel.kt → ...ters/remote/model/CharacterRemoteModel.kt b/...data/remote/model/CharacterRemoteModel.kt → ...ters/remote/model/CharacterRemoteModel.kt
@@ -1,4 +1,4 @@
-package com.mohsenoid.rickandmorty.data.remote.model
+package com.mohsenoid.rickandmorty.data.characters.remote.model
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...y/data/remote/model/CharactersResponse.kt → ...acters/remote/model/CharactersResponse.kt b/...y/data/remote/model/CharactersResponse.kt → ...acters/remote/model/CharactersResponse.kt
@@ -1,3 +1,3 @@
-package com.mohsenoid.rickandmorty.data.remote.model
+package com.mohsenoid.rickandmorty.data.characters.remote.model
 
 internal typealias CharactersResponse = List<CharacterRemoteModel>
diff --git a/.../data/remote/model/LocationRemoteModel.kt → ...cters/remote/model/LocationRemoteModel.kt b/.../data/remote/model/LocationRemoteModel.kt → ...cters/remote/model/LocationRemoteModel.kt
@@ -1,4 +1,4 @@
-package com.mohsenoid.rickandmorty.data.remote.model
+package com.mohsenoid.rickandmorty.data.characters.remote.model
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...ty/data/remote/model/OriginRemoteModel.kt → ...racters/remote/model/OriginRemoteModel.kt b/...ty/data/remote/model/OriginRemoteModel.kt → ...racters/remote/model/OriginRemoteModel.kt
@@ -1,4 +1,4 @@
-package com.mohsenoid.rickandmorty.data.remote.model
+package com.mohsenoid.rickandmorty.data.characters.remote.model
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/db/Database.kt b/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/db/Database.kt
@@ -2,10 +2,10 @@ package com.mohsenoid.rickandmorty.data.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import com.mohsenoid.rickandmorty.data.characters.dao.CharacterDao
-import com.mohsenoid.rickandmorty.data.characters.entity.CharacterEntity
-import com.mohsenoid.rickandmorty.data.episodes.dao.EpisodeDao
-import com.mohsenoid.rickandmorty.data.episodes.entity.EpisodeEntity
+import com.mohsenoid.rickandmorty.data.characters.db.dao.CharacterDao
+import com.mohsenoid.rickandmorty.data.characters.db.entity.CharacterEntity
+import com.mohsenoid.rickandmorty.data.episodes.db.dao.EpisodeDao
+import com.mohsenoid.rickandmorty.data.episodes.db.entity.EpisodeEntity
 
 @Database(
     entities = [EpisodeEntity::class, CharacterEntity::class],

diff --git a/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/episodes/EpisodeRepositoryImpl.kt b/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/episodes/EpisodeRepositoryImpl.kt
@@ -1,10 +1,10 @@
 package com.mohsenoid.rickandmorty.data.episodes
 
-import com.mohsenoid.rickandmorty.data.episodes.dao.EpisodeDao
+import com.mohsenoid.rickandmorty.data.episodes.db.dao.EpisodeDao
 import com.mohsenoid.rickandmorty.data.episodes.mapper.EpisodeMapper.toEpisode
 import com.mohsenoid.rickandmorty.data.episodes.mapper.EpisodeMapper.toEpisodeEntity
-import com.mohsenoid.rickandmorty.data.remote.ApiService
-import com.mohsenoid.rickandmorty.data.remote.model.EpisodeRemoteModel
+import com.mohsenoid.rickandmorty.data.episodes.remote.EpisodeApiService
+import com.mohsenoid.rickandmorty.data.episodes.remote.model.EpisodeRemoteModel
 import com.mohsenoid.rickandmorty.domain.EndOfListException
 import com.mohsenoid.rickandmorty.domain.NoInternetConnectionException
 import com.mohsenoid.rickandmorty.domain.episodes.EpisodeRepository
@@ -16,7 +16,7 @@ import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 
 internal class EpisodeRepositoryImpl(
-    private val apiService: ApiService,
+    private val episodeApiService: EpisodeApiService,
     private val episodeDao: EpisodeDao,
 ) : EpisodeRepository {
     private val episodesCache: MutableMap<Int, List<Episode>> = mutableMapOf()
@@ -42,24 +42,25 @@ internal class EpisodeRepositoryImpl(
         }
     }
 
-    private suspend fun getEpisodesFromRemote(page: Int): Result<List<Episode>> {
-        return try {
-            val response = apiService.getEpisodes(page)
-            val remoteEpisodes = response.body()?.results
-            if (response.isSuccessful && remoteEpisodes != null) {
-                handleSuccessfulRemoteResponse(page, remoteEpisodes)
-                getEpisodesFromCache(page)!! // All episodes should be cached
-            } else if (response.code() == HttpURLConnection.HTTP_NOT_FOUND && page != 0) {
-                Result.failure(EndOfListException())
-            } else {
-                Result.failure(Exception(response.message().ifEmpty { "Unknown Error" }))
+    private suspend fun getEpisodesFromRemote(page: Int): Result<List<Episode>> =
+        withContext(Dispatchers.IO) {
+            try {
+                val response = episodeApiService.getEpisodes(page)
+                val remoteEpisodes = response.body()?.results
+                if (response.isSuccessful && remoteEpisodes != null) {
+                    handleSuccessfulRemoteResponse(page, remoteEpisodes)
+                    getEpisodesFromCache(page)!! // All episodes should be cached
+                } else if (response.code() == HttpURLConnection.HTTP_NOT_FOUND && page != 0) {
+                    Result.failure(EndOfListException())
+                } else {
+                    Result.failure(Exception(response.message().ifEmpty { "Unknown Error" }))
+                }
+            } catch (e: UnknownHostException) {
+                Result.failure(NoInternetConnectionException(e.message))
+            } catch (e: SocketTimeoutException) {
+                Result.failure(NoInternetConnectionException(e.message))
             }
-        } catch (e: UnknownHostException) {
-            Result.failure(NoInternetConnectionException(e.message))
-        } catch (e: SocketTimeoutException) {
-            Result.failure(NoInternetConnectionException(e.message))
         }
-    }
 
     private suspend fun handleSuccessfulRemoteResponse(
         page: Int,

diff --git a/...kandmorty/data/episodes/dao/EpisodeDao.kt → ...dmorty/data/episodes/db/dao/EpisodeDao.kt b/...kandmorty/data/episodes/dao/EpisodeDao.kt → ...dmorty/data/episodes/db/dao/EpisodeDao.kt
@@ -1,10 +1,10 @@
-package com.mohsenoid.rickandmorty.data.episodes.dao
+package com.mohsenoid.rickandmorty.data.episodes.db.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.mohsenoid.rickandmorty.data.episodes.entity.EpisodeEntity
+import com.mohsenoid.rickandmorty.data.episodes.db.entity.EpisodeEntity
 
 @Dao
 internal interface EpisodeDao {

diff --git a/...rty/data/episodes/entity/EpisodeEntity.kt → .../data/episodes/db/entity/EpisodeEntity.kt b/...rty/data/episodes/entity/EpisodeEntity.kt → .../data/episodes/db/entity/EpisodeEntity.kt
@@ -1,4 +1,4 @@
-package com.mohsenoid.rickandmorty.data.episodes.entity
+package com.mohsenoid.rickandmorty.data.episodes.db.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/episodes/mapper/EpisodeMapper.kt b/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/episodes/mapper/EpisodeMapper.kt
@@ -1,7 +1,7 @@
 package com.mohsenoid.rickandmorty.data.episodes.mapper
 
-import com.mohsenoid.rickandmorty.data.episodes.entity.EpisodeEntity
-import com.mohsenoid.rickandmorty.data.remote.model.EpisodeRemoteModel
+import com.mohsenoid.rickandmorty.data.episodes.db.entity.EpisodeEntity
+import com.mohsenoid.rickandmorty.data.episodes.remote.model.EpisodeRemoteModel
 import com.mohsenoid.rickandmorty.domain.episodes.model.Episode
 
 internal object EpisodeMapper {

diff --git a/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/episodes/remote/EpisodeApiService.kt b/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/episodes/remote/EpisodeApiService.kt
@@ -0,0 +1,13 @@
+package com.mohsenoid.rickandmorty.data.episodes.remote
+
+import com.mohsenoid.rickandmorty.data.episodes.remote.model.EpisodesResponse
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+internal interface EpisodeApiService {
+    @GET("episode")
+    suspend fun getEpisodes(
+        @Query("page") page: Int,
+    ): Response<EpisodesResponse>
+}
diff --git a/...y/data/remote/model/EpisodeRemoteModel.kt → ...isodes/remote/model/EpisodeRemoteModel.kt b/...y/data/remote/model/EpisodeRemoteModel.kt → ...isodes/remote/model/EpisodeRemoteModel.kt
@@ -1,4 +1,4 @@
-package com.mohsenoid.rickandmorty.data.remote.model
+package com.mohsenoid.rickandmorty.data.episodes.remote.model
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...rty/data/remote/model/EpisodesResponse.kt → ...episodes/remote/model/EpisodesResponse.kt b/...rty/data/remote/model/EpisodesResponse.kt → ...episodes/remote/model/EpisodesResponse.kt
@@ -1,4 +1,4 @@
-package com.mohsenoid.rickandmorty.data.remote.model
+package com.mohsenoid.rickandmorty.data.episodes.remote.model
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/...orty/data/remote/model/InfoRemoteModel.kt → .../episodes/remote/model/InfoRemoteModel.kt b/...orty/data/remote/model/InfoRemoteModel.kt → .../episodes/remote/model/InfoRemoteModel.kt
@@ -1,4 +1,4 @@
-package com.mohsenoid.rickandmorty.data.remote.model
+package com.mohsenoid.rickandmorty.data.episodes.remote.model
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/remote/ApiService.kt b/app/src/main/kotlin/com/mohsenoid/rickandmorty/data/remote/ApiService.kt