Merge branch 'tibor' into 'master'

API 1.0.35 tutorial_step direction, branch

See merge request bossanyit/aitrainer_server!54

build.gradle.kts

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

data/db/update_1_0_35.sql

@@ -0,0 +1,13 @@
+START TRANSACTION;
+
+ALTER TABLE `tutorial_steps`
+	CHANGE COLUMN `error_text` `direction` TEXT NULL DEFAULT NULL AFTER `tutorial_text`;
+
+ALTER TABLE `tutorial_steps`
+    ADD COLUMN `branch` CHAR(100) NULL DEFAULT NULL AFTER `action`;
+
+
+UPDATE configuration set config_value = "1.0.35", date_change=CURRENT_DATE WHERE config_key = "db_version";
+
+COMMIT;
+

src/main/kotlin/com/aitrainer/api/model/TutorialSteps.kt

@@ -13,9 +13,10 @@ data class TutorialSteps (
     @Expose @Id  @GeneratedValue(strategy = GenerationType.IDENTITY) @get: NonNull var tutorialStepId: Long = 0,
     @Expose @get: NotBlank  var tutorialText: String = "",
     @Expose @get: NotBlank var step: Int = 0,
-    @Expose var errorText: String? = null,
+    @Expose var direction: String? = null,
     @Expose var checkText: String? = null,
     @Expose var condition: String? = null,
+    @Expose var branch: String? = null,
     @Expose @get: NotBlank var parent_id: Int = 0,
     @Expose var action: Int? = 0,
 ) {

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.34
+application.version=1.0.35
 
 jwt.secret=aitrainer

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.34
+application.version=1.0.35
 
 jwt.secret=aitrainer

src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt

@@ -138,8 +138,10 @@ class AppPackageTest {
                 assertEquals(tutorials[0].steps.size, 5)
                 assertEquals(tutorials[0].steps[3].parent_id, 2)
                 assertEquals(tutorials[0].steps[3].condition, "Check2")
+                assertEquals(tutorials[0].steps[2].direction, "up|88")
                 assertEquals(tutorials[0].steps[3].action, 0)
                 assertEquals(tutorials[0].steps[4].action, 1)
+                assertEquals(tutorials[0].steps[4].branch, "Check1")
                 assertEquals(tutorials[0].steps[0].translations.size, 2)
             }
         }

src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt

@@ -217,7 +217,7 @@ class CustomerTests {
         response = customerController.registration(json2)
         assertEquals(response.statusCode, HttpStatus.BAD_REQUEST)*/
 
-       // customerRepository.delete(newCustomer)
+       customerRepository.delete(newCustomer)
     }
 
     @Test