Issues #287 chore: db Result 를 CustomException 으로 처리하게 변경

data/data/src/main/java/com/lighthouse/database/converter/RectConverter.kt → data/data-database/src/main/java/com/lighthouse/data/database/converter/RectConverter.kt

@@ -1,4 +1,4 @@
-package com.lighthouse.database.converter
+package com.lighthouse.data.database.converter
 
 import android.graphics.Rect
 import androidx.core.text.isDigitsOnly

data/data/src/main/java/com/lighthouse/database/converter/UriConverter.kt → data/data-database/src/main/java/com/lighthouse/data/database/converter/UriConverter.kt

@@ -1,4 +1,4 @@
-package com.lighthouse.database.converter
+package com.lighthouse.data.database.converter
 
 import android.net.Uri
 import androidx.room.TypeConverter

data/data-database/src/main/java/com/lighthouse/data/database/exception/DBDeleteException.kt

@@ -0,0 +1,3 @@
+package com.lighthouse.data.database.exception
+
+class DBDeleteException(message: String = "데이터 Delete 에 실패 했습니다.") : Exception(message)

data/data-database/src/main/java/com/lighthouse/data/database/exception/DBInsertException.kt

@@ -0,0 +1,3 @@
+package com.lighthouse.data.database.exception
+
+class DBInsertException(message: String = "데이터 Insert 에 실패 했습니다.") : Exception(message)

data/data-database/src/main/java/com/lighthouse/data/database/exception/DBNotFoundException.kt

@@ -0,0 +1,3 @@
+package com.lighthouse.data.database.exception
+
+class DBNotFoundException(message: String = "데이터를 찾을 수 없습니다.") : Exception(message)

data/data-database/src/main/java/com/lighthouse/data/database/exception/DBSelectException.kt

@@ -0,0 +1,3 @@
+package com.lighthouse.data.database.exception
+
+class DBSelectException(message: String = "데이터 Select 에 실패 했습니다.") : Exception(message)

data/data-database/src/main/java/com/lighthouse/data/database/exception/DBUpdateException.kt

@@ -0,0 +1,3 @@
+package com.lighthouse.data.database.exception
+
+class DBUpdateException(message: String = "데이터 Update 에 실패 했습니다.") : Exception(message)

data/data-database/src/main/java/com/lighthouse/data/database/ext/KotlinExt.kt

@@ -1,25 +1,30 @@
 package com.lighthouse.data.database.ext
 
+import com.lighthouse.beep.model.exception.db.DeleteException
+import com.lighthouse.beep.model.exception.db.InsertException
+import com.lighthouse.beep.model.exception.db.NotFoundException
+import com.lighthouse.beep.model.exception.db.SelectException
+import com.lighthouse.beep.model.exception.db.UpdateException
 import com.lighthouse.beep.model.result.DbResult
-import com.lighthouse.data.database.exception.DeleteException
-import com.lighthouse.data.database.exception.InsertException
-import com.lighthouse.data.database.exception.NotFoundException
-import com.lighthouse.data.database.exception.SelectException
-import com.lighthouse.data.database.exception.UpdateException
+import com.lighthouse.data.database.exception.DBDeleteException
+import com.lighthouse.data.database.exception.DBInsertException
+import com.lighthouse.data.database.exception.DBNotFoundException
+import com.lighthouse.data.database.exception.DBSelectException
+import com.lighthouse.data.database.exception.DBUpdateException
 
 internal inline fun <T, R> T.runCatchingDB(block: T.() -> R): DbResult<R> {
     return try {
         DbResult.Success(block())
-    } catch (e: NotFoundException) {
-        DbResult.NotFoundError(e)
-    } catch (e: SelectException) {
-        DbResult.SelectError(e)
-    } catch (e: InsertException) {
-        DbResult.InsertError(e)
-    } catch (e: DeleteException) {
-        DbResult.DeleteError(e)
-    } catch (e: UpdateException) {
-        DbResult.UpdateError(e)
+    } catch (e: DBNotFoundException) {
+        DbResult.Failure(NotFoundException(e.message))
+    } catch (e: DBSelectException) {
+        DbResult.Failure(SelectException(e.message))
+    } catch (e: DBInsertException) {
+        DbResult.Failure(InsertException(e.message))
+    } catch (e: DBDeleteException) {
+        DbResult.Failure(DeleteException(e.message))
+    } catch (e: DBUpdateException) {
+        DbResult.Failure(UpdateException(e.message))
     } catch (e: Throwable) {
         DbResult.Failure(e)
     }

data/data-database/src/main/java/com/lighthouse/data/database/mapper/brand/CombineSectionIdMapper.kt

@@ -0,0 +1,7 @@
+package com.lighthouse.data.database.mapper.brand
+
+import com.lighthouse.beep.model.location.Dms
+
+internal fun combineSectionId(x: Dms, y: Dms, brandName: String): String {
+    return "${x.dmsToString()}_${y.dmsToString()}_${brandName.lowercase()}"
+}

model/src/main/java/com/lighthouse/beep/model/exception/db/InsertException.kt

@@ -0,0 +1,3 @@
+package com.lighthouse.beep.model.exception.db
+
+class InsertException(message: String? = "데이터 Insert 에 실패 했습니다.") : Exception(message)

model/src/main/java/com/lighthouse/beep/model/exception/db/NotFoundException.kt

@@ -0,0 +1,3 @@
+package com.lighthouse.beep.model.exception.db
+
+class NotFoundException(message: String? = "데이터를 찾을 수 없습니다.") : Exception(message)

model/src/main/java/com/lighthouse/beep/model/exception/db/SelectException.kt

@@ -0,0 +1,3 @@
+package com.lighthouse.beep.model.exception.db
+
+class SelectException(message: String? = "데이터 Select 에 실패 했습니다.") : Exception(message)

model/src/main/java/com/lighthouse/beep/model/exception/db/UpdateException.kt

@@ -0,0 +1,3 @@
+package com.lighthouse.beep.model.exception.db
+
+class UpdateException(message: String? = "데이터 Update 에 실패 했습니다.") : Exception(message)

model/src/main/java/com/lighthouse/beep/model/result/DbResult.kt

@@ -6,9 +6,7 @@ sealed class DbResult<out T> {
     object Empty : DbResult<Nothing>()
     data class Failure(val throwable: Throwable) : DbResult<Nothing>()
 
-    data class NotFoundError(val throwable: Throwable) : DbResult<Nothing>()
-    data class SelectError(val throwable: Throwable) : DbResult<Nothing>()
-    data class InsertError(val throwable: Throwable) : DbResult<Nothing>()
-    data class UpdateError(val throwable: Throwable) : DbResult<Nothing>()
-    data class DeleteError(val throwable: Throwable) : DbResult<Nothing>()
+    val isSuccess: Boolean get() = this is Success
+
+    val isFailure: Boolean get() = this is Failure
 }