API 1.0.39 internal_name in exercise_tree, training_plan
This commit is contained in:
@@ -14,7 +14,8 @@ data class ExerciseTree (
|
||||
@Expose @get: NotBlank var name: String = "",
|
||||
@Expose @get: NotBlank var description: String = "",
|
||||
@Expose @get: NotBlank var imageUrl: String = "",
|
||||
@Expose @get: NonNull var active: Boolean?
|
||||
@Expose @get: NonNull var active: Boolean?,
|
||||
@Expose var internalName: String?,
|
||||
|
||||
) {
|
||||
@OneToMany(cascade = [(CascadeType.ALL)], fetch = FetchType.EAGER, mappedBy = "exerciseTree")
|
||||
|
||||
@@ -13,6 +13,8 @@ data class TrainingPlan (
|
||||
@Expose @get: NotBlank var name: String = "",
|
||||
@Expose var description: String?,
|
||||
@Expose @get: NotBlank var type: String = "",
|
||||
@Expose var internalName: String?,
|
||||
@Expose var free: Boolean?,
|
||||
) {
|
||||
@OneToMany(cascade = [(CascadeType.ALL)], fetch = FetchType.EAGER, mappedBy = "trainingPlan")
|
||||
@Fetch(value = FetchMode.SUBSELECT)
|
||||
|
||||
@@ -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.38
|
||||
application.version=1.0.39
|
||||
|
||||
jwt.secret=aitrainer
|
||||
@@ -17,7 +17,7 @@ logging.config=classpath:logback-spring.xml
|
||||
logging.file=logs
|
||||
|
||||
# if the database structure has been changed, increment this version number
|
||||
application.version=1.0.38
|
||||
application.version=1.0.39
|
||||
|
||||
jwt.secret=aitrainer
|
||||
jasypt.encryptor.password=Tibor
|
||||
|
||||
@@ -91,6 +91,7 @@ class AppPackageTest {
|
||||
val listExerciseTree: List<ExerciseTree> = gson.fromJson(exerciseTreeJson, type)
|
||||
assertTrue(listExerciseTree.isNotEmpty())
|
||||
assertEquals(listExerciseTree[1].name, "Strength")
|
||||
assertEquals(listExerciseTree[6].internalName, "one_rep_max")
|
||||
assertEquals(listExerciseTree[1].translations[0].name, "Erő!")
|
||||
} else if (record[0] == Property::class.simpleName) {
|
||||
val propertyJson: String = record[1]
|
||||
@@ -170,6 +171,8 @@ class AppPackageTest {
|
||||
val plans: List<TrainingPlan> = gson.fromJson(trainingPlanJson, type)
|
||||
assertEquals(plans.size,2)
|
||||
assertEquals(plans[1].name, "Biceps")
|
||||
assertEquals(plans[1].internalName, "biceps_beginner")
|
||||
assertEquals(plans[1].free, true)
|
||||
assertEquals(plans[0].details[0].exerciseTypeId, 63)
|
||||
assertEquals(plans[0].details[1].weight, -1.0)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user