- architecture was updated;

app/build.gradle

@@ -58,7 +58,7 @@ dependencies {
     implementation 'io.coil-kt:coil:0.8.0'
 
     // fragment
-    implementation 'androidx.fragment:fragment-ktx:1.2.3'
+    implementation 'androidx.fragment:fragment-ktx:1.2.4'
 
     // Room components
     implementation "androidx.room:room-runtime:$rootProject.roomVersion"

app/src/main/java/com/example/kotlincats/data/CatRepositoryImpl.kt

@@ -0,0 +1,27 @@
+package com.example.kotlincats.data
+
+import com.example.kotlincats.data.api.ApiDataSource
+import com.example.kotlincats.data.database.CatDao
+import com.example.kotlincats.data.mappers.CatMapper
+import com.example.kotlincats.domain.models.Cat
+import com.example.kotlincats.domain.repositories.CatRepository
+import javax.inject.Inject
+
+class CatRepositoryImpl @Inject constructor(
+    private val catDao: CatDao,
+    private val apiDataSource: ApiDataSource,
+    private val catMapper: CatMapper
+): CatRepository {
+
+    override suspend fun getCats(quantity: Int): List<Cat> {
+        return apiDataSource.getCats(quantity).map { catMapper.toCat(it) }
+    }
+
+    override suspend fun deleteCat(cat: Cat) = catDao.delete(
+        catMapper.toCatDatabaseModel(cat)
+    )
+
+    override suspend fun saveCats(cats: List<Cat>) = catDao.insert(
+        cats.map { catMapper.toCatDatabaseModel(it) }
+    )
+}

app/src/main/java/com/example/kotlincats/data/api/ApiDataSource.kt

@@ -1,21 +1,7 @@
 package com.example.kotlincats.data.api
 
-import com.example.kotlincats.data.CatMapper
-import com.example.kotlincats.data.api.catApi.CatApi
-import com.example.kotlincats.data.api.hipsterIpsumApi.HipsterIpsumApi
-import com.example.kotlincats.domain.model.Cat
-import javax.inject.Inject
+import com.example.kotlincats.data.models.CatApiModel
 
-class ApiDataSource @Inject constructor(
-    private val catApi: CatApi,
-    private val hipsterIpsumApi: HipsterIpsumApi,
-    private val catMapper: CatMapper
-) {
-
-    suspend fun getCats(quantity: Int): List<Cat> {
-        val catsFromApi = catApi.getCats(quantity)
-        val text = hipsterIpsumApi.getParagraphs(quantity);
-
-        return catMapper.mapCatsWithText(catsFromApi, text)
-    }
+interface ApiDataSource {
+    suspend fun getCats(quantity: Int): List<CatApiModel>
 }

app/src/main/java/com/example/kotlincats/data/api/ApiDataSourceImpl.kt

@@ -0,0 +1,21 @@
+package com.example.kotlincats.data.api
+
+import com.example.kotlincats.data.api.catApi.CatApi
+import com.example.kotlincats.data.api.hipsterIpsumApi.HipsterIpsumApi
+import com.example.kotlincats.data.models.CatApiModel
+import com.example.kotlincats.util.ArrayUtil
+import javax.inject.Inject
+
+class ApiDataSourceImpl @Inject constructor(
+    private val catApi: CatApi,
+    private val hipsterIpsumApi: HipsterIpsumApi,
+    private val arrayUtil: ArrayUtil
+): ApiDataSource {
+
+    override suspend fun getCats(quantity: Int): List<CatApiModel> {
+        val catsFromApi = catApi.getCats(quantity)
+        val text = hipsterIpsumApi.getParagraphs(quantity);
+
+        return arrayUtil.transformIntoCatDataModel(catsFromApi, text)
+    }
+}

app/src/main/java/com/example/kotlincats/data/database/CatDao.kt

@@ -1,23 +1,23 @@
 package com.example.kotlincats.data.database
 
 import androidx.room.*
-import com.example.kotlincats.domain.model.Cat
+import com.example.kotlincats.data.models.CatDatabaseModel
 
 @Dao
 interface CatDao {
 
     @Query("SELECT * from cat_table ORDER BY photoUrl ASC")
-    suspend fun getCats(): List<Cat>
+    suspend fun getCats(): List<CatDatabaseModel>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(cat: Cat)
+    suspend fun insert(cat: CatDatabaseModel)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(cats: List<Cat>)
+    suspend fun insert(cats: List<CatDatabaseModel>)
 
     @Query("DELETE FROM cat_table")
     suspend fun deleteAllCats()
 
     @Delete
-    suspend fun delete(cat: Cat)
+    suspend fun delete(cat: CatDatabaseModel)
 }

app/src/main/java/com/example/kotlincats/data/database/CatDatabase.kt

@@ -2,9 +2,9 @@ package com.example.kotlincats.data.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import com.example.kotlincats.domain.model.Cat
+import com.example.kotlincats.data.models.CatDatabaseModel
 
-@Database(entities = [Cat::class], version = 1, exportSchema = false)
+@Database(entities = [CatDatabaseModel::class], version = 1, exportSchema = false)
 abstract class CatDatabase : RoomDatabase() {
 
     abstract fun userDao(): CatDao

app/src/main/java/com/example/kotlincats/data/database/DatabaseDataSource.kt

@@ -0,0 +1,6 @@
+package com.example.kotlincats.data.database
+
+interface DatabaseDataSource {
+
+    suspend fun getCats()
+}

app/src/main/java/com/example/kotlincats/data/database/DatabaseDataSourceImpl.kt

@@ -0,0 +1,10 @@
+package com.example.kotlincats.data.database
+
+import javax.inject.Inject
+
+class DatabaseDataSourceImpl @Inject constructor(private val catDao: CatDao): DatabaseDataSource {
+
+    override suspend fun getCats() {
+        catDao.getCats()
+    }
+}

app/src/main/java/com/example/kotlincats/data/mappers/CatMapper.kt

@@ -0,0 +1,27 @@
+package com.example.kotlincats.data.mappers
+
+import com.example.kotlincats.data.models.CatApiModel
+import com.example.kotlincats.data.models.CatDatabaseModel
+import com.example.kotlincats.domain.models.Cat
+import javax.inject.Inject
+
+class CatMapper @Inject constructor() {
+
+    fun toCat(catApiModel: CatApiModel): Cat {
+        return Cat(
+            catApiModel.hashCode(),
+            catApiModel.name,
+            catApiModel.imageUrl,
+            catApiModel.info
+        )
+    }
+
+    fun toCatDatabaseModel(cat: Cat): CatDatabaseModel {
+        return CatDatabaseModel(
+            cat.id,
+            cat.name,
+            cat.photoUrl,
+            cat.info
+        )
+    }
+}

app/src/main/java/com/example/kotlincats/data/models/CatApiModel.kt

@@ -0,0 +1,7 @@
+package com.example.kotlincats.data.models
+
+data class CatApiModel(
+ val name: String,
+ val imageUrl: String,
+ val info: String
+)

app/src/main/java/com/example/kotlincats/domain/model/Cat.kt → app/src/main/java/com/example/kotlincats/data/models/CatDatabaseModel.kt

@@ -1,16 +1,13 @@
-package com.example.kotlincats.domain.model
+package com.example.kotlincats.data.models
 
-import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import kotlinx.android.parcel.Parcelize
 
-@Parcelize
 @Entity(tableName = "cat_table")
-class Cat(
+class CatDatabaseModel(
     @PrimaryKey val id: Int,
     @ColumnInfo(name = "name") val name: String,
     @ColumnInfo(name = "photoUrl") val photoUrl: String,
     @ColumnInfo(name = "info") val info: String
-) : Parcelable
+)

app/src/main/java/com/example/kotlincats/di/AppComponent.kt

@@ -2,7 +2,7 @@ package com.example.kotlincats.di
 
 import android.content.Context
 import com.example.kotlincats.di.viewModel.ViewModelModule
-import com.example.kotlincats.presentation.list.CatListFragment
+import com.example.kotlincats.presentation.catList.CatListFragment
 import dagger.BindsInstance
 import dagger.Component
 import javax.inject.Singleton
@@ -12,7 +12,8 @@ import javax.inject.Singleton
     modules = [
         NetworkModule::class,
         DatabaseModule::class,
-        ViewModelModule::class
+        ViewModelModule::class,
+        RepositoryModule::class
     ]
 )
 interface AppComponent {

app/src/main/java/com/example/kotlincats/di/RepositoryModule.kt

@@ -0,0 +1,18 @@
+package com.example.kotlincats.di
+
+import com.example.kotlincats.data.CatRepositoryImpl
+import com.example.kotlincats.data.api.ApiDataSource
+import com.example.kotlincats.data.api.ApiDataSourceImpl
+import com.example.kotlincats.domain.repositories.CatRepository
+import dagger.Binds
+import dagger.Module
+
+@Module
+abstract class RepositoryModule {
+
+    @Binds
+    abstract fun bindCatRepository(catRepository: CatRepositoryImpl): CatRepository
+
+    @Binds
+    abstract fun bindApiDataSource(apiDataSourceImpl: ApiDataSourceImpl): ApiDataSource
+}

app/src/main/java/com/example/kotlincats/di/viewModel/ViewModelModule.kt

@@ -2,7 +2,7 @@ package com.example.kotlincats.di.viewModel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.example.kotlincats.presentation.list.CatListViewModel
+import com.example.kotlincats.presentation.catList.CatListViewModel
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap

app/src/main/java/com/example/kotlincats/domain/models/Cat.kt

@@ -0,0 +1,12 @@
+package com.example.kotlincats.domain.models
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+class Cat(
+    val id: Int,
+    val name: String,
+    val photoUrl: String,
+    val info: String
+) : Parcelable

app/src/main/java/com/example/kotlincats/domain/repositories/CatRepository.kt

@@ -0,0 +1,12 @@
+package com.example.kotlincats.domain.repositories
+
+import com.example.kotlincats.domain.models.Cat
+
+interface CatRepository {
+
+    suspend fun getCats(quantity: Int): List<Cat>
+
+    suspend fun deleteCat(cat: Cat)
+
+    suspend fun saveCats(cats: List<Cat>)
+}

app/src/main/java/com/example/kotlincats/domain/usecases/DeleteCatUseCase.kt

@@ -0,0 +1,12 @@
+package com.example.kotlincats.domain.usecases
+
+import com.example.kotlincats.domain.models.Cat
+import com.example.kotlincats.domain.repositories.CatRepository
+import javax.inject.Inject
+
+class DeleteCatUseCase @Inject constructor(private val catRepository: CatRepository) {
+
+    suspend fun execute(cat: Cat) {
+        catRepository.deleteCat(cat)
+    }
+}

app/src/main/java/com/example/kotlincats/domain/usecases/GetCatsUseCase.kt

@@ -0,0 +1,12 @@
+package com.example.kotlincats.domain.usecases
+
+import com.example.kotlincats.domain.models.Cat
+import com.example.kotlincats.domain.repositories.CatRepository
+import javax.inject.Inject
+
+class GetCatsUseCase @Inject constructor(private val catRepository: CatRepository) {
+
+    suspend fun execute(quantity: Int): List<Cat> {
+        return catRepository.getCats(quantity)
+    }
+}

app/src/main/java/com/example/kotlincats/domain/usecases/SaveCatsUseCase.kt

@@ -0,0 +1,12 @@
+package com.example.kotlincats.domain.usecases
+
+import com.example.kotlincats.domain.models.Cat
+import com.example.kotlincats.domain.repositories.CatRepository
+import javax.inject.Inject
+
+class SaveCatsUseCase @Inject constructor(private val catRepository: CatRepository) {
+
+    suspend fun execute(cats: List<Cat>) {
+        catRepository.saveCats(cats)
+    }
+}