This commit is contained in:
Trey t
2025-11-07 15:26:22 -06:00
parent 492d8032f4
commit 992979f113
4 changed files with 188 additions and 11 deletions

View File

@@ -0,0 +1,12 @@
package com.mycrib.shared.models
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@Serializable
data class ErrorResponse(
val error: String,
val detail: String,
@SerialName("status_code") val statusCode: Int,
val errors: Map<String, List<String>>? = null
)

View File

@@ -0,0 +1,42 @@
package com.mycrib.shared.network
import com.mycrib.shared.models.ErrorResponse
import io.ktor.client.call.body
import io.ktor.client.statement.HttpResponse
import kotlinx.serialization.json.Json
object ErrorParser {
private val json = Json {
ignoreUnknownKeys = true
isLenient = true
}
suspend fun parseError(response: HttpResponse): String {
return try {
val errorResponse = response.body<ErrorResponse>()
// Build detailed error message
val message = StringBuilder()
message.append(errorResponse.detail)
// Add field-specific errors if present
errorResponse.errors?.let { fieldErrors ->
if (fieldErrors.isNotEmpty()) {
message.append("\n\nDetails:")
fieldErrors.forEach { (field, errors) ->
message.append("\n$field: ${errors.joinToString(", ")}")
}
}
}
message.toString()
} catch (e: Exception) {
// Fallback to reading as plain text
try {
response.body<String>()
} catch (e: Exception) {
"An error occurred (${response.status.value})"
}
}
}
}

View File

@@ -22,7 +22,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to fetch tasks", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -38,7 +39,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to fetch task", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -56,7 +58,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to create task", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -74,7 +77,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to update task", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -90,7 +94,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(Unit)
} else {
ApiResult.Error("Failed to delete task", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -111,7 +116,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to fetch tasks by residence", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -127,7 +133,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to cancel task", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -143,7 +150,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to uncancel task", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -159,7 +167,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to mark task as in progress", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -175,7 +184,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to archive task", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")
@@ -191,7 +201,8 @@ class TaskApi(private val client: HttpClient = ApiClient.httpClient) {
if (response.status.isSuccess()) {
ApiResult.Success(response.body())
} else {
ApiResult.Error("Failed to unarchive task", response.status.value)
val errorMessage = ErrorParser.parseError(response)
ApiResult.Error(errorMessage, response.status.value)
}
} catch (e: Exception) {
ApiResult.Error(e.message ?: "Unknown error occurred")