From d2d7948a4973f51d2fa17c3979bd8e3bf3672145 Mon Sep 17 00:00:00 2001 From: Bossanyi Tibor Date: Sun, 7 Mar 2021 12:55:19 +0100 Subject: [PATCH] API 1.0.27 TreeParents.sort, Tracking.event_value is TEXT --- build.gradle.kts | 2 +- data/db/install.sql | 41 ++++++++++--------- data/db/update_1_0_27.sql | 12 ++++++ .../api/controller/ControllerAspect.kt | 9 ---- .../api/model/ExerciseTreeParents.kt | 3 +- .../resources/application-prod.properties | 2 +- src/main/resources/application.properties | 2 +- .../api/test/ExerciseTreeParentsTest.kt | 3 +- 8 files changed, 41 insertions(+), 33 deletions(-) create mode 100644 data/db/update_1_0_27.sql diff --git a/build.gradle.kts b/build.gradle.kts index 2e15540..935e2cc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "com.aitrainer" -version = "1.0.26" +version = "1.0.27" java.sourceCompatibility = JavaVersion.VERSION_1_8 repositories { diff --git a/data/db/install.sql b/data/db/install.sql index 81aa255..5384ef9 100644 --- a/data/db/install.sql +++ b/data/db/install.sql @@ -610,32 +610,35 @@ REPLACE INTO `exercise_tree` (`tree_id`, `name`, `image_url`, `active`) VALUES (18, 'Thigh', 'images/2.1.4.squats.png', 1), (19, 'Calf', 'images/2.1.4.squats.png', 1), (20, 'Back', 'images/2.2.1.5.shoulders.png', 1); +(21, 'Test Center', 'images/2.2.1.5.shoulders.png', 1); CREATE TABLE IF NOT EXISTS `exercise_tree_parents` ( `exercise_tree_parents_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `exercise_tree_parent_id` int(11) NOT NULL DEFAULT 0, `exercise_tree_child_id` int(11) NOT NULL DEFAULT 0, + `sort` INT(3) NULL DEFAULT '0', PRIMARY KEY (`exercise_tree_parents_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci; -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (15, 0, 3); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (16, 0, 4); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (17, 0, 5); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (18, 2, 6); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (19, 3, 7); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (20, 3, 8); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (21, 4, 9); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (22, 4, 10); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (23, 5, 11); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (24, 5, 12); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (25, 5, 13); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (26, 9, 14); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (27, 9, 15); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (28, 9, 16); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (29, 9, 17); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (30, 9, 18); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (31, 9, 19); -REPLACE INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`) VALUES (32, 9, 20); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (15, 0, 3, 3); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (16, 0, 4, 2); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (17, 0, 5, 4); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (18, 2, 6, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (20, 3, 8, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (19, 3, 7, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (21, 4, 9, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (22, 4, 10, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (32, 9, 20, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (31, 9, 19, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (30, 9, 18, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (29, 9, 17, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (28, 9, 16, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (27, 9, 15, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (26, 9, 14, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (46, 10, 20, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (47, 10, 15, 0); +INSERT INTO `exercise_tree_parents` (`exercise_tree_parents_id`, `exercise_tree_parent_id`, `exercise_tree_child_id`, `sort`) VALUES (49, 0, 21, 1); + -- Struktúra mentése tábla aitrainer2. exercise_tree_translation @@ -928,7 +931,7 @@ CREATE TABLE `tracking` ( `customer_id` INT(20) NOT NULL DEFAULT '0', `date_add` DATETIME NOT NULL, `event` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', - `event_value` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', + `event_value` TEXT NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `area` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `platform` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `version` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', diff --git a/data/db/update_1_0_27.sql b/data/db/update_1_0_27.sql new file mode 100644 index 0000000..bb1a896 --- /dev/null +++ b/data/db/update_1_0_27.sql @@ -0,0 +1,12 @@ +START TRANSACTION; + +ALTER TABLE `tracking` + CHANGE COLUMN `event_value` `event_value` TEXT NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci' AFTER `event`; + +ALTER TABLE `exercise_tree_parents` + ADD COLUMN `sort` INT(3) NULL DEFAULT '0' AFTER `exercise_tree_child_id`; + +UPDATE configuration set config_value = "1.0.27", date_change=CURRENT_DATE WHERE config_key = "db_version"; + +COMMIT; + diff --git a/src/main/kotlin/com/aitrainer/api/controller/ControllerAspect.kt b/src/main/kotlin/com/aitrainer/api/controller/ControllerAspect.kt index a32ac78..4f6c1a3 100644 --- a/src/main/kotlin/com/aitrainer/api/controller/ControllerAspect.kt +++ b/src/main/kotlin/com/aitrainer/api/controller/ControllerAspect.kt @@ -21,15 +21,6 @@ class ControllerAspect { @Autowired private lateinit var properties: ApplicationProperties - /* @Suppress("unused") - @Pointcut("execution(* com.aitrainer.api.controller.*.*())") - fun controllerAspect() { - } - - @Before("controllerAspect()") - fun loggingAop() { - Singleton.checkDBUpdate(configurationRepository, properties) - }*/ @Before("execution(* com.aitrainer.api.controller.CustomerController.*(..))") fun customerControllerAspect(joinPoint: JoinPoint) { diff --git a/src/main/kotlin/com/aitrainer/api/model/ExerciseTreeParents.kt b/src/main/kotlin/com/aitrainer/api/model/ExerciseTreeParents.kt index 0d8a26a..32f4635 100644 --- a/src/main/kotlin/com/aitrainer/api/model/ExerciseTreeParents.kt +++ b/src/main/kotlin/com/aitrainer/api/model/ExerciseTreeParents.kt @@ -8,6 +8,7 @@ import javax.validation.constraints.NotNull data class ExerciseTreeParents ( @Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) var exerciseTreeParentsId: Long = 0, @Expose @get: NotNull var exerciseTreeParentId: Long?, - @Expose @get: NotNull var exerciseTreeChildId: Long? + @Expose @get: NotNull var exerciseTreeChildId: Long?, + @Expose @get: NotNull var sort: Int = 0 ) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index db429aa..ec38531 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.26 +application.version=1.0.27 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 35f7cfe..e31cb29 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.26 +application.version=1.0.27 jwt.secret=aitrainer \ No newline at end of file diff --git a/src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt b/src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt index 6ec1ec3..523ce18 100644 --- a/src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt @@ -35,9 +35,10 @@ class ExerciseTreeParentsTest { assertTrue(responseEntity.body!!.isNotEmpty()) val exerciseTreeParentList = responseEntity.body!! - assertEquals(exerciseTreeParentList.size, 17) + assertEquals(exerciseTreeParentList.size, 18) assertEquals(exerciseTreeParentList[4].exerciseTreeParentId, 3) assertEquals(exerciseTreeParentList[4].exerciseTreeChildId, 7) + assertEquals(exerciseTreeParentList[0].sort, 3) } } \ No newline at end of file