From 2bd3f2232deeb9c818c07b842b3869beec98a1d0 Mon Sep 17 00:00:00 2001
From: Bossanyi Tibor <sw@andio.biz>
Date: Fri, 3 Jul 2020 10:27:57 +0200
Subject: [PATCH] exercise model extension and exercise_type test fix

---
 .../kotlin/com/aitrainer/api/model/ExerciseType.kt   |  6 +++---
 src/main/kotlin/com/aitrainer/api/model/Exercises.kt |  1 +
 .../kotlin/com/aitrainer/api/test/ExerciseTest.kt    |  1 +
 .../com/aitrainer/api/test/ExerciseTypeTest.kt       | 12 ++++++------
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt b/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt
index 4b898dc..7358c93 100644
--- a/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt
+++ b/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt
@@ -14,9 +14,9 @@ data class ExerciseType (
         @get: NotBlank var name: String = "",        
         @get: NotBlank var description: String = "",
         @get: Null var video: BinaryType?,
-        @get: NotBlank var unit: String = "",
-        @get: Null var unitQuantity: String = "",
-        @get: Null var unitQuantityUnit: String = "",
+        @get: Null var unit: String?,
+        @get: Null var unitQuantity: String?,
+        @get: Null var unitQuantityUnit: String?,
 
 
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/kotlin/com/aitrainer/api/model/Exercises.kt b/src/main/kotlin/com/aitrainer/api/model/Exercises.kt
index d8a1d88..0e5bf2d 100644
--- a/src/main/kotlin/com/aitrainer/api/model/Exercises.kt
+++ b/src/main/kotlin/com/aitrainer/api/model/Exercises.kt
@@ -15,6 +15,7 @@ data class Exercises (
         @get: NonNull var quantity: Int = 0,
         @get: Null var restTime: Int?, // in seconds
         @get: NonNull var unit: String? = null,
+        @get: NonNull var unitQuantity: Double? = null,
 
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     val exerciseId: Long = 0
diff --git a/src/test/kotlin/com/aitrainer/api/test/ExerciseTest.kt b/src/test/kotlin/com/aitrainer/api/test/ExerciseTest.kt
index bbc2a55..79a7a35 100644
--- a/src/test/kotlin/com/aitrainer/api/test/ExerciseTest.kt
+++ b/src/test/kotlin/com/aitrainer/api/test/ExerciseTest.kt
@@ -35,6 +35,7 @@ class ExerciseTest {
             quantity = 100,
             dateAdd = "2020-05-13 04:32:00",
             unit = "repeat",
+            unitQuantity = 30.0,
             restTime = null
         )
         val exerciseNew = exerciseRepository.save(exercise)
diff --git a/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt b/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt
index fc004c4..4baea74 100644
--- a/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt
+++ b/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt
@@ -47,18 +47,18 @@ class ExerciseTypeTest {
 
     @Test
     fun testInsert(){
-        logger.info("Add 'Húzodzkodás 2")
-        val newEx = ExerciseType( "Húzodzkodás 2", " A legtöbb húzodszkodást 24 óra alatt John Ort érte el 7600-al 2016-ban. ", null )
+        logger.info("Add 'Húzodszkodás 2")
+        val newEx = ExerciseType( "Húzodszkodás 2", " A legtöbb húzodszkodást 24 óra alatt John Ort érte el 7600-al 2016-ban. ", null, null, null , null)
         val savedEx: ExerciseType = exerciseTypeRepository.save(newEx)
-        assertEquals(savedEx.name, "Húzodzkodás 2")
+        assertEquals(savedEx.name, "Húzodszkodás 2")
 
         this.insertedId = savedEx.exerciseTypeId
 
-        logger.info("Find 'Húzodzkodás 2")
+        logger.info("Find 'Húzodszkodás 2")
         val extype: ExerciseType = exerciseTypeRepository.findById( savedEx.exerciseTypeId ).orElse(null)
-        assertEquals( extype.name, "Húzodzkodás 2")
+        assertEquals( extype.name, "Húzodszkodás 2")
 
-        logger.info("Delete 'Húzodzkodás 2")
+        logger.info("Delete 'Húzodszkodás 2")
         exerciseTypeRepository.delete(extype)
     }
 }
\ No newline at end of file