From 36c5bcbc4909bb0b57f74a934d3b9ec250fc5df4 Mon Sep 17 00:00:00 2001 From: Bossanyi Tibor Date: Thu, 17 Jun 2021 23:30:15 +0200 Subject: [PATCH] API 1.0.45 ExerciseType buddy_warning --- build.gradle.kts | 2 +- data/db/update_1_0_45.sql | 8 ++++++++ src/main/kotlin/com/aitrainer/api/model/ExerciseType.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 + 6 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 data/db/update_1_0_45.sql diff --git a/build.gradle.kts b/build.gradle.kts index e08a446..05fa94c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "com.aitrainer" -version = "1.0.44" +version = "1.0.45" java.sourceCompatibility = JavaVersion.VERSION_1_8 repositories { diff --git a/data/db/update_1_0_45.sql b/data/db/update_1_0_45.sql new file mode 100644 index 0000000..36727df --- /dev/null +++ b/data/db/update_1_0_45.sql @@ -0,0 +1,8 @@ +START TRANSACTION; + +ALTER TABLE `exercise_type` + ADD COLUMN `buddy_warning` TINYINT NOT NULL DEFAULT 0 AFTER `base`; + +UPDATE configuration set config_value = "1.0.45", date_change=CURRENT_DATE WHERE config_key = "db_version"; + +COMMIT; diff --git a/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt b/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt index dea5851..c08a85e 100644 --- a/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt +++ b/src/main/kotlin/com/aitrainer/api/model/ExerciseType.kt @@ -18,6 +18,7 @@ data class ExerciseType( @Expose @get: Null var unitQuantityUnit: String?, @Expose @get: NonNull var active: Boolean?, @Expose @get: NonNull var base: Boolean?, + @Expose @get: NonNull var buddyWarning: Boolean = false, @Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) val exerciseTypeId: Long = 0, diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index fe4d908..e3c08f9 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.44 +application.version=1.0.45 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 30b464f..007d944 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.44 +application.version=1.0.45 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 a6b38a4..8ac880a 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt @@ -87,6 +87,7 @@ class AppPackageTest { val listExerciseType: List = gson.fromJson(exerciseTypeJson, type) assertTrue(listExerciseType.isNotEmpty()) assertEquals(listExerciseType[1].name, "Húzódzkodás") + assertEquals(listExerciseType[1].buddyWarning, true) //assertEquals(listExerciseType[1].translations[0].name, "Bicepsz") } else if (record[0] == ExerciseTree::class.simpleName) { val exerciseTreeJson: String = record[1]