From 8269e8b4a0a6a3fe8c80cd0faebf06f9a470c0be Mon Sep 17 00:00:00 2001
From: Bossanyi Tibor <sw@andio.biz>
Date: Thu, 29 Apr 2021 08:05:42 +0200
Subject: [PATCH] API 1.0.35 tutorial_step direction, branch

---
 build.gradle.kts                                    |  2 +-
 data/db/update_1_0_35.sql                           | 13 +++++++++++++
 .../kotlin/com/aitrainer/api/model/TutorialSteps.kt |  3 ++-
 src/main/resources/application-prod.properties      |  2 +-
 src/main/resources/application.properties           |  2 +-
 .../kotlin/com/aitrainer/api/test/AppPackageTest.kt |  2 ++
 .../kotlin/com/aitrainer/api/test/CustomerTests.kt  |  2 +-
 7 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 data/db/update_1_0_35.sql

diff --git a/build.gradle.kts b/build.gradle.kts
index f180c3e..ea910ab 100644
--- a/build.gradle.kts
+++ b/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 {
diff --git a/data/db/update_1_0_35.sql b/data/db/update_1_0_35.sql
new file mode 100644
index 0000000..d5ca654
--- /dev/null
+++ b/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;
+
diff --git a/src/main/kotlin/com/aitrainer/api/model/TutorialSteps.kt b/src/main/kotlin/com/aitrainer/api/model/TutorialSteps.kt
index c0102a8..d12c0d4 100644
--- a/src/main/kotlin/com/aitrainer/api/model/TutorialSteps.kt
+++ b/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,
 ) {
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 3de676b..2a68045 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.34
+application.version=1.0.35
 
 jwt.secret=aitrainer
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f85dc26..57eeed2 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.34
+application.version=1.0.35
 
 jwt.secret=aitrainer
\ No newline at end of file
diff --git a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt b/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt
index 4cab99f..56a8ba3 100644
--- a/src/test/kotlin/com/aitrainer/api/test/AppPackageTest.kt
+++ b/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)
             }
         }
diff --git a/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt b/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt
index 13947be..b7b72ec 100644
--- a/src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt
+++ b/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