Merge pull request #69 from kirmanak/cleanup

Cleanup code after modularization

app/build.gradle.kts

@@ -105,7 +105,6 @@ dependencies {
     implementation(libs.androidx.paging.runtimeKtx)
     testImplementation(libs.androidx.paging.commonKtx)
 
-
     implementation(libs.jetbrains.kotlinx.datetime)
 
     implementation(libs.bumptech.glide.glide)

app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeDataSourceImpl.kt

@@ -17,8 +17,7 @@ class AddRecipeDataSourceImpl @Inject constructor(
     override suspend fun addRecipe(recipe: AddRecipeRequest): String {
         logger.v { "addRecipe() called with: recipe = $recipe" }
         val service = addRecipeServiceFactory.provideService()
-        val response = logAndMapErrors(
+        val response = logger.logAndMapErrors(
-            logger,
             block = { service.addRecipe(recipe) },
             logProvider = { "addRecipe: can't add recipe" }
         )

app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt

@@ -2,11 +2,7 @@ package gq.kirmanak.mealient.data.add.impl
 
 import gq.kirmanak.mealient.data.add.AddRecipeDataSource
 import gq.kirmanak.mealient.data.add.AddRecipeRepo
-import gq.kirmanak.mealient.data.add.models.AddRecipeIngredient
-import gq.kirmanak.mealient.data.add.models.AddRecipeInstruction
 import gq.kirmanak.mealient.data.add.models.AddRecipeRequest
-import gq.kirmanak.mealient.data.add.models.AddRecipeSettings
-import gq.kirmanak.mealient.datastore.recipe.AddRecipeDraft
 import gq.kirmanak.mealient.datastore.recipe.AddRecipeStorage
 import gq.kirmanak.mealient.logging.Logger
 import kotlinx.coroutines.flow.Flow
@@ -23,32 +19,11 @@ class AddRecipeRepoImpl @Inject constructor(
 ) : AddRecipeRepo {
 
     override val addRecipeRequestFlow: Flow<AddRecipeRequest>
-        get() = addRecipeStorage.updates.map { it ->
+        get() = addRecipeStorage.updates.map { AddRecipeRequest(it) }
-            AddRecipeRequest(
-                name = it.recipeName,
-                description = it.recipeDescription,
-                recipeYield = it.recipeYield,
-                recipeIngredient = it.recipeIngredients.map { AddRecipeIngredient(note = it) },
-                recipeInstructions = it.recipeInstructions.map { AddRecipeInstruction(text = it) },
-                settings = AddRecipeSettings(
-                    public = it.isRecipePublic,
-                    disableComments = it.areCommentsDisabled,
-                )
-            )
-        }
 
     override suspend fun preserve(recipe: AddRecipeRequest) {
         logger.v { "preserveRecipe() called with: recipe = $recipe" }
-        val input = AddRecipeDraft(
+        addRecipeStorage.save(recipe.toDraft())
-            recipeName = recipe.name,
-            recipeDescription = recipe.description,
-            recipeYield = recipe.recipeYield,
-            recipeInstructions = recipe.recipeInstructions.map { it.text },
-            recipeIngredients = recipe.recipeIngredient.map { it.note },
-            isRecipePublic = recipe.settings.public,
-            areCommentsDisabled = recipe.settings.disableComments,
-        )
-        addRecipeStorage.save(input)
     }
 
     override suspend fun clear() {

app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt

@@ -5,7 +5,7 @@ import gq.kirmanak.mealient.data.network.ErrorDetail
 import gq.kirmanak.mealient.data.network.NetworkError.NotMealie
 import gq.kirmanak.mealient.data.network.NetworkError.Unauthorized
 import gq.kirmanak.mealient.data.network.ServiceFactory
-import gq.kirmanak.mealient.extensions.decodeErrorBodyOrNull
+import gq.kirmanak.mealient.extensions.decodeErrorBody
 import gq.kirmanak.mealient.extensions.logAndMapErrors
 import gq.kirmanak.mealient.logging.Logger
 import kotlinx.serialization.json.Json
@@ -34,8 +34,7 @@ class AuthDataSourceImpl @Inject constructor(
         authService: AuthService,
         username: String,
         password: String
-    ): Response<GetTokenResponse> = logAndMapErrors(
+    ): Response<GetTokenResponse> = logger.logAndMapErrors(
-        logger,
         block = { authService.getToken(username = username, password = password) },
         logProvider = { "sendRequest: can't get token" },
     )
@@ -46,7 +45,9 @@ class AuthDataSourceImpl @Inject constructor(
         response.body()?.accessToken ?: throw NotMealie(NullPointerException("Body is null"))
     } else {
         val cause = HttpException(response)
-        val errorDetail: ErrorDetail? = response.decodeErrorBodyOrNull(json, logger)
+        val errorDetail = json.runCatching<Json, ErrorDetail> { decodeErrorBody(response) }
+            .onFailure { logger.e(it) { "Can't decode error body" } }
+            .getOrNull()
         throw when (errorDetail?.detail) {
             "Unauthorized" -> Unauthorized(cause)
             else -> NotMealie(cause)

app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionDataSourceImpl.kt

@@ -19,8 +19,7 @@ class VersionDataSourceImpl @Inject constructor(
         logger.v { "getVersionInfo() called with: baseUrl = $baseUrl" }
 
         val service = serviceFactory.provideService(baseUrl)
-        val response = logAndMapErrors(
+        val response = logger.logAndMapErrors(
-            logger,
             block = { service.getVersion() },
             logProvider = { "getVersionInfo: can't request version" }
         )

app/src/main/java/gq/kirmanak/mealient/extensions/NetworkExtensions.kt

@@ -8,28 +8,23 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import retrofit2.HttpException
 import retrofit2.Response
-import java.io.InputStream
-
-inline fun <T, reified R> Response<T>.decodeErrorBodyOrNull(json: Json, logger: Logger): R? =
-    errorBody()?.byteStream()?.let { json.decodeFromStreamOrNull<R>(it, logger) }
 
 @OptIn(ExperimentalSerializationApi::class)
-inline fun <reified T> Json.decodeFromStreamOrNull(stream: InputStream, logger: Logger): T? =
+inline fun <T, reified R> Json.decodeErrorBody(response: Response<T>): R =
-    runCatching { decodeFromStream<T>(stream) }
+    checkNotNull(response.errorBody()) { "Can't decode absent error body" }
-        .onFailure { logger.e(it) { "decodeFromStreamOrNull: can't decode" } }
+        .byteStream()
-        .getOrNull()
+        .let(::decodeFromStream)
+
 
 fun Throwable.mapToNetworkError(): NetworkError = when (this) {
     is HttpException, is SerializationException -> NetworkError.NotMealie(this)
     else -> NetworkError.NoServerConnection(this)
 }
 
-inline fun <T> logAndMapErrors(
+inline fun <T> Logger.logAndMapErrors(
-    logger: Logger,
     block: () -> T,
     noinline logProvider: () -> String
-): T =
+): T = runCatchingExceptCancel(block).getOrElse {
-    runCatchingExceptCancel(block).getOrElse {
+    e(it, messageSupplier = logProvider)
-        logger.e(it, messageSupplier = logProvider)
+    throw it.mapToNetworkError()
-        throw it.mapToNetworkError()
+}
-    }

app/src/release/java/gq/kirmanak/mealient/App.kt

@@ -1,7 +0,0 @@
-package gq.kirmanak.mealient
-
-import android.app.Application
-import dagger.hilt.android.HiltAndroidApp
-
-@HiltAndroidApp
-class App : Application()