From 64d4d47be24bd665efa9ade3aa7e310222db1c13 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sun, 30 Oct 2022 13:07:50 +0100 Subject: [PATCH] Cleanup responses a bit more --- .../v0/models/GetRecipeIngredientResponseV0.kt | 14 -------------- .../v0/models/GetRecipeInstructionResponseV0.kt | 10 ---------- .../datasource/v0/models/GetRecipeResponseV0.kt | 10 ++++++++++ .../datasource/v0/models/GetTokenResponseV0.kt | 4 +++- .../datasource/v0/models/VersionResponseV0.kt | 2 -- .../mealient/datasource/v1/models/ErrorDetailV1.kt | 4 +++- .../v1/models/GetRecipeIngredientResponseV1.kt | 14 -------------- .../v1/models/GetRecipeInstructionResponseV1.kt | 10 ---------- .../datasource/v1/models/GetRecipeResponseV1.kt | 5 +++++ .../datasource/v1/models/GetRecipesResponseV1.kt | 5 +++++ .../datasource/v1/models/GetTokenResponseV1.kt | 1 - .../datasource/v1/models/VersionResponseV1.kt | 3 --- .../datasource/MealieDataSourceV0ImplTest.kt | 2 +- 13 files changed, 27 insertions(+), 57 deletions(-) delete mode 100644 datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeIngredientResponseV0.kt delete mode 100644 datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeInstructionResponseV0.kt delete mode 100644 datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeIngredientResponseV1.kt delete mode 100644 datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeInstructionResponseV1.kt diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeIngredientResponseV0.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeIngredientResponseV0.kt deleted file mode 100644 index 8def202..0000000 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeIngredientResponseV0.kt +++ /dev/null @@ -1,14 +0,0 @@ -package gq.kirmanak.mealient.datasource.v0.models - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class GetRecipeIngredientResponseV0( - @SerialName("title") val title: String = "", - @SerialName("note") val note: String = "", - @SerialName("unit") val unit: String = "", - @SerialName("food") val food: String = "", - @SerialName("disableAmount") val disableAmount: Boolean, - @SerialName("quantity") val quantity: Double, -) diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeInstructionResponseV0.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeInstructionResponseV0.kt deleted file mode 100644 index 1eaef94..0000000 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeInstructionResponseV0.kt +++ /dev/null @@ -1,10 +0,0 @@ -package gq.kirmanak.mealient.datasource.v0.models - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class GetRecipeInstructionResponseV0( - @SerialName("title") val title: String = "", - @SerialName("text") val text: String, -) diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeResponseV0.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeResponseV0.kt index 414badf..2930c61 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeResponseV0.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeResponseV0.kt @@ -11,3 +11,13 @@ data class GetRecipeResponseV0( @SerialName("recipeIngredient") val recipeIngredients: List, @SerialName("recipeInstructions") val recipeInstructions: List, ) + +@Serializable +data class GetRecipeIngredientResponseV0( + @SerialName("note") val note: String = "", +) + +@Serializable +data class GetRecipeInstructionResponseV0( + @SerialName("text") val text: String, +) \ No newline at end of file diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetTokenResponseV0.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetTokenResponseV0.kt index 1a21be2..2e4cfa9 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetTokenResponseV0.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetTokenResponseV0.kt @@ -4,4 +4,6 @@ import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable -data class GetTokenResponseV0(@SerialName("access_token") val accessToken: String) \ No newline at end of file +data class GetTokenResponseV0( + @SerialName("access_token") val accessToken: String, +) \ No newline at end of file diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/VersionResponseV0.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/VersionResponseV0.kt index 8cb8d25..590e5d4 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/VersionResponseV0.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/VersionResponseV0.kt @@ -5,7 +5,5 @@ import kotlinx.serialization.Serializable @Serializable data class VersionResponseV0( - @SerialName("production") val production: Boolean, @SerialName("version") val version: String, - @SerialName("demoStatus") val demoStatus: Boolean, ) \ No newline at end of file diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/ErrorDetailV1.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/ErrorDetailV1.kt index b3f1810..54f3370 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/ErrorDetailV1.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/ErrorDetailV1.kt @@ -4,4 +4,6 @@ import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable -data class ErrorDetailV1(@SerialName("detail") val detail: String? = null) \ No newline at end of file +data class ErrorDetailV1( + @SerialName("detail") val detail: String? = null, +) \ No newline at end of file diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeIngredientResponseV1.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeIngredientResponseV1.kt deleted file mode 100644 index 68bd444..0000000 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeIngredientResponseV1.kt +++ /dev/null @@ -1,14 +0,0 @@ -package gq.kirmanak.mealient.datasource.v1.models - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class GetRecipeIngredientResponseV1( - @SerialName("title") val title: String = "", - @SerialName("note") val note: String = "", - @SerialName("unit") val unit: String = "", - @SerialName("food") val food: String = "", - @SerialName("disableAmount") val disableAmount: Boolean, - @SerialName("quantity") val quantity: Double, -) diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeInstructionResponseV1.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeInstructionResponseV1.kt deleted file mode 100644 index 12b5cc7..0000000 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeInstructionResponseV1.kt +++ /dev/null @@ -1,10 +0,0 @@ -package gq.kirmanak.mealient.datasource.v1.models - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class GetRecipeInstructionResponseV1( - @SerialName("title") val title: String = "", - @SerialName("text") val text: String, -) diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeResponseV1.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeResponseV1.kt index bda326f..981c10b 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeResponseV1.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeResponseV1.kt @@ -11,3 +11,8 @@ data class GetRecipeResponseV1( @SerialName("recipeIngredient") val recipeIngredients: List, @SerialName("recipeInstructions") val recipeInstructions: List, ) + +@Serializable +data class GetRecipeIngredientResponseV1( + @SerialName("note") val note: String = "", +) \ No newline at end of file diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipesResponseV1.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipesResponseV1.kt index 08105d4..86ccf54 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipesResponseV1.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipesResponseV1.kt @@ -6,4 +6,9 @@ import kotlinx.serialization.Serializable @Serializable data class GetRecipesResponseV1( @SerialName("items") val items: List, +) + +@Serializable +data class GetRecipeInstructionResponseV1( + @SerialName("text") val text: String, ) \ No newline at end of file diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetTokenResponseV1.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetTokenResponseV1.kt index b603283..11e96f8 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetTokenResponseV1.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetTokenResponseV1.kt @@ -6,5 +6,4 @@ import kotlinx.serialization.Serializable @Serializable data class GetTokenResponseV1( @SerialName("access_token") val accessToken: String, - @SerialName("token_type") val tokenType: String, ) \ No newline at end of file diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/VersionResponseV1.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/VersionResponseV1.kt index 53e7763..45f5cb5 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/VersionResponseV1.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/VersionResponseV1.kt @@ -5,8 +5,5 @@ import kotlinx.serialization.Serializable @Serializable data class VersionResponseV1( - @SerialName("production") val production: Boolean, @SerialName("version") val version: String, - @SerialName("demoStatus") val demoStatus: Boolean, - @SerialName("allowSignup") val allowSignup: Boolean, ) \ No newline at end of file diff --git a/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/MealieDataSourceV0ImplTest.kt b/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/MealieDataSourceV0ImplTest.kt index 799cc1e..e43d745 100644 --- a/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/MealieDataSourceV0ImplTest.kt +++ b/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/MealieDataSourceV0ImplTest.kt @@ -62,7 +62,7 @@ class MealieDataSourceV0ImplTest { @Test fun `when getVersionInfo and getVersion returns result then result`() = runTest { - val versionResponse = VersionResponseV0(true, "v0.5.6", true) + val versionResponse = VersionResponseV0("v0.5.6") coEvery { service.getVersion(any()) } returns versionResponse assertThat(subject.getVersionInfo(TEST_BASE_URL)).isSameInstanceAs(versionResponse) }