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

API 1.2+1 DietMeal + fixes

Browse Source
This commit is contained in:
Tibor Bossanyi
2023-02-25 12:44:05 +01:00
parent 8f354803ca
commit e3107147a1
33 changed files with 871 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt
+3 -2
View File
@@ -8,6 +8,7 @@ import com.aitrainer.api.service.EmailTemplateService
import com.aitrainer.api.service.Firebase
import org.slf4j.LoggerFactory
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.beans.factory.annotation.Value
import org.springframework.http.HttpHeaders
import org.springframework.http.ResponseEntity
import org.springframework.security.access.annotation.Secured
@@ -153,7 +154,7 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
}
@PostMapping("/club_registration")
fun clubRegistration(@Valid @RequestBody json: String): ResponseEntity<*> {
fun clubRegistration(@Valid @RequestBody json: String, @Value("\${firebase.key}") apiKey: String): ResponseEntity<*> {
val newUser: ClubUser = ClubUser().fromJson(json)
@@ -173,7 +174,7 @@ class CustomerController ( private val customerRepository: CustomerRepository) {
val stringCharacters = ('0'..'z').toList().toTypedArray()
val genPassword = (1..10).map { stringCharacters.random() }.joinToString("")
val firebase = Firebase()
val firebase = Firebase(apiKey)
val signupResponse = firebase.signUp(newUser.email, genPassword)
?: return ResponseEntity.badRequest().body("Firebase exception ${firebase.error}")
src/main/kotlin/com/aitrainer/api/controller/CustomerPackageController.kt
+14 -18
View File
@@ -28,7 +28,8 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
private val dietUserConsumptionRepository: DietUserConsumptionRepository,
private val dietUserRepository: DietUserRepository,
private val dietUserPreferenceRepository: DietUserPreferenceRepository,
private val dietUserSensitivityRepository: DietUserSensitivityRepository
private val dietUserSensitivityRepository: DietUserSensitivityRepository,
private val customerConversationRepository: CustomerConversationRepository
) {
@@ -53,16 +54,10 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
val customerJson: String = gson.toJson(customer)
val dietUserJson: String = gson.toJson(dietUser)
val listCustomerProperty = customerPropertyRepository.findLastPropertiesByCustomerId(customerId)
val listCustomerPropertyJson = gson.toJson(listCustomerProperty)
val listMembership = customerMembership.findAllByCustomer(customer)
val listMembershipJson = gson.toJson(listMembership)
val listDiet = dietRepository.findByDietUserId(dietUserId)
val listDietJson = gson.toJson(listDiet)
val listDietRawMaterial = dietRawMaterialRepository.findByDietId(dietUserId)
val listDietRawMaterial = dietRawMaterialRepository.findByDietMealId(dietUserId)
val listDietRawMaterialJson = gson.toJson(listDietRawMaterial)
val listDietUserConsumption = dietUserConsumptionRepository.findByDietUserId(dietUserId)
@@ -74,17 +69,18 @@ class CustomerPackageController( private val customerRepository: CustomerReposit
val listDietUserSensitivity = dietUserSensitivityRepository.findByDietUserId(dietUserId)
val listDietUserSensitivityJson = gson.toJson(listDietUserSensitivity)
val packageJson: String =
getClassRecord(Customer::class.simpleName, customerJson) +
"|||" + getClassRecord(DietUser::class.simpleName, dietUserJson)
"|||" + getClassRecord(CustomerProperty::class.simpleName, listCustomerPropertyJson)
"|||" + getClassRecord(CustomerMembership::class.simpleName, listMembershipJson)
"|||" + getClassRecord(Diet::class.simpleName, listDietJson)
"|||" + getClassRecord(DietRawMaterial::class.simpleName, listDietRawMaterialJson)
"|||" + getClassRecord(DietUserConsumption::class.simpleName, listDietUserConsumptionJson)
"|||" + getClassRecord(DietUserPreference::class.simpleName, listDietUserPreferenceJson)
"|||" + getClassRecord(DietUserSensitivity::class.simpleName, listDietUserSensitivityJson)
val listCustomerConversation = customerConversationRepository.findByCustomerId(customerId)
val listCustomerConversationJson = gson.toJson(listCustomerConversation)
val packageJson: String =
getClassRecord(Customer::class.simpleName, customerJson) +
"|||" + getClassRecord(DietUser::class.simpleName, dietUserJson) +
"|||" + getClassRecord(Diet::class.simpleName, listDietJson) +
"|||" + getClassRecord(DietRawMaterial::class.simpleName, listDietRawMaterialJson) +
"|||" + 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
ResponseEntity.ok().body(packageJson)
src/main/kotlin/com/aitrainer/api/controller/OpenAIController.kt
+35 -6
View File
@@ -1,11 +1,10 @@
package com.aitrainer.api.controller
import com.aitrainer.api.model.OpenAI
import com.aitrainer.api.openai.OpenAIService
import kotlinx.coroutines.*
import org.slf4j.LoggerFactory
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
import org.springframework.web.bind.annotation.*
@RestController
@RequestMapping("/api")
@@ -13,10 +12,10 @@ class OpenAIController() {
private val logger = LoggerFactory.getLogger(javaClass)
@OptIn(DelicateCoroutinesApi::class)
@GetMapping("/openai/completion")
fun getOpenAIResponse(question: String) : String {
@PostMapping("/openai/completion")
fun getOpenAIResponse(@RequestBody question: String) : String {
var result = ""
val openAIService = OpenAIService()
val openAIService = OpenAIService(null, null)
val deferred = GlobalScope.async {
openAIService.completion(question)
}
@@ -26,5 +25,35 @@ class OpenAIController() {
}
return result
}
@OptIn(DelicateCoroutinesApi::class)
@PostMapping("/openai/completion_with_model")
fun getOpenAIResponseWithModel(@RequestBody openai: OpenAI) : String {
var result = ""
val openAIService = OpenAIService(openai.modelName, openai.temperature)
val deferred = GlobalScope.async {
openAIService.completion(openai.question)
}
runBlocking {
result = deferred.await()
//println("Result: $result" )
}
return result
}
@OptIn(DelicateCoroutinesApi::class)
@GetMapping("/openai/list_models")
fun getOpenAIModels(): MutableList<String> {
var result = mutableListOf<String>()
val openAIService = OpenAIService(null, null)
val deferred = GlobalScope.async {
openAIService.getModels()
}
runBlocking {
result = deferred.await()
//println("Result: $result" )
}
return result
}
}
src/main/kotlin/com/aitrainer/api/controller/diet/DietController.kt
+17
View File
@@ -15,6 +15,23 @@ class DietController(private val dietRepository: DietRepository) {
return ResponseEntity.ok().body(dietRepository.save(diet))
}
@PostMapping("/diet/{id}")
fun update(@PathVariable(value = "id") id: Long, @RequestBody diet: Diet): ResponseEntity<Diet> {
val existingDiet = dietRepository.findByDietId(id) ?: return ResponseEntity.notFound().build()
val updatedDiet: Diet = existingDiet.copy(
dietId = diet.dietId,
dietUserId = diet.dietUserId,
dietText = diet.dietText,
startDate = diet.startDate
)
diet.meals.forEach {
it.diet = diet
updatedDiet.meals.add(it)
}
return ResponseEntity.ok().body(dietRepository.save(updatedDiet))
}
@GetMapping("/diet/{dietUserId}")
fun getByDietUserId(@PathVariable dietUserId: Long): ResponseEntity<List<Diet>> {
val list = dietRepository.findByDietUserId(dietUserId)
src/main/kotlin/com/aitrainer/api/controller/diet/DietCustomerController.kt
+5 -9
View File
@@ -7,11 +7,10 @@ import com.aitrainer.api.model.diet.DietCustomer
import com.aitrainer.api.model.diet.DietUser
import com.aitrainer.api.repository.CustomerRepository
import com.aitrainer.api.repository.diet.DietUserRepository
import com.aitrainer.api.service.Email
import com.aitrainer.api.service.EmailTemplateService
import com.aitrainer.api.service.Firebase
import com.aitrainer.api.service.ServiceBeans
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.beans.factory.annotation.Value
import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.*
import java.time.LocalDateTime
@@ -25,11 +24,8 @@ class DietCustomerController(private val dietUserRepository: DietUserRepository,
@Autowired
var serviceBeans: ServiceBeans? = null
@Autowired
private var emailTemplateService: EmailTemplateService? = null
@PostMapping("/diet_registration")
fun insert(@RequestBody dietCustomerJson: String): ResponseEntity<*> {
fun insert(@RequestBody dietCustomerJson: String, @Value("\${firebase.key}") apiKey: String): ResponseEntity<*> {
val newDietCustomer: DietCustomer = DietCustomer().fromJson(dietCustomerJson)
if ( newDietCustomer.email.isEmpty()) {
@@ -48,7 +44,7 @@ class DietCustomerController(private val dietUserRepository: DietUserRepository,
var existingCustomer: Customer? = customerRepository.findByEmailAndActive(newDietCustomer.email, "Y")
if (existingCustomer == null ) {
val firebase = Firebase()
val firebase = Firebase(apiKey)
val signupResponse = firebase.signUp(newDietCustomer.email, genPassword)
?: return ResponseEntity.badRequest().body("Firebase exception ${firebase.error}")
idToken = signupResponse.idToken
@@ -125,7 +121,7 @@ class DietCustomerController(private val dietUserRepository: DietUserRepository,
}
// create email link
val activationLink = "https://diet4you.andio.hu/welcome/id=$idToken"
/*val activationLink = "https://diet4you.andio.hu/welcome/id=$idToken"
if ( emailTemplateService == null ) {
emailTemplateService = EmailTemplateService()
}
@@ -134,7 +130,7 @@ class DietCustomerController(private val dietUserRepository: DietUserRepository,
// send email
val email = Email()
email.send(newDietCustomer.email, html, subject)
email.send(newDietCustomer.email, html, subject)*/
return ResponseEntity.ok().body(existingCustomer)
}
src/main/kotlin/com/aitrainer/api/controller/diet/DietRawMaterialController.kt
+3 -3
View File
@@ -15,9 +15,9 @@ class DietRawMaterialController(private val dietRawMaterialRepository: DietRawMa
return ResponseEntity.ok().body(dietRawMaterialRepository.save(dietRawMaterial))
}
@GetMapping("/diet_raw_material/{dietId}")
fun getByDietUserId(@PathVariable dietId: Long): ResponseEntity<List<DietRawMaterial>> {
val list = dietRawMaterialRepository.findByDietId(dietId)
@GetMapping("/diet_raw_material/{dietMealId}")
fun getByDietUserId(@PathVariable dietMealId: Long): ResponseEntity<List<DietRawMaterial>> {
val list = dietRawMaterialRepository.findByDietMealId(dietMealId)
return if (list.isEmpty()) ResponseEntity.notFound().build() else
ResponseEntity.ok().body(list)
}
src/main/kotlin/com/aitrainer/api/controller/diet/RecipeController.kt
+10 -2
View File
@@ -26,7 +26,8 @@ class RecipeController(private val recipeRepository: RecipeRepository) {
ch = recipe.ch,
fat = recipe.fat,
protein = recipe.protein,
dietUserId = recipe.dietUserId
dietUserId = recipe.dietUserId,
mealId = recipe.mealId
)
recipe.rawMaterials.forEach {
it.recipe = recipe
@@ -42,13 +43,20 @@ class RecipeController(private val recipeRepository: RecipeRepository) {
ResponseEntity.ok().body(list)
}
@GetMapping("/recipe/{dietUserId}")
@GetMapping("/recipe/user/{dietUserId}")
fun getByDietUserId(@PathVariable dietUserId: Long): ResponseEntity<List<Recipe>> {
val list = recipeRepository.findByDietUserId(dietUserId)
return if (list == null) ResponseEntity.notFound().build() else
ResponseEntity.ok().body(list)
}
@GetMapping("/recipe/meal/{mealId}")
fun getByMealId(@PathVariable mealId: Long): ResponseEntity<List<Recipe>> {
val list = recipeRepository.findByMealId(mealId)
return if (list == null) ResponseEntity.notFound().build() else
ResponseEntity.ok().body(list)
}
@GetMapping("/recipe/name/{name}")
fun getByName(@PathVariable name: String): ResponseEntity<List<Recipe>> {
val list = recipeRepository.findByName(name)