bossanyit/workouttest_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API 1.2.5 Diet Preference, DietUserPreference

Browse Source
This commit is contained in:
Tibor Bossanyi
2023-04-22 15:31:42 +02:00
parent dd65f39003
commit 05aeb2d14e
23 changed files with 122 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/kotlin/com/aitrainer/api/controller/CustomerPackageController.kt
+14 -19
View File
@@ -14,21 +14,20 @@ import org.springframework.web.bind.annotation.RestController
@RestController
@RequestMapping("/api")
class CustomerPackageController( private val customerRepository: CustomerRepository,
private val customerExerciseDeviceRepository: CustomerExerciseDeviceRepository,
private val exercisesRepository: ExercisesRepository,
private val purchaseRepository: PurchaseRepository,
private val customerPropertyRepository: CustomerPropertyRepository,
private val exerciseResultRepository: ExerciseResultRepository,
private val customerActivityRepository: CustomerActivityRepository,
private val customerTrainingPlanRepository: CustomerTrainingPlanRepository,
private val customerMembership: CustomerMembershipRepository,
private val dietRepository: DietRepository,
private val dietUserConsumptionRepository: DietUserConsumptionRepository,
private val dietUserRepository: DietUserRepository,
private val dietUserPreferenceRepository: DietUserPreferenceRepository,
private val dietUserSensitivityRepository: DietUserSensitivityRepository,
private val customerConversationRepository: CustomerConversationRepository
class CustomerPackageController(private val customerRepository: CustomerRepository,
private val customerExerciseDeviceRepository: CustomerExerciseDeviceRepository,
private val exercisesRepository: ExercisesRepository,
private val purchaseRepository: PurchaseRepository,
private val customerPropertyRepository: CustomerPropertyRepository,
private val exerciseResultRepository: ExerciseResultRepository,
private val customerActivityRepository: CustomerActivityRepository,
private val customerTrainingPlanRepository: CustomerTrainingPlanRepository,
private val customerMembership: CustomerMembershipRepository,
private val dietRepository: DietRepository,
private val dietUserConsumptionRepository: DietUserConsumptionRepository,
private val dietUserRepository: DietUserRepository,
private val dietUserPreferenceRepository: DietUserPreferenceRepository,
private val customerConversationRepository: CustomerConversationRepository
) {
@@ -62,9 +61,6 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
val listDietUserPreference = dietUserPreferenceRepository.findByDietUserId(dietUserId)
val listDietUserPreferenceJson = gson.toJson(listDietUserPreference)
val listDietUserSensitivity = dietUserSensitivityRepository.findByDietUserId(dietUserId)
val listDietUserSensitivityJson = gson.toJson(listDietUserSensitivity)
val listCustomerConversation = customerConversationRepository.findByCustomerId(customerId)
val listCustomerConversationJson = gson.toJson(listCustomerConversation)
@@ -74,7 +70,6 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
"|||" + getClassRecord(Diet::class.simpleName, listDietJson) +
"|||" + getClassRecord(DietUserConsumption::class.simpleName, listDietUserConsumptionJson) +
"|||" + getClassRecord(DietUserPreference::class.simpleName, listDietUserPreferenceJson) +
"|||" + getClassRecord(DietUserSensitivity::class.simpleName, listDietUserSensitivityJson) +
"|||" + getClassRecord(CustomerConversation::class.simpleName, listCustomerConversationJson)
return if (packageJson.isEmpty()) ResponseEntity.notFound().build() else
src/main/kotlin/com/aitrainer/api/controller/PackageController.kt
+4 -4
View File
@@ -1,7 +1,7 @@
package com.aitrainer.api.controller
import com.aitrainer.api.model.*
import com.aitrainer.api.model.diet.DietSensitivity
import com.aitrainer.api.model.diet.DietPreference
import com.aitrainer.api.model.diet.Meal
import com.aitrainer.api.model.diet.Recipe
import com.aitrainer.api.model.diet.Store
@@ -38,7 +38,7 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
private val storeRepository: StoreRepository,
private val recipeRepository: RecipeRepository,
private val mealRepository: MealRepository,
private val dietSensitivityRepository: DietSensitivityRepository
private val dietPreferenceRepository: DietPreferenceRepository
) {
@GetMapping("/diet_package", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
@@ -63,7 +63,7 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
val listRawMaterial = mealRepository.findAll()
val listRawMaterialJson = gson.toJson(listRawMaterial)
val listDietSensitivity = dietSensitivityRepository.findAll()
val listDietSensitivity = dietPreferenceRepository.findAll()
val listDietSensitivityJson = gson.toJson(listDietSensitivity)
val listAppText = appTextRepository.findAllWithTranslation()
@@ -75,7 +75,7 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
"|||" + getClassRecord(Store::class.simpleName, listStoreJson) +
"|||" + getClassRecord(Recipe::class.simpleName, listRecipeJson) +
"|||" + getClassRecord(Meal::class.simpleName, listRawMaterialJson) +
"|||" + getClassRecord(DietSensitivity::class.simpleName, listDietSensitivityJson) +
"|||" + getClassRecord(DietPreference::class.simpleName, listDietSensitivityJson) +
"|||" + getClassRecord(AppText::class.simpleName, listAppTextJson)
return if (packageJson.isEmpty()) ResponseEntity.notFound().build() else
src/main/kotlin/com/aitrainer/api/controller/diet/DietSensitivityController.kt
-24
View File
@@ -1,24 +0,0 @@
package com.aitrainer.api.controller.diet
import com.aitrainer.api.model.diet.DietSensitivity
import com.aitrainer.api.repository.diet.DietSensitivityRepository
import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.*
@RestController
@RequestMapping("api")
class DietSensitivityController(private val dietSensitivityRepository: DietSensitivityRepository) {
@PostMapping ("/diet_sensitivity")
fun insert(@RequestBody dietSensitivity: DietSensitivity): ResponseEntity<DietSensitivity> {
val newDietSensitivity = dietSensitivityRepository.save(dietSensitivity)
return ResponseEntity.ok().body(newDietSensitivity)
}
@GetMapping("/diet_sensitivity")
fun getAll(): ResponseEntity<List<DietSensitivity>> {
val list = dietSensitivityRepository.findAll()
return if (list.isEmpty()) ResponseEntity.notFound().build() else
ResponseEntity.ok().body(list)
}
}
src/main/kotlin/com/aitrainer/api/controller/diet/DietUserPreferenceController.kt
+12
View File
@@ -22,4 +22,16 @@ class DietUserPreferenceController(private val dietUserPreferenceRepository: Die
return if (list.isEmpty()) ResponseEntity.notFound().build() else
ResponseEntity.ok().body(list)
}
@GetMapping("/diet_user_preference/preference/{dietPreferenceId}")
fun getByDietPreferenceIdId(@PathVariable dietPreferenceId: Long): ResponseEntity<List<DietUserPreference>> {
val list = dietUserPreferenceRepository.findByDietPreferenceId(dietPreferenceId)
return if (list.isEmpty()) ResponseEntity.notFound().build() else
ResponseEntity.ok().body(list)
}
@PostMapping("/diet_user_preference/delete", produces = [MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"])
fun delete(@RequestBody dietUserPreference: DietUserPreference): ResponseEntity<*> {
return ResponseEntity.ok().body(dietUserPreferenceRepository.delete(dietUserPreference))
}
}
src/main/kotlin/com/aitrainer/api/controller/diet/DietUserSensitivityController.kt
-25
View File
@@ -1,25 +0,0 @@
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.*
@RestController
@RequestMapping("/api")
class DietUserSensitivityController(private val dietUserSensitivityRepository: DietUserSensitivityRepository) {
@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))
}
@GetMapping("/diet_user_sensitivity/{dietUserId}")
fun getByDietUserId(@PathVariable dietUserId: Long): ResponseEntity<List<DietUserSensitivity>> {
val list = dietUserSensitivityRepository.findByDietUserId(dietUserId)
return if (list.isEmpty()) ResponseEntity.notFound().build() else
ResponseEntity.ok().body(list)
}
}
src/main/kotlin/com/aitrainer/api/model/diet/DietSensitivity.kt → src/main/kotlin/com/aitrainer/api/model/diet/DietPreference.kt
+3 -2
View File
@@ -8,7 +8,8 @@ import jakarta.persistence.Id
import javax.validation.constraints.NotNull
@Entity
data class DietSensitivity(
data class DietPreference(
@Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) var id: Long = 0,
@Expose @get: NotNull val name: String = "",
@Expose @get: NotNull val type: String = "",
@Expose @get: NotNull val preference: String = "",
)
src/main/kotlin/com/aitrainer/api/model/diet/DietUserPreference.kt
+3 -2
View File
@@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull
data class DietUserPreference(
@Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) var id: Long = 0,
@Expose @get: NotNull val dietUserId: Long = 0,
@Expose @get: NotNull val rawMaterialId: Long = 0,
@Expose @get: NotNull val temperature: Byte = 0,
@Expose @get: NotNull val dietPreferenceId: Long = 0,
@Expose @get: NotNull val preference: String = "",
@Expose @get: NotNull val preferenceType: String = "",
)
src/main/kotlin/com/aitrainer/api/model/diet/DietUserSensitivity.kt
-15
View File
@@ -1,15 +0,0 @@
package com.aitrainer.api.model.diet
import com.google.gson.annotations.Expose
import jakarta.persistence.Entity
import jakarta.persistence.GeneratedValue
import jakarta.persistence.GenerationType
import jakarta.persistence.Id
import javax.validation.constraints.NotNull
@Entity
data class DietUserSensitivity(
@Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) var id: Long = 0,
@Expose @get: NotNull val dietUserId: Long = 0,
@Expose @get: NotNull val sensitivityId: Long = 0,
)
src/main/kotlin/com/aitrainer/api/repository/diet/DietPreferenceRepository.kt
+6
View File
@@ -0,0 +1,6 @@
package com.aitrainer.api.repository.diet
import com.aitrainer.api.model.diet.DietPreference
import org.springframework.data.jpa.repository.JpaRepository
interface DietPreferenceRepository : JpaRepository<DietPreference, Int>
src/main/kotlin/com/aitrainer/api/repository/diet/DietSensitivityRepository.kt
-6
View File
@@ -1,6 +0,0 @@
package com.aitrainer.api.repository.diet
import com.aitrainer.api.model.diet.DietSensitivity
import org.springframework.data.jpa.repository.JpaRepository
interface DietSensitivityRepository : JpaRepository<DietSensitivity, Int>
src/main/kotlin/com/aitrainer/api/repository/diet/DietUserPreferenceRepository.kt
+2
View File
@@ -7,4 +7,6 @@ import org.springframework.stereotype.Repository
@Repository
interface DietUserPreferenceRepository : JpaRepository<DietUserPreference, Long> {
fun findByDietUserId(dietUserId: Long): List<DietUserPreference>
fun findByDietPreferenceId(dietPreferenceId: Long): List<DietUserPreference>
}
src/main/kotlin/com/aitrainer/api/repository/diet/DietUserSensitivityRepository.kt
-10
View File
@@ -1,10 +0,0 @@
package com.aitrainer.api.repository.diet
import com.aitrainer.api.model.diet.DietUserSensitivity
import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository
@Repository
interface DietUserSensitivityRepository : JpaRepository<DietUserSensitivity, Long> {
fun findByDietUserId(dietUserId: Long): List<DietUserSensitivity>
}
src/main/resources/application-diet.properties
+1 -1
View File
@@ -16,7 +16,7 @@ logging.config=classpath:logback-spring.xml
logging.file=logs
# if the database structure has been changed, increment this version number
application.version=1.2.4
application.version=1.2.5
jwt.secret=aitrainer
src/main/resources/application-dietprod.properties
+1 -1
View File
@@ -14,7 +14,7 @@ logging.config=classpath:logback-spring.xml
logging.file=logs
# if the database structue has been changed, increment this version number
application.version=1.2.4
application.version=1.2.5
jwt.secret=aitrainer
src/main/resources/application-prod.properties
+1 -1
View File
@@ -14,7 +14,7 @@ logging.config=classpath:logback-spring.xml
logging.file=logs
# if the database structue has been changed, increment this version number
application.version=1.2.4
application.version=1.2.5
jwt.secret=aitrainer
src/main/resources/application.properties
+1 -1
View File
@@ -17,7 +17,7 @@ logging.config=classpath:logback-spring.xml
logging.file=logs
# if the database structure has been changed, increment this version number
application.version=1.2.4
application.version=1.2.5
jwt.secret=aitrainer