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

Merge branch 'tibor' into 'master'

Browse Source 
API 1.0.24+3 ExerciseType all into the AppPackage

See merge request bossanyit/aitrainer_server!37
This commit is contained in:
Bossányi Tibor 2021-02-06 16:44:54 +00:00
commit e806b412a7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/com/aitrainer/api/controller/PackageController.kt
View File

@ -42,7 +42,7 @@ class PackageController(private val exerciseAbilityRepository: ExerciseAbilityRe
val listExerciseTree = exerciseTreeRepository.getActiveMenu()
val listExerciseTreeJson: String = gson.toJson(listExerciseTree)
val listExerciseType = exerciseTypeRepository.getActiveExerciseTypes()
val listExerciseType = exerciseTypeRepository.findAll()
val listExerciseTypeJson = gson.toJson(listExerciseType)
val listExerciseAbility = exerciseAbilityRepository.findAll()

4
src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt
View File

@ -62,8 +62,8 @@ class AppPackageTest {
val type = object : TypeToken<List<ExerciseType?>?>() {}.type
val listExerciseType: List<ExerciseType> = gson.fromJson(exerciseTypeJson, type)
assertTrue(listExerciseType.isNotEmpty())
assertEquals(listExerciseType[1].name, "Biceps")
assertEquals(listExerciseType[1].translations[0].name, "Bicepsz")
assertEquals(listExerciseType[1].name, "Húzódzkodás")
//assertEquals(listExerciseType[1].translations[0].name, "Bicepsz")
} else if (record[0] == ExerciseTree::class.simpleName) {
val exerciseTreeJson: String = record[1]
val type = object : TypeToken<List<ExerciseTree?>?>() {}.type