Updated base movie insertion

Change aims to keep localized resources
diareuse · Nov 20, 2023 · ae509e4 · ae509e4
1 parent 95a7cfb
commit ae509e4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/feature-core-database/src/main/java/movie/core/db/dao/DaoBase.kt b/feature-core-database/src/main/java/movie/core/db/dao/DaoBase.kt
@@ -15,11 +15,17 @@ interface DaoBase<T> {
     @Update
     suspend fun update(model: T)
 
-    suspend fun insertOrUpdate(model: T) {
-        try {
-            insert(model)
-        } catch (e: Throwable) {
-            update(model)
+    suspend fun insertOrUpdate(model: T) = insertOrElse(model) {
+        update(model)
+    }
+
+    companion object {
+        suspend inline fun <T> DaoBase<T>.insertOrElse(model: T, otherwise: (T) -> Unit) {
+            try {
+                insert(model)
+            } catch (e: Throwable) {
+                otherwise(model)
+            }
         }
     }
 

diff --git a/feature-core/src/main/java/movie/core/EventDetailFeatureStoring.kt b/feature-core/src/main/java/movie/core/EventDetailFeatureStoring.kt
@@ -3,6 +3,7 @@ package movie.core
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import movie.core.adapter.asStored
+import movie.core.db.dao.DaoBase.Companion.insertOrElse
 import movie.core.db.dao.MovieDao
 import movie.core.db.dao.MovieDetailDao
 import movie.core.db.dao.MovieMediaDao
@@ -26,7 +27,7 @@ class EventDetailFeatureStoring(
     }
 
     private suspend fun store(model: MovieDetail) {
-        movie.insertOrUpdate((model as Movie).asStored())
+        movie.insertOrElse((model as Movie).asStored()) {}
         detail.insertOrUpdate(model.asStored())
         for (item in model.media)
             media.insertOrUpdate(item.asStored(model))

diff --git a/feature-core/src/main/java/movie/core/EventShowingsFeatureCinemaStoring.kt b/feature-core/src/main/java/movie/core/EventShowingsFeatureCinemaStoring.kt
@@ -3,6 +3,7 @@ package movie.core
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import movie.core.adapter.asStored
+import movie.core.db.dao.DaoBase.Companion.insertOrElse
 import movie.core.db.dao.MovieDao
 import movie.core.db.dao.MovieReferenceDao
 import movie.core.db.dao.ShowingDao
@@ -20,7 +21,7 @@ class EventShowingsFeatureCinemaStoring(
     override suspend fun get(date: Date) = origin.get(date).onSuccess {
         scope.launch {
             for ((movie, showings) in it) {
-                movieDao.insertOrUpdate((movie as Movie).asStored())
+                movieDao.insertOrElse((movie as Movie).asStored()) {}
                 referenceDao.insertOrUpdate(movie.asStored())
                 for (showing in showings)
                     showingDao.insertOrUpdate(showing.asStored(movie))

diff --git a/feature-core/src/test/java/movie/core/EventDetailFeatureTest.kt b/feature-core/src/test/java/movie/core/EventDetailFeatureTest.kt
@@ -66,7 +66,7 @@ class EventDetailFeatureTest {
         val testData = service_responds_success()
         feature(this).get(item)
         awaitChildJobCompletion()
-        verify(movie, times(1)).insertOrUpdate(any())
+        verify(movie, times(1)).insert(any())
         verify(detail, times(1)).insertOrUpdate(any())
         verify(media, times(testData.media.size)).insertOrUpdate(any())
     }

diff --git a/feature-core/src/test/java/movie/core/EventShowingsFeatureCinemaTest.kt b/feature-core/src/test/java/movie/core/EventShowingsFeatureCinemaTest.kt
@@ -147,7 +147,7 @@ class EventShowingsFeatureCinemaTest {
         val testData = cinemaEvents_responds_success()
         feature(this).get(Date()).getOrThrow()
         awaitChildJobCompletion()
-        verify(movie, times(testData.movies.size)).insertOrUpdate(any())
+        verify(movie, times(testData.movies.size)).insert(any())
         verify(reference, times(testData.movies.size)).insertOrUpdate(any())
         verify(showing, times(testData.events.size)).insertOrUpdate(any())
     }