From 044e999e7d4738bc9e58fe21ec9bc60abce1dbb8 Mon Sep 17 00:00:00 2001
From: bossanyit <tibor.bossanyi@aitrainer.app>
Date: Sat, 5 Dec 2020 11:47:12 +0100
Subject: [PATCH] ExerciseTreeParents all

---
 .../controller/ExerciseTreeParentsController.kt    |  9 +++++++++
 .../kotlin/com/aitrainer/api/model/ExerciseTree.kt |  5 -----
 .../com/aitrainer/api/model/ExerciseTreeParents.kt |  9 +--------
 .../aitrainer/api/test/ExerciseTreeParentsTest.kt  | 14 ++++++++++++++
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/main/kotlin/com/aitrainer/api/controller/ExerciseTreeParentsController.kt b/src/main/kotlin/com/aitrainer/api/controller/ExerciseTreeParentsController.kt
index 71f1003..4887f65 100644
--- a/src/main/kotlin/com/aitrainer/api/controller/ExerciseTreeParentsController.kt
+++ b/src/main/kotlin/com/aitrainer/api/controller/ExerciseTreeParentsController.kt
@@ -22,4 +22,13 @@ class ExerciseTreeParentsController (private val exerciseTreeParentsRepository:
         return if (list.isEmpty()) ResponseEntity.notFound().build() else
             ResponseEntity.ok().body(list)
     }
+
+    @GetMapping("/exercise_tree_parents")
+    fun getAll(): ResponseEntity<List<ExerciseTreeParents>> {
+        val list: List<ExerciseTreeParents> = exerciseTreeParentsRepository.findAll().orEmpty()
+
+        logger.info(" -- Get All Exercise Tree Parents by $list")
+        return if (list.isEmpty()) ResponseEntity.notFound().build() else
+            ResponseEntity.ok().body(list)
+    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/aitrainer/api/model/ExerciseTree.kt b/src/main/kotlin/com/aitrainer/api/model/ExerciseTree.kt
index 891f7d0..d169fe7 100644
--- a/src/main/kotlin/com/aitrainer/api/model/ExerciseTree.kt
+++ b/src/main/kotlin/com/aitrainer/api/model/ExerciseTree.kt
@@ -22,9 +22,4 @@ data class ExerciseTree (
     @OneToMany(cascade = [(CascadeType.ALL)], fetch = FetchType.EAGER, mappedBy = "exerciseTree")
     @Fetch(value = FetchMode.SUBSELECT)
     val translations: List<ExerciseTreeTranslation> = mutableListOf<ExerciseTreeTranslation>().toList()
-
-  /*  @OneToMany(cascade = [(CascadeType.ALL)], fetch = FetchType.EAGER, mappedBy = "exerciseTreeChild")
-    @Fetch(value = FetchMode.SUBSELECT)
-    var parents: List<ExerciseTreeParents> = mutableListOf<ExerciseTreeParents>().toList()*/
-
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/aitrainer/api/model/ExerciseTreeParents.kt b/src/main/kotlin/com/aitrainer/api/model/ExerciseTreeParents.kt
index 58b3aaa..6011842 100644
--- a/src/main/kotlin/com/aitrainer/api/model/ExerciseTreeParents.kt
+++ b/src/main/kotlin/com/aitrainer/api/model/ExerciseTreeParents.kt
@@ -11,12 +11,5 @@ data class ExerciseTreeParents (
     var exerciseTreeParentsId: Long = 0,
     @get: NotNull var exerciseTreeParentId: Long?,
     @get: NotNull var exerciseTreeChildId: Long?
-)/*{
-    @ManyToOne(fetch = FetchType.EAGER, optional = false)
-    @JoinColumn(name = "exerciseTreeChildId", nullable = false)
-    @JsonIgnore
-    val exerciseTreeChild: ExerciseTree? = null
-
-}
-*/
+)
 
diff --git a/src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt b/src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt
index 0205467..d9521ac 100644
--- a/src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt
+++ b/src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt
@@ -19,6 +19,7 @@ class ExerciseTreeParentsTest {
 
     @Autowired
     private lateinit var exerciseTreeParentsRepository: ExerciseTreeParentsRepository
+    
     @Test
     fun testTreeParents() {
         val exerciseTreeParentsController = ExerciseTreeParentsController(exerciseTreeParentsRepository)
@@ -30,4 +31,17 @@ class ExerciseTreeParentsTest {
         assertEquals(exerciseTreeParentList[0].exerciseTreeParentId, 9)
         assertEquals(exerciseTreeParentList[1].exerciseTreeParentId, 10)
     }
+
+    @Test
+    fun testAllTreeParents() {
+        val exerciseTreeParentsController = ExerciseTreeParentsController(exerciseTreeParentsRepository)
+        val responseEntity: ResponseEntity<List<ExerciseTreeParents>> = exerciseTreeParentsController.getAll()
+
+        assertTrue(responseEntity.body!!.isNotEmpty())
+        val exerciseTreeParentList = responseEntity.body!!
+        assertEquals(exerciseTreeParentList.size, 27)
+        assertEquals(exerciseTreeParentList[4].exerciseTreeParentId, 3)
+        assertEquals(exerciseTreeParentList[4].exerciseTreeChildId, 7)
+
+    }
 }
\ No newline at end of file