From 2e7a0a9021fa1de1f87be8535674ad729d9ac69a Mon Sep 17 00:00:00 2001 From: Bossanyi Tibor Date: Mon, 7 Jun 2021 15:26:48 +0200 Subject: [PATCH] API 1.0.44 TrainingPlan active --- build.gradle.kts | 2 +- data/db/update_1_0_44.sql | 8 ++++++++ src/main/kotlin/com/aitrainer/api/model/TrainingPlan.kt | 1 + .../com/aitrainer/api/repository/TrackingRepository.kt | 1 + src/main/resources/application-prod.properties | 2 +- src/main/resources/application.properties | 2 +- src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt | 1 + 7 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 data/db/update_1_0_44.sql diff --git a/build.gradle.kts b/build.gradle.kts index 55c4e96..e08a446 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "com.aitrainer" -version = "1.0.43" +version = "1.0.44" java.sourceCompatibility = JavaVersion.VERSION_1_8 repositories { diff --git a/data/db/update_1_0_44.sql b/data/db/update_1_0_44.sql new file mode 100644 index 0000000..c1139db --- /dev/null +++ b/data/db/update_1_0_44.sql @@ -0,0 +1,8 @@ +START TRANSACTION; + +ALTER TABLE `training_plan` + ADD COLUMN `active` TINYINT NOT NULL DEFAULT 0 AFTER `free`; + +UPDATE configuration set config_value = "1.0.44", date_change=CURRENT_DATE WHERE config_key = "db_version"; + +COMMIT; diff --git a/src/main/kotlin/com/aitrainer/api/model/TrainingPlan.kt b/src/main/kotlin/com/aitrainer/api/model/TrainingPlan.kt index f9a5360..e66f4fb 100644 --- a/src/main/kotlin/com/aitrainer/api/model/TrainingPlan.kt +++ b/src/main/kotlin/com/aitrainer/api/model/TrainingPlan.kt @@ -16,6 +16,7 @@ data class TrainingPlan ( @Expose @get: NotBlank var type: String = "", @Expose var internalName: String?, @Expose var free: Boolean?, + @Expose @get: NotBlank var active: Boolean = false, ) { @OneToMany(cascade = [(CascadeType.ALL)], fetch = FetchType.EAGER, mappedBy = "trainingPlan") @Fetch(value = FetchMode.SUBSELECT) diff --git a/src/main/kotlin/com/aitrainer/api/repository/TrackingRepository.kt b/src/main/kotlin/com/aitrainer/api/repository/TrackingRepository.kt index c954e02..af8728a 100644 --- a/src/main/kotlin/com/aitrainer/api/repository/TrackingRepository.kt +++ b/src/main/kotlin/com/aitrainer/api/repository/TrackingRepository.kt @@ -6,4 +6,5 @@ import org.springframework.stereotype.Repository @Repository interface TrackingRepository: JpaRepository { + } \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 5828935..fe4d908 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.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.43 +application.version=1.0.44 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 03f8cf4..30b464f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -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.43 +application.version=1.0.44 jwt.secret=aitrainer jasypt.encryptor.password=Tibor diff --git a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt index 97eee8f..a6b38a4 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt @@ -176,6 +176,7 @@ class AppPackageTest { assertEquals(plans[1].name, "Beginner Men’s workout") assertEquals(plans[1].internalName, "beginner_man") assertEquals(plans[1].free, true) + assertEquals(plans[1].active, true) assertEquals(plans[1].treeId, 37) assertEquals(plans[0].details[0].exerciseTypeId, 37) assertEquals(plans[0].details[1].weight, 20.0)