Merge pull request #21 from LeoAndo/main

Main-> develop

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.leoleo.quizapp"
         minSdk 29
         targetSdk 34
-        versionCode 102
-        versionName "1.0.2"
+        versionCode 103
+        versionName "1.0.3"
 
         testInstrumentationRunner "com.leoleo.androidapptemplate.CustomTestRunner"
         vectorDrawables {

app/src/main/kotlin/com/leoleo/androidapptemplate/ui/quiz/QuizViewModel.kt

@@ -4,7 +4,6 @@ import android.util.Log
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.leoleo.androidapptemplate.domain.repository.QuizRepository

data/src/main/java/com/leoleo/androidapptemplate/data/quiz/dao/CompletedQuizDao.kt

@@ -3,7 +3,6 @@ package com.leoleo.androidapptemplate.data.quiz.dao
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
-import androidx.room.Update
 import com.leoleo.androidapptemplate.data.quiz.entity.COLUMN_TITLE
 import com.leoleo.androidapptemplate.data.quiz.entity.CompletedQuizEntity
 import com.leoleo.androidapptemplate.data.quiz.entity.TABLE_NAME_COMPLETED_QUIZ
@@ -14,15 +13,9 @@ internal interface CompletedQuizDao {
     @Insert
     suspend fun insertQuizData(vararg entity: CompletedQuizEntity)
 
-    @Update
-    suspend fun updateQuizData(vararg entity: CompletedQuizEntity)
-
     @Query("SELECT * FROM $TABLE_NAME_COMPLETED_QUIZ")
     fun observeAllCompletedQuiz(): Flow<List<CompletedQuizEntity>>
 
-    @Query("SELECT * FROM $TABLE_NAME_COMPLETED_QUIZ")
-    suspend fun selectAllCompletedQuiz(): List<CompletedQuizEntity>
-
     @Query("SELECT * FROM $TABLE_NAME_COMPLETED_QUIZ WHERE $COLUMN_TITLE = :title")
     suspend fun selectCompletedQuizByTitle(title: String): List<CompletedQuizEntity>
 }

data/src/main/java/com/leoleo/androidapptemplate/data/repository/QuizRepositoryImpl.kt

@@ -3,34 +3,22 @@ package com.leoleo.androidapptemplate.data.repository
 import com.leoleo.androidapptemplate.data.quiz.dao.CompletedQuizDao
 import com.leoleo.androidapptemplate.data.quiz.entity.CompletedQuizEntity
 import com.leoleo.androidapptemplate.data.quiz.entity.toModels
-import com.leoleo.androidapptemplate.domain.di.IoDispatcher
-import com.leoleo.androidapptemplate.domain.exception.callOrThrow
 import com.leoleo.androidapptemplate.domain.model.CompletedQuiz
 import com.leoleo.androidapptemplate.domain.repository.QuizRepository
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
-internal class QuizRepositoryImpl @Inject constructor(
-    private val dao: CompletedQuizDao,
-    @IoDispatcher private val dispatcher: CoroutineDispatcher,
-) : QuizRepository {
+internal class QuizRepositoryImpl @Inject constructor(private val dao: CompletedQuizDao) :
+    QuizRepository {
     override fun observeAllCompletedQuiz(): Flow<List<CompletedQuiz>> {
-        return dao.observeAllCompletedQuiz().map { it.toModels() }.flowOn(dispatcher)
-    }
-
-    override suspend fun getCompletedQuizList(): List<CompletedQuiz> {
-        return callOrThrow(dispatcher) { dao.selectAllCompletedQuiz().toModels() }
+        return dao.observeAllCompletedQuiz().map { it.toModels() }
     }
 
     override suspend fun addCompleteData(title: String, completedTime: Long) {
-        callOrThrow(dispatcher) {
-            val data = CompletedQuizEntity(title = title, completedTime = completedTime)
-            if (dao.selectCompletedQuizByTitle(title).isEmpty()) {
-                dao.insertQuizData(data)
-            }
+        val data = CompletedQuizEntity(title = title, completedTime = completedTime)
+        if (dao.selectCompletedQuizByTitle(title).isEmpty()) {
+            dao.insertQuizData(data)
         }
     }
 }

domain/src/main/java/com/leoleo/androidapptemplate/domain/exception/ApiException.kt

@@ -0,0 +1,12 @@
+package com.leoleo.androidapptemplate.domain.exception
+
+sealed class ApiException : AppException() {
+    data class UnAuthorized(override val message: String?) : ApiException()
+    data class Forbidden(override val message: String?) : ApiException()
+    object Network : ApiException()
+    data class UnprocessableEntity(override val message: String?) : ApiException()
+    data class Unknown(override val message: String?) : ApiException()
+    data class NotFound(override val message: String?) : ApiException()
+    object Redirect : ApiException()
+    object Server : ApiException()
+}

domain/src/main/java/com/leoleo/androidapptemplate/domain/exception/AppException.kt

@@ -0,0 +1,3 @@
+package com.leoleo.androidapptemplate.domain.exception
+
+open class AppException : Exception()

domain/src/main/java/com/leoleo/androidapptemplate/domain/exception/callOrThrow.kt → domain/src/main/java/com/leoleo/androidapptemplate/domain/exception/callApiOrThrow.kt

@@ -4,8 +4,8 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import kotlin.jvm.Throws
 
-@Throws(AppErrorType::class)
-suspend fun <T> callOrThrow(
+@Throws(ApiException::class)
+suspend fun <T> callApiOrThrow(
     dispatcher: CoroutineDispatcher,
     apiCall: suspend () -> T
 ): T {
@@ -14,7 +14,7 @@ suspend fun <T> callOrThrow(
             apiCall.invoke()
         } catch (e: Throwable) {
             // TODO: アプリ固有のExceptionをthrowする
-            throw AppErrorType.Unknown(e.message)
+            throw ApiException.Unknown(e.message)
         }
     }
 }

domain/src/main/java/com/leoleo/androidapptemplate/domain/repository/QuizRepository.kt

@@ -5,6 +5,5 @@ import kotlinx.coroutines.flow.Flow
 
 interface QuizRepository {
     fun observeAllCompletedQuiz(): Flow<List<CompletedQuiz>>
-    suspend fun getCompletedQuizList(): List<CompletedQuiz>
     suspend fun addCompleteData(title: String, completedTime: Long)
 }