Cleanup responses a bit more

datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeIngredientResponseV0.kt

@@ -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,
-)

datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeInstructionResponseV0.kt

@@ -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,
-)

datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v0/models/GetRecipeResponseV0.kt

@@ -11,3 +11,13 @@ data class GetRecipeResponseV0(
     @SerialName("recipeIngredient") val recipeIngredients: List<GetRecipeIngredientResponseV0>,
     @SerialName("recipeInstructions") val recipeInstructions: List<GetRecipeInstructionResponseV0>,
 )
+
+@Serializable
+data class GetRecipeIngredientResponseV0(
+    @SerialName("note") val note: String = "",
+)
+
+@Serializable
+data class GetRecipeInstructionResponseV0(
+    @SerialName("text") val text: String,
+)

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)
+data class GetTokenResponseV0(
+    @SerialName("access_token") val accessToken: String,
+)

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,
 )

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)
+data class ErrorDetailV1(
+    @SerialName("detail") val detail: String? = null,
+)

datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeIngredientResponseV1.kt

@@ -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,
-)

datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeInstructionResponseV1.kt

@@ -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,
-)

datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/v1/models/GetRecipeResponseV1.kt

@@ -11,3 +11,8 @@ data class GetRecipeResponseV1(
     @SerialName("recipeIngredient") val recipeIngredients: List<GetRecipeIngredientResponseV1>,
     @SerialName("recipeInstructions") val recipeInstructions: List<GetRecipeInstructionResponseV1>,
 )
+
+@Serializable
+data class GetRecipeIngredientResponseV1(
+    @SerialName("note") val note: String = "",
+)

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<GetRecipeSummaryResponseV1>,
+)
+
+@Serializable
+data class GetRecipeInstructionResponseV1(
+    @SerialName("text") val text: String,
 )

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,
 )

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,
 )

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)
     }