Merge pull request 'API 1.2.4.3 v1.2.4 controllers utf8' (#18) from tibor into master

Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/18

src/main/kotlin/com/aitrainer/api/controller/CustomerPackageController.kt

@@ -32,7 +32,7 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
 
 ) {
 
-    @GetMapping("/diet_customer_package/{id}")
+    @GetMapping("/diet_customer_package/{id}", produces = [org.springframework.http.MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun getDietCustomerPackageData(@PathVariable(value = "id") dietUserId: Long): ResponseEntity<String> {
         if (dietUserId <= 0) {
             return ResponseEntity.notFound().build()
@@ -81,7 +81,7 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
             ResponseEntity.ok().body(packageJson)
     }
 
-    @GetMapping("/club_customer_package/{id}")
+    @GetMapping("/club_customer_package/{id}", produces = [org.springframework.http.MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun getCustomerClubPackageData(@PathVariable(value = "id") customerId: Long): ResponseEntity<String> {
         if (customerId <= 0) {
             return ResponseEntity.notFound().build()
@@ -120,7 +120,7 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
             ResponseEntity.ok().body(packageJson)
     }
 
-    @GetMapping("/app_customer_package/{id}")
+    @GetMapping("/app_customer_package/{id}", produces = [org.springframework.http.MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun getCustomerPackageData(@PathVariable(value = "id") customerId: Long): ResponseEntity<String> {
 
         if (customerId <= 0) {

src/main/kotlin/com/aitrainer/api/controller/diet/DietController.kt

@@ -3,6 +3,7 @@ package com.aitrainer.api.controller.diet
 import com.aitrainer.api.model.diet.Diet
 import com.aitrainer.api.repository.diet.DietRepository
 import org.slf4j.LoggerFactory
+import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import java.util.*
@@ -12,12 +13,12 @@ import java.util.*
 class DietController(private val dietRepository: DietRepository) {
     private val logger = LoggerFactory.getLogger(javaClass)
 
-    @PostMapping("/diet")
+    @PostMapping("/diet", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun insert(@RequestBody diet: Diet): ResponseEntity<*> {
         return ResponseEntity.ok().body(dietRepository.save(diet))
     }
 
-    @PostMapping("/diet/{id}")
+    @PostMapping("/diet/{id}", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun update(@PathVariable(value = "id") id: Long, @RequestBody diet: Diet): ResponseEntity<Diet> {
         val existingDiet  = dietRepository.findByDietId(id) ?: return ResponseEntity.notFound().build()
 
@@ -34,7 +35,7 @@ class DietController(private val dietRepository: DietRepository) {
         return ResponseEntity.ok().body(dietRepository.save(updatedDiet))
     }
 
-    @PostMapping("/diet/no_text/{id}")
+    @PostMapping("/diet/no_text/{id}", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun updateNoText(@PathVariable(value = "id") id: Long, @RequestBody diet: Diet): ResponseEntity<Diet> {
         val existingDiet  = dietRepository.findByDietId(id) ?: return ResponseEntity.notFound().build()
 
@@ -50,7 +51,7 @@ class DietController(private val dietRepository: DietRepository) {
         return ResponseEntity.ok().body(dietRepository.save(updatedDiet))
     }
 
-    @GetMapping("/diet/{dietUserId}")
+    @GetMapping("/diet/{dietUserId}", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun getByDietUserId(@PathVariable dietUserId: Long): ResponseEntity<List<Diet>> {
         val list = dietRepository.findByDietUserId(dietUserId)
 

src/main/kotlin/com/aitrainer/api/controller/diet/DietUserConsumptionController.kt

@@ -2,6 +2,7 @@ package com.aitrainer.api.controller.diet
 
 import com.aitrainer.api.model.diet.DietUserConsumption
 import com.aitrainer.api.repository.diet.DietUserConsumptionRepository
+import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import java.util.*
@@ -10,12 +11,12 @@ import java.util.*
 @RequestMapping("/api")
 class DietUserConsumptionController(private val dietUserConsumptionRepository: DietUserConsumptionRepository) {
 
-    @PostMapping("/diet_user_consumption")
+    @PostMapping("/diet_user_consumption", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun insert(@RequestBody dietUserConsumption: DietUserConsumption): ResponseEntity<*> {
         return ResponseEntity.ok().body(dietUserConsumptionRepository.save(dietUserConsumption))
     }
 
-    @PostMapping("/diet_user_consumption/{id}")
+    @PostMapping("/diet_user_consumption/{id}", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun update(@PathVariable(value = "id") id: Long, @RequestBody dietUserConsumption: DietUserConsumption): ResponseEntity<*> {
         return dietUserConsumptionRepository.findById(id).map { existingConsumption ->
             val updatedConsumption: DietUserConsumption = existingConsumption.copy(
@@ -34,7 +35,7 @@ class DietUserConsumptionController(private val dietUserConsumptionRepository: D
         }.orElse(ResponseEntity.notFound().build())
     }
 
-    @GetMapping("/diet_user_consumption/{dietUserId}")
+    @GetMapping("/diet_user_consumption/{dietUserId}", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun getByDietUserId(@PathVariable dietUserId: Long): ResponseEntity<List<DietUserConsumption>> {
         val list = dietUserConsumptionRepository.findByDietUserId(dietUserId)
         return if (list.isEmpty()) ResponseEntity.notFound().build() else

src/main/kotlin/com/aitrainer/api/controller/diet/DietUserPreferenceController.kt

@@ -2,6 +2,7 @@ package com.aitrainer.api.controller.diet
 
 import com.aitrainer.api.model.diet.DietUserPreference
 import com.aitrainer.api.repository.diet.DietUserPreferenceRepository
+import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import java.util.*
@@ -10,7 +11,7 @@ import java.util.*
 @RequestMapping("/api")
 class DietUserPreferenceController(private val dietUserPreferenceRepository: DietUserPreferenceRepository) {
 
-    @PostMapping("/diet_user_preference")
+    @PostMapping("/diet_user_preference", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun insert(@RequestBody dietUserPreference: DietUserPreference): ResponseEntity<*> {
         return ResponseEntity.ok().body(dietUserPreferenceRepository.save(dietUserPreference))
     }

src/main/kotlin/com/aitrainer/api/controller/diet/DietUserSensitivityController.kt

@@ -2,6 +2,7 @@ package com.aitrainer.api.controller.diet
 
 import com.aitrainer.api.model.diet.DietUserSensitivity
 import com.aitrainer.api.repository.diet.DietUserSensitivityRepository
+import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import java.util.*
@@ -10,7 +11,7 @@ import java.util.*
 @RequestMapping("/api")
 class DietUserSensitivityController(private val dietUserSensitivityRepository: DietUserSensitivityRepository) {
 
-    @PostMapping("/diet_user_sensitivity")
+    @PostMapping("/diet_user_sensitivity", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun insert(@RequestBody dietUserSensitivity: DietUserSensitivity): ResponseEntity<*> {
         return ResponseEntity.ok().body(dietUserSensitivityRepository.save(dietUserSensitivity))
     }

src/main/kotlin/com/aitrainer/api/controller/diet/MealController.kt

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*
 @RequestMapping("api")
 class MealController(private val mealRepository: MealRepository) {
 
-    @PostMapping ("/meal")
+    @PostMapping ("/meal", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun insert(@RequestBody meal: Meal): ResponseEntity<Meal> {
         val newMeal = mealRepository.save(meal)
         return ResponseEntity.ok().body(newMeal)
@@ -23,14 +23,14 @@ class MealController(private val mealRepository: MealRepository) {
             ResponseEntity.ok().body(list)
     }
 
-    @GetMapping("/meal/{id}")
+    @GetMapping("/meal/{id}", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun getById(@PathVariable id: Long): ResponseEntity<Meal> {
         val rawMaterial = mealRepository.findById(id)
         return if (rawMaterial == null) ResponseEntity.notFound().build() else
             ResponseEntity.ok().body(rawMaterial)
     }
 
-    @GetMapping("/meal/by_name/{name}")
+    @GetMapping("/meal/by_name/{name}", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun getByName(@PathVariable name: String): ResponseEntity<Meal> {
         val meal = mealRepository.findByName(name)
         return if (meal == null) ResponseEntity.notFound().build() else

src/main/kotlin/com/aitrainer/api/controller/diet/RecipeController.kt

@@ -2,6 +2,7 @@ package com.aitrainer.api.controller.diet
 
 import com.aitrainer.api.model.diet.Recipe
 import com.aitrainer.api.repository.diet.RecipeRepository
+import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 
@@ -9,13 +10,13 @@ import org.springframework.web.bind.annotation.*
 @RequestMapping("api")
 class RecipeController(private val recipeRepository: RecipeRepository) {
 
-    @PostMapping ("/recipe")
+    @PostMapping ("/recipe", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun insert(@RequestBody recipe: Recipe): ResponseEntity<Recipe> {
         val newRecipe = recipeRepository.save(recipe)
         return ResponseEntity.ok().body(newRecipe)
     }
 
-    @PostMapping("/recipe/{id}")
+    @PostMapping("/recipe/{id}", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
     fun update(@PathVariable(value = "id") id: Long, @RequestBody recipe: Recipe): ResponseEntity<Recipe> {
         val existingRecipe = recipeRepository.findByRecipeId(id) ?: return ResponseEntity.notFound().build()