Merge pull request #36 from intive-FDV/improvements/sprint_3

Improvements/sprint 3

Author: juanigdom

app/schemas/com.intive.tmdbandroid.datasource.local.LocalStorage/1.json

@@ -6,7 +6,7 @@
     "entities": [
       {
         "tableName": "ScreeningORMEntity",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `backdrop_path` TEXT, `genres` TEXT, `name` TEXT NOT NULL, `number_of_episodes` INTEGER, `number_of_seasons` INTEGER, `overview` TEXT NOT NULL, `poster_path` TEXT, `status` TEXT, `vote_average` REAL NOT NULL, `vote_count` INTEGER NOT NULL, `popularity` REAL NOT NULL, `release_date` TEXT, `media_type` TEXT NOT NULL, `adult` INTEGER NOT NULL, `genre_ids` TEXT, `video` INTEGER NOT NULL, `networks` TEXT NOT NULL, `my_rate` REAL NOT NULL, `my_favorite` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `backdrop_path` TEXT, `genres` TEXT, `name` TEXT NOT NULL, `number_of_episodes` INTEGER, `number_of_seasons` INTEGER, `overview` TEXT NOT NULL, `poster_path` TEXT, `status` TEXT, `vote_average` REAL NOT NULL, `popularity` REAL NOT NULL, `release_date` TEXT, `media_type` TEXT NOT NULL, `adult` INTEGER NOT NULL, `genre_ids` TEXT, `video` INTEGER NOT NULL, `networks` TEXT NOT NULL, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -68,12 +68,6 @@
             "affinity": "REAL",
             "notNull": true
           },
-          {
-            "fieldPath": "vote_count",
-            "columnName": "vote_count",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
           {
             "fieldPath": "popularity",
             "columnName": "popularity",

app/src/androidTest/java/com/intive/tmdbandroid/datasource/local/LocalStorageTest.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.intive.tmdbandroid.entity.ScreeningORMEntity
+import com.intive.tmdbandroid.entity.room.ScreeningORMEntity
 import com.intive.tmdbandroid.model.Genre
 import com.intive.tmdbandroid.model.Network
 import junit.framework.TestCase
@@ -33,13 +33,14 @@ class LocalStorageTest : TestCase() {
         poster_path = "POSTER_PATH",
         status = "Online",
         vote_average = 10.5,
-        vote_count = 100,
         popularity = 34.0,
         media_type = "tv",
         adult = false,
         genre_ids = null,
         video = false,
-        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+        networks = listOf(Network("/netflixlogo.jpg")),
+        my_rate = 3.5,
+        my_favorite = true
     )
 
     private val screeningUpdate = ScreeningORMEntity(
@@ -54,13 +55,14 @@ class LocalStorageTest : TestCase() {
         poster_path = "POSTER_PATH_2",
         status = "Online",
         vote_average = 10.5,
-        vote_count = 100,
         popularity = 34.0,
         media_type = "tv",
         adult = false,
         genre_ids = null,
         video = false,
-        networks = listOf(Network("/netflixlogo.jpg", "netflix", 123, "ARG"))
+        networks = listOf(Network("/netflixlogo.jpg")),
+        my_rate = 3.5,
+        my_favorite = true
     )
 
     // Override function setUp() and annotate it with @Before
@@ -107,7 +109,7 @@ class LocalStorageTest : TestCase() {
         dao.insertFavorite(screening)
         val exists = dao.existAsFavorite(screening.id)
 
-        assertThat("Expecting result to be true", exists)
+        assertThat("Expecting result to be true", exists == screening)
 
         dao.updateFavorite(screeningUpdate)
         val tvShowsDeleted = dao.allFavorites()
@@ -122,6 +124,6 @@ class LocalStorageTest : TestCase() {
     fun writeAndReadOneFailureTest() = runBlocking {
         val exists = dao.existAsFavorite(screening.id)
 
-        assertThat("Expecting result to be true", !exists)
+        assertThat("Expecting result to be true", exists != screening)
     }
 }

app/src/main/java/com/intive/tmdbandroid/common/RetrofitHelper.kt

@@ -1,18 +1,24 @@
 package com.intive.tmdbandroid.common
 
 import com.intive.tmdbandroid.BuildConfig
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 import okhttp3.OkHttpClient
-
 import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.time.Duration
 
 object RetrofitHelper {
     fun getRetrofit() : Retrofit {
         val interceptor = HttpLoggingInterceptor()
         interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
 
-        val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
+        val client = OkHttpClient.Builder()
+            .addInterceptor(interceptor)
+            .callTimeout(Duration.ofMinutes(1))
+            .connectTimeout(Duration.ofSeconds(30))
+            .readTimeout(Duration.ofSeconds(30))
+            .writeTimeout(Duration.ofSeconds(30))
+            .build()
 
         return Retrofit.Builder()
             .baseUrl(BuildConfig.API_BASE_URL)

app/src/main/java/com/intive/tmdbandroid/common/ScreeningAsyncPagingDataDiffCallback.kt

@@ -10,7 +10,7 @@ class ScreeningPagingSource(private val service: Service, private val type: Int)
     companion object {
         const val DEFAULT_PAGE_INDEX = 1
 
-        const val TYPE_TVSHOW = 1
+        const val TYPE_TV_SHOW = 1
         const val TYPE_MOVIE = 2
     }
 
@@ -21,13 +21,13 @@ class ScreeningPagingSource(private val service: Service, private val type: Int)
             lateinit var screenings: List<Screening>
 
             when (type) {
-                TYPE_TVSHOW -> {
+                TYPE_TV_SHOW -> {
                     service.getPaginatedPopularTVShows(pageNumber).collect { screenings = it.toScreeningList() }
                 }
                 TYPE_MOVIE ->  {
                     service.getPaginatedPopularMovies(pageNumber).collect { screenings = it.toScreeningList() }
                 }
-                else -> throw RuntimeException("Ilegal type parameter")
+                else -> throw RuntimeException("Illegal type parameter")
             }
 
 

app/src/main/java/com/intive/tmdbandroid/datasource/ScreeningPagingSource.kt

@@ -2,7 +2,7 @@ package com.intive.tmdbandroid.datasource.local
 
 import androidx.room.*
 import androidx.room.Dao
-import com.intive.tmdbandroid.entity.ScreeningORMEntity
+import com.intive.tmdbandroid.entity.room.ScreeningORMEntity
 import com.intive.tmdbandroid.entity.SessionORMEntity
 
 @Dao

app/src/main/java/com/intive/tmdbandroid/datasource/local/Dao.kt

@@ -3,7 +3,7 @@ package com.intive.tmdbandroid.datasource.local
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.intive.tmdbandroid.entity.ScreeningORMEntity
+import com.intive.tmdbandroid.entity.room.ScreeningORMEntity
 import com.intive.tmdbandroid.entity.SessionORMEntity
 import com.intive.tmdbandroid.model.converter.GenreConverter
 import com.intive.tmdbandroid.model.converter.IntConverter

app/src/main/java/com/intive/tmdbandroid/datasource/local/LocalStorage.kt

@@ -1,6 +1,12 @@
 package com.intive.tmdbandroid.datasource.network
 
-import com.intive.tmdbandroid.entity.*
+import com.intive.tmdbandroid.entity.network.ResultListTVShowOrMovies
+import com.intive.tmdbandroid.entity.network.ResultCombinedCredits
+import com.intive.tmdbandroid.entity.person.ResultPeopleEntity
+import com.intive.tmdbandroid.entity.person.ResultPerson
+import com.intive.tmdbandroid.entity.movie.ResultMoviesEntity
+import com.intive.tmdbandroid.entity.tvshow.ResultTVShowsEntity
+import com.intive.tmdbandroid.entity.video.VideoEntity
 import com.intive.tmdbandroid.model.Movie
 import com.intive.tmdbandroid.model.Session
 import com.intive.tmdbandroid.model.TVShow

app/src/main/java/com/intive/tmdbandroid/datasource/network/ApiClient.kt

@@ -2,7 +2,11 @@ package com.intive.tmdbandroid.datasource.network
 
 import com.intive.tmdbandroid.BuildConfig
 import com.intive.tmdbandroid.common.RetrofitHelper
-import com.intive.tmdbandroid.entity.*
+import com.intive.tmdbandroid.entity.network.ResultListTVShowOrMovies
+import com.intive.tmdbandroid.entity.movie.ResultMoviesEntity
+import com.intive.tmdbandroid.entity.person.ResultPeopleEntity
+import com.intive.tmdbandroid.entity.person.ResultPerson
+import com.intive.tmdbandroid.entity.tvshow.ResultTVShowsEntity
 import com.intive.tmdbandroid.model.Movie
 import com.intive.tmdbandroid.model.Screening
 import com.intive.tmdbandroid.model.TVShow

app/src/main/java/com/intive/tmdbandroid/datasource/network/Service.kt

@@ -13,16 +13,21 @@ class DetailAndSearchActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         val binding = ActivityDetailAndSearchBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        val context = binding.root.context
 
         val navHost = supportFragmentManager.findFragmentById(R.id.nav_host_detail_and_search) as NavHostFragment
         val navController = navHost.navController
 
         val graph = navController
             .navInflater.inflate(R.navigation.nav_graph)
 
-        val action = intent.extras?.getString("action", "search")
+        val action = intent.extras?.getString(
+            context.getString(R.string.intent_extra_key_action),
+            context.getString(R.string.intent_extra_key_action_default)
+        )
+
         action.let {
-            if (it.equals("search")){
+            if (it.equals(context.getString(R.string.intent_extra_key_action_default))){
                 graph.startDestination = R.id.searchFragmentDest
             } else {
                 graph.startDestination = R.id.detailFragmentDest