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.42 exercises.training_plan_details_id

See merge request bossanyit/aitrainer_server!64
This commit is contained in:
Bossányi Tibor 2021-05-25 13:39:28 +00:00
commit 5567d79261
11 changed files with 2299 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -11,7 +11,7 @@ plugins {
}
group = "com.aitrainer"
version = "1.0.41"
version = "1.0.42"
java.sourceCompatibility = JavaVersion.VERSION_1_8
repositories {

2592
data/db/install.sql
View File

File diff suppressed because it is too large Load Diff

13
data/db/update_1_0_42.sql Normal file
View File

@ -0,0 +1,13 @@
START TRANSACTION;
ALTER TABLE `exercises`
ADD COLUMN `training_plan_details_id` INT NULL DEFAULT NULL AFTER `exercise_plan_detail_id`;
ALTER TABLE `customer_training_plan_details`
ADD COLUMN `resting_time` INT(3) NULL DEFAULT NULL,
ADD COLUMN `parallel` TINYINT(4) NULL DEFAULT NULL,
ADD COLUMN `day` CHAR(50) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci';
UPDATE configuration set config_value = "1.0.42", date_change=CURRENT_DATE WHERE config_key = "db_version";
COMMIT;

3
src/main/kotlin/com/aitrainer/api/model/CustomerTrainingPlanDetails.kt
View File

@ -14,6 +14,9 @@ data class CustomerTrainingPlanDetails (
@Expose var set: Int?,
@Expose var repeats: Int?,
@Expose var weight: Double?,
@Expose var restingTime: Int? = 0,
@Expose var parallel: Boolean? = false,
@Expose var day: String? = null,
) {
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "customerTrainingPlanId", nullable = false)

1
src/main/kotlin/com/aitrainer/api/model/Exercises.kt
View File

@ -18,6 +18,7 @@ data class Exercises (
@Expose @get: NonNull var unit: String? = null,
@Expose @get: NonNull var unitQuantity: Double? = null,
@Expose @get: NonNull var exercisePlanDetailId: Int = 0,
@Expose var trainingPlanDetailsId: Int? = 0,
@Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) val exerciseId: Long = 0
)

2
src/main/resources/application-prod.properties
View File

@ -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.41
application.version=1.0.42
jwt.secret=aitrainer

2
src/main/resources/application.properties
View File

@ -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.41
application.version=1.0.42
jwt.secret=aitrainer
jasypt.encryptor.password=Tibor

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

@ -93,9 +93,9 @@ class AppPackageTest {
val type = object : TypeToken<List<ExerciseTree?>?>() {}.type
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ő!")
assertEquals(listExerciseTree[1].name, "Muscle Build / Shape Toning")
assertEquals(listExerciseTree[1].internalName, "one_rep_max")
assertEquals(listExerciseTree[1].translations[0].name, "Izomépítés / Alakformálás")
} else if (record[0] == Property::class.simpleName) {
val propertyJson: String = record[1]
val type = object : TypeToken<List<Property?>?>() {}.type
@ -108,9 +108,9 @@ class AppPackageTest {
val type = object : TypeToken<List<ExerciseTreeParents?>?>() {}.type
val listParents: List<ExerciseTreeParents> = gson.fromJson(exerciseTreeParentsJson, type)
assertTrue(listParents.isNotEmpty())
assertEquals(listParents[2].exerciseTreeParentId, 0)
assertEquals(listParents[2].exerciseTreeParentId, 4)
assertEquals(listParents[6].exerciseTreeParentId, 4)
assertEquals(listParents[6].exerciseTreeChildId, 9)
assertEquals(listParents[6].exerciseTreeChildId, 17)
} else if (record[0] == ExercisePlanTemplate::class.simpleName) {
val exercisePlanTemplateJson: String = record[1]
val type = object : TypeToken<List<ExercisePlanTemplate?>?>() {}.type
@ -172,13 +172,13 @@ class AppPackageTest {
val trainingPlanJson: String = record[1]
val type = object : TypeToken<List<TrainingPlan?>?>() {}.type
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.size,10)
assertEquals(plans[1].name, "Beginner Men’s workout")
assertEquals(plans[1].internalName, "beginner_man")
assertEquals(plans[1].free, true)
assertEquals(plans[1].treeId, 3)
assertEquals(plans[0].details[0].exerciseTypeId, 63)
assertEquals(plans[0].details[1].weight, -1.0)
assertEquals(plans[1].treeId, 37)
assertEquals(plans[0].details[0].exerciseTypeId, 37)
assertEquals(plans[0].details[1].weight, 20.0)
} else if (record[0] == SplitTests::class.simpleName) {
val splitTestJson: String = record[1]
val type = object : TypeToken<List<SplitTests?>?>() {}.type

13
src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt
View File

@ -23,9 +23,8 @@ class ExerciseTreeParentsTest {
assertTrue(responseEntity.body!!.isNotEmpty())
val exerciseTreeParentList = responseEntity.body!!
assertEquals(exerciseTreeParentList.size, 2)
assertEquals(exerciseTreeParentList[0].exerciseTreeParentId, 9)
assertEquals(exerciseTreeParentList[1].exerciseTreeParentId, 10)
assertEquals(exerciseTreeParentList.size, 1)
assertEquals(exerciseTreeParentList[0].exerciseTreeParentId, 4)
}
@Test
@ -35,10 +34,10 @@ class ExerciseTreeParentsTest {
assertTrue(responseEntity.body!!.isNotEmpty())
val exerciseTreeParentList = responseEntity.body!!
assertEquals(exerciseTreeParentList.size, 18)
assertEquals(exerciseTreeParentList[4].exerciseTreeParentId, 3)
assertEquals(exerciseTreeParentList[4].exerciseTreeChildId, 7)
assertEquals(exerciseTreeParentList[0].sort, 3)
assertEquals(exerciseTreeParentList.size, 30)
assertEquals(exerciseTreeParentList[4].exerciseTreeParentId, 4)
assertEquals(exerciseTreeParentList[4].exerciseTreeChildId, 14)
assertEquals(exerciseTreeParentList[0].sort, 99)
}
}

12
src/test/kotlin/com/aitrainer/api/test/ExerciseTreeTest.kt
View File

@ -27,11 +27,11 @@ class ExerciseTreeTest {
val exerciseTreeItem = responseEntity.body!![0]
assertEquals(exerciseTreeItem.name, "Cardio")
assertEquals(responseEntity.body!![1].translations[0].name, "Erő!")
assertEquals(responseEntity.body!![0].abilities[0].exerciseAbilityId, 3)
assertEquals(responseEntity.body!![15].name, "Test Center")
assertEquals(responseEntity.body!![15].description, "Welcome")
assertEquals(responseEntity.body!![15].translations[0].name, "Tesztközpont")
assertEquals(responseEntity.body!![15].translations[0].description, "Üdv")
assertEquals(responseEntity.body!![1].translations[0].name, "Izomépítés / Alakformálás")
//assertEquals(responseEntity.body!![0].abilities[0].exerciseAbilityId, 3)
assertEquals(responseEntity.body!![15].name, "Cable/Free Weights Test")
assertTrue(responseEntity.body!![15].description.contains( "Welcome"))
assertEquals(responseEntity.body!![15].translations[0].name, "Kábeles és szabadsúlyos teszt")
assertTrue(responseEntity.body!![15].translations[0].description.contains( "Üdvözlünk a Tesztközpontban!"))
}
}

6
src/test/kotlin/com/aitrainer/api/test/ExerciseTypeTest.kt
View File

@ -33,7 +33,7 @@ class ExerciseTypeTest {
extype = exerciseTypeRepository.findById(id).orElse(null)
assertEquals(extype.name, "Chest Press")
assertEquals(extype.unit, "repeat")
assertEquals(extype.unitQuantityUnit, "kg")
assertEquals(extype.unitQuantityUnit, "kilogram")
}
@Test
@ -42,9 +42,9 @@ class ExerciseTypeTest {
assertEquals(exerciseTypes[0].exerciseTypeId, 1)
assertEquals(exerciseTypes[0].name, "Melső fekvőtámasz 1 perc")
assertEquals(exerciseTypes[15].name, "Timed Pushups")
assertEquals(exerciseTypes[15].name, "Sit-ups")
assertEquals(exerciseTypes[15].unit, "repeat")
assertEquals(exerciseTypes[15].unitQuantityUnit, "second")
assertEquals(exerciseTypes[20].unitQuantityUnit, "kilogram")
assertEquals(exerciseTypes[15].alternatives.size, 0)
assertEquals(exerciseTypes[15].parents.size, 1)
}