diff --git a/data/db/update_1_0_58.sql b/data/db/update_1_0_58.sql new file mode 100644 index 0000000..cd3aea7 --- /dev/null +++ b/data/db/update_1_0_58.sql @@ -0,0 +1,10 @@ +START TRANSACTION; + +ALTER TABLE `training_plan_detail` + ADD COLUMN `ecto_resting_time` INT(5) NULL DEFAULT NULL AFTER `ecto_weight`, + ADD COLUMN `endo_resting_time` INT(5) NULL DEFAULT NULL AFTER `endo_weight`, + ADD COLUMN `intensity` DOUBLE NULL DEFAULT NULL AFTER `round_group`; + +UPDATE configuration set config_value = "1.0.58", date_change=CURRENT_DATE WHERE config_key = "db_version"; + +COMMIT; diff --git a/src/main/kotlin/com/aitrainer/api/model/TrainingPlanDetail.kt b/src/main/kotlin/com/aitrainer/api/model/TrainingPlanDetail.kt index 66b8b53..ccbde4b 100644 --- a/src/main/kotlin/com/aitrainer/api/model/TrainingPlanDetail.kt +++ b/src/main/kotlin/com/aitrainer/api/model/TrainingPlanDetail.kt @@ -20,10 +20,13 @@ data class TrainingPlanDetail ( @Expose var dayId: Int? = 0, @Expose var ectoRepeats: Int? = 0, @Expose var ectoWeight: Double? = 0.0, + @Expose var ectoRestingTime: Int? = 0, @Expose var endoRepeats: Int? = 0, @Expose var endoWeight: Double? = 0.0, + @Expose var endoRestingTime: Int? = 0, @Expose var round: Int? = 0, @Expose var roundGroup: String? = null, + @Expose var intensity: Double? = 0.0, ) { diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index de86d07..3a3170c 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -2,7 +2,7 @@ spring.config.activate.on-profile=prod spring.config.use-legacy-processing = true ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties) -spring.datasource.url = jdbc:mysql://mariadb-galera.db.svc.cluster.local:3307/aitrainer?serverTimezone=CET&useSSL=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&allowMultiQueries=true +spring.datasource.url = jdbc:mysql://mariadb-shared.db.svc.cluster.local:3306/aitrainer?serverTimezone=CET&useSSL=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&allowMultiQueries=true spring.datasource.username = aitrainer spring.datasource.password = ENC(WZplPYr8WmrLHshesY4T6oXplK3MlUVJ) @@ -14,6 +14,6 @@ logging.config=classpath:logback-spring.xml logging.file=logs # if the database structue has been changed, increment this version number -application.version=1.0.57 +application.version=1.0.58 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fe88fea..833fc9a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -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.57 +application.version=1.0.58 jwt.secret=aitrainer diff --git a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt index bd8350b..a3143df 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt @@ -182,7 +182,7 @@ class AppPackageTest { val trainingPlanJson: String = record[1] val type = object : TypeToken?>() {}.type val plans: List = gson.fromJson(trainingPlanJson, type) - assertEquals(plans.size,41) + assertEquals(plans.size,57) assertEquals(plans[1].name, "Beginner Men’s workout") assertEquals(plans[1].internalName, "beginner_man") assertEquals(plans[1].free, true)