API 1.0.29 Evaluation

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

@@ -0,0 +1,26 @@
+package com.aitrainer.api.controller
+
+import com.aitrainer.api.model.Evaluation
+import com.aitrainer.api.model.ExerciseTree
+import com.aitrainer.api.repository.EvaluationRepository
+import com.aitrainer.api.repository.ExerciseTreeParentsRepository
+import com.aitrainer.api.repository.ExerciseTreeRepository
+import org.slf4j.LoggerFactory
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/api")
+class EvaluationController (private val evaluationRepository: EvaluationRepository) {
+    private val logger = LoggerFactory.getLogger(javaClass)
+
+    @GetMapping("/evaluation")
+    fun getEvaluation(): ResponseEntity<List<Evaluation>> {
+        val list: List<Evaluation> = evaluationRepository.findAll()
+        logger.info(" -- Get All Evaluations.")
+        return if (list.isEmpty()) ResponseEntity.notFound().build() else
+            ResponseEntity.ok().body(list)
+    }
+}

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

@@ -19,9 +19,17 @@ class ExerciseController(private val exercisesRepository: ExercisesRepository) {
     }
 
     @GetMapping("/exercises/customer/{id}")
-    fun getAllExersicesByCustomerId(@PathVariable( value = "id" ) customerId: Long? ): List<Exercises> =
+    fun getAllExercisesByCustomerId(@PathVariable( value = "id" ) customerId: Long? ): List<Exercises> =
             exercisesRepository.getAllByCustomerIdOrderByDateAddDesc(customerId)
 
+    @GetMapping("/exercises/exercise_type/{id}")
+    fun getAllExercisesByExerciseTypeId(@PathVariable( value = "id" ) exerciseTypeId: Long ): ResponseEntity<List<Exercises>> {
+        val exercises:List<Exercises> = exercisesRepository.getAllByExerciseTypeId(exerciseTypeId)
+        return if (exercises.isEmpty()) ResponseEntity.notFound().build() else
+            ResponseEntity.ok().body(exercises)
+    }
+
+
     @PostMapping("/exercises")
     fun createNewExercise(@Valid @RequestBody exercise: Exercises): ResponseEntity<Exercises> {
         return ResponseEntity.ok().body(exercisesRepository.save(exercise))

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

@@ -19,7 +19,8 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
                         private val productRepository: ProductRepository,
                         private val exerciseDeviceRepository: ExerciseDeviceRepository,
                         private val exerciseTreeParentsRepository: ExerciseTreeParentsRepository,
-                        private val exercisePlanTemplateRepository: ExercisePlanTemplateRepository
+                        private val exercisePlanTemplateRepository: ExercisePlanTemplateRepository,
+                        private val evaluationRepository: EvaluationRepository
 ) {
     private val logger = LoggerFactory.getLogger(javaClass)
 
@@ -55,6 +56,9 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
         val listPlanTemplate = exercisePlanTemplateRepository.findAll()
         val listPlanTemplateJson: String = gson.toJson(listPlanTemplate)
 
+        val listEvaluations = evaluationRepository.findAll()
+        val listEvaluationJson: String = gson.toJson(listEvaluations)
+
 
         val packageJson: String =
                     getClassRecord(ExerciseDevice::class.simpleName, listDevicesJson) +
@@ -64,7 +68,8 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
            "|||" +  getClassRecord(ExerciseType::class.simpleName, listExerciseTypeJson) +
            "|||" +  getClassRecord(ExerciseAbility::class.simpleName, listExerciseAbilityJson) +
            "|||" +  getClassRecord(ExerciseTreeParents::class.simpleName, listExerciseTreeParentsJson) +
-           "|||" +  getClassRecord(ExercisePlanTemplate::class.simpleName, listPlanTemplateJson)
+           "|||" +  getClassRecord(ExercisePlanTemplate::class.simpleName, listPlanTemplateJson) +
+           "|||" +  getClassRecord(Evaluation::class.simpleName, listEvaluationJson)
 
         return if (packageJson.isEmpty()) ResponseEntity.notFound().build() else
             ResponseEntity.ok().body(packageJson)

src/main/kotlin/com/aitrainer/api/model/Evaluation.kt

@@ -0,0 +1,20 @@
+package com.aitrainer.api.model
+
+import com.google.gson.annotations.Expose
+import org.hibernate.annotations.Fetch
+import org.hibernate.annotations.FetchMode
+import org.springframework.lang.NonNull
+import javax.persistence.*
+import javax.validation.constraints.NotBlank
+
+@Entity
+data class Evaluation (
+        @Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @get: NonNull var evaluationId: Int,
+        @Expose @get: NonNull var exerciseTypeId: Long = 0,
+        @Expose @get: NotBlank var name: String = "",
+        @Expose @get: NonNull var unit: String = "",
+) {
+        @OneToMany(cascade = [(CascadeType.ALL)], fetch = FetchType.EAGER, mappedBy = "evaluation")
+        @Fetch(value = FetchMode.SUBSELECT)
+        @Expose val attributes: List<EvaluationAttribute> = mutableListOf()
+}

src/main/kotlin/com/aitrainer/api/model/EvaluationAttribute.kt

@@ -0,0 +1,27 @@
+package com.aitrainer.api.model
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.google.gson.annotations.Expose
+import org.springframework.lang.NonNull
+import javax.persistence.*
+import javax.validation.constraints.NotBlank
+
+@Entity
+data class EvaluationAttribute (
+        @Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @get: NonNull var evaluationAttrId: Int,
+        //@Expose @get: NonNull var evaluationId: Long = 0,
+        @Expose @get: NotBlank var name: String = "",
+        @Expose var sex: String = "m",
+        @Expose @get: NonNull var ageMin: Int = 0,
+        @Expose @get: NonNull var ageMax: Int = 0,
+        @Expose @get: NonNull var valueMin: Double = 0.0,
+        @Expose @get: NonNull var valueMax: Double = 0.0,
+
+        @Expose @get: NonNull var evaluation_text: String = "",
+        @Expose var suggestion: String?,
+) {
+        @ManyToOne(fetch = FetchType.EAGER, optional = false)
+        @JoinColumn(name="evaluationId", nullable=false)
+        @JsonIgnore
+        val evaluation: Evaluation? = null
+}

src/main/kotlin/com/aitrainer/api/repository/EvaluationRepository.kt

@@ -0,0 +1,11 @@
+package com.aitrainer.api.repository
+
+import com.aitrainer.api.model.Evaluation
+import com.aitrainer.api.model.ExerciseTree
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.stereotype.Repository
+
+@Repository
+interface EvaluationRepository : JpaRepository<Evaluation, Int> {
+}

src/main/kotlin/com/aitrainer/api/repository/ExercisesRepository.kt

@@ -7,4 +7,6 @@ import org.springframework.stereotype.Repository
 @Repository
 interface ExercisesRepository : JpaRepository<Exercises, Long> {
     fun getAllByCustomerIdOrderByDateAddDesc( customerId: Long? ):List<Exercises>
+
+    fun getAllByExerciseTypeId(exerciseTypeId: Long): List<Exercises>
 }

src/main/resources/application-prod.properties

@@ -17,6 +17,6 @@ logging.config=classpath:logback-spring.xml
 logging.file=logs
 
 # if the database structure has been changed, increment this version number
-application.version=1.0.28
+application.version=1.0.29
 
 jwt.secret=aitrainer

src/main/resources/application.properties

@@ -17,6 +17,6 @@ logging.config=classpath:logback-spring.xml
 logging.file=logs
 
 # if the database structure has been changed, increment this version number
-application.version=1.0.28
+application.version=1.0.29
 
 jwt.secret=aitrainer

src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt

@@ -72,8 +72,8 @@ class AppCustomerPackageTest {
                 val type = object : TypeToken<List<Exercises?>?>() {}.type
                 val exerciseList: List<Exercises> = gson.fromJson(exercisesJson, type)
                 assertTrue(exerciseList.isNotEmpty())
-                assertEquals(exerciseList[0].exerciseTypeId, 37)
-                assertEquals(exerciseList[0].quantity, 40.0)
+                assertEquals(exerciseList[0].exerciseTypeId, 2)
+                assertEquals(exerciseList[0].quantity, 34.0)
             } else if (record[0] == CustomerExerciseDevice::class.simpleName) {
                 val exerciseDeviceJson: String = record[1]
                 val type = object : TypeToken<List<CustomerExerciseDevice?>?>() {}.type

src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt

@@ -33,6 +33,8 @@ class AppPackageTest {
     private lateinit var exerciseTreeParentsRepository: ExerciseTreeParentsRepository
     @Autowired
     private lateinit var exercisePlanTemplateRepository: ExercisePlanTemplateRepository
+    @Autowired
+    private lateinit var evaluationRepository: EvaluationRepository
 
     @Test
     fun testAppPackage() {
@@ -46,7 +48,8 @@ class AppPackageTest {
             productRepository,
             exerciseDeviceRepository,
             exerciseTreeParentsRepository,
-            exercisePlanTemplateRepository
+            exercisePlanTemplateRepository,
+            evaluationRepository
         )
         val response: ResponseEntity<*> = controller.getPackageData()
 
@@ -99,6 +102,15 @@ class AppPackageTest {
                 assertEquals(listTemplate[0].translations[0].name, "Saját testes tesztek")
                 assertEquals(listTemplate[0].details[0].exerciseTypeId, 2)
                 assertEquals(listTemplate[1].details[1].exerciseTypeId, 33)
+            } else if (record[0] == Evaluation::class.simpleName) {
+                val evaluationJson: String = record[1]
+                val type = object : TypeToken<List<Evaluation?>?>() {}.type
+                val evaluations: List<Evaluation> = gson.fromJson(evaluationJson, type)
+                assertTrue(evaluations.isNotEmpty())
+                assertEquals(evaluations.size, 2)
+                assertEquals(evaluations[0].name, "PushUps")
+                assertEquals(evaluations[0].attributes.size, 10)
+                assertEquals(evaluations[0].attributes[1].name, "Fekvőtámasz_ffi_17-19_fair")
             }
         }
 

src/test/kotlin/com/aitrainer/api/test/EvaluationTest.kt

@@ -0,0 +1,37 @@
+package com.aitrainer.api.test
+
+import com.aitrainer.api.controller.EvaluationController
+import com.aitrainer.api.controller.ProductController
+import com.aitrainer.api.repository.EvaluationRepository
+import com.aitrainer.api.repository.ProductRepository
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+@SpringBootTest
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class EvaluationTest {
+
+    @Autowired
+    private lateinit var evaluationRepository: EvaluationRepository
+
+
+    @Test
+    fun testGetEvaluations() {
+        val controller = EvaluationController(evaluationRepository)
+        val response = controller.getEvaluation()
+
+        val evaluations = response.body
+
+        assertTrue(evaluations is List)
+        assertTrue(evaluations.isNotEmpty())
+        assertEquals(evaluations.size, 2)
+        assertEquals(evaluations[0].name, "PushUps")
+        assertEquals(evaluations[0].attributes.size, 10)
+        assertEquals(evaluations[0].attributes[0].name, "Fekvőtámasz_ffi_17-19_very_poor")
+    }
+
+}

src/test/kotlin/com/aitrainer/api/test/ExercisePlanTest.kt

@@ -9,10 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.RequestHeader
 import java.util.*
 import kotlin.test.assertEquals
-import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
 @SpringBootTest

src/test/kotlin/com/aitrainer/api/test/ExerciseTest.kt

@@ -30,6 +30,23 @@ class ExerciseTest {
         assertEquals( exercises2.size, 0)
     }
 
+    @Test
+    fun testGetByExerciseTypeId() {
+        val id: Long = 2
+        val exerciseController = ExerciseController(exerciseRepository)
+        val response: ResponseEntity<List<Exercises>> = exerciseController.getAllExercisesByExerciseTypeId(id)
+
+        val exercises = response.body
+
+        assertTrue(exercises is List)
+        assertTrue(exercises.isNotEmpty())
+        assertEquals(exercises.size, 3)
+        assertEquals(exercises[2].customerId, 90)
+
+        val response2: ResponseEntity<List<Exercises>> = exerciseController.getAllExercisesByExerciseTypeId(22)
+        assertEquals(response2.statusCode, HttpStatus.NOT_FOUND)
+    }
+
     @Test
     fun testInsert() {
         var exercise = Exercises(