From 8711988902219138c6b5e1b5de79cbc7ca70e016 Mon Sep 17 00:00:00 2001 From: bossanyit Date: Sun, 6 Dec 2020 15:21:47 +0100 Subject: [PATCH] API 1.0.18 ExerciseTypeDevice to ExerciseType --- src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt | 4 ++++ src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt b/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt index 97d1576..26bb559 100644 --- a/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt +++ b/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt @@ -40,4 +40,8 @@ data class ExerciseType( @Fetch(value = FetchMode.SUBSELECT) val parents: List = mutableListOf() + @OneToMany(cascade = [(CascadeType.ALL)], fetch = FetchType.EAGER, mappedBy = "exerciseType") + @Fetch(value = FetchMode.SUBSELECT) + val devices: List = mutableListOf() + } diff --git a/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt b/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt index 43df48e..27c4ec7 100644 --- a/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt @@ -74,7 +74,8 @@ class ExerciseTypeTest { val exerciseType = responseEntity.body!![0] assertEquals(exerciseType.name, "Chest Press") assertEquals(exerciseType.images[0].url, "images/2.2.1.1.chestpress.png") - assertEquals(responseEntity.body!![2].translations[0].name, "Tricepsz") + assertEquals(responseEntity.body!![2].translations[0].name, "Fekvenyomás") + assertEquals(responseEntity.body!![2].devices[0].exerciseDeviceId, 4) } } \ No newline at end of file