WT1.0.20 Product - product_id_ios, product_id_android

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

@@ -20,5 +20,7 @@ data class Product (
         @get: NotBlank var description: String = "",
         @get: NonNull var type: String?  = null,
         @get: NonNull var validFrom: String? = null,
-        @get: NonNull var validTo: String? = null
+        @get: NonNull var validTo: String? = null,
+        @get: NonNull var productIdIos: String? = null,
+        @get: NonNull var productIdAndroid: String? = null
 )

src/main/resources/application-prod.properties

@@ -16,6 +16,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.19
+application.version=1.0.20
 
 jwt.secret=aitrainer

src/main/resources/application.properties

@@ -16,6 +16,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.19
+application.version=1.0.20
 
 jwt.secret=aitrainer

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

@@ -27,7 +27,7 @@ class ExerciseResultTest {
 
         val exerciseResults = response.body
         assertTrue(exerciseResults is List)
-        assertEquals(exerciseResults.size, 4)
+        assertEquals(exerciseResults!!.size, 4)
         assertEquals(exerciseResults[0].customerId, 90)
         assertEquals(exerciseResults[0].exerciseId, 1)
         assertEquals(exerciseResults[0].value, 134.0)
@@ -51,7 +51,7 @@ class ExerciseResultTest {
         val exerciseNew = response.body
 
         assertTrue(exerciseNew is ExerciseResult)
-        assertTrue(exerciseNew.exercisePlanId == null)
+        assertTrue(exerciseNew!!.exercisePlanId == null)
         assertEquals(exerciseNew.customerId, 103)
         assertEquals(exerciseNew.resultType, "calorie")
 

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

@@ -39,7 +39,7 @@ class ExerciseTreeParentsTest {
 
         assertTrue(responseEntity.body!!.isNotEmpty())
         val exerciseTreeParentList = responseEntity.body!!
-        assertEquals(exerciseTreeParentList.size, 20)
+        assertEquals(exerciseTreeParentList.size, 27)
         assertEquals(exerciseTreeParentList[4].exerciseTreeParentId, 3)
         assertEquals(exerciseTreeParentList[4].exerciseTreeChildId, 7)
 

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

@@ -25,9 +25,11 @@ class ProductTesting {
         val products = response.body
 
         assertTrue(products is List)
-        assertTrue(products.isNotEmpty())
+        assertTrue(products!!.isNotEmpty())
         assertEquals(products.size, 12)
         assertEquals(products[0].name, "Subscription A")
+        assertEquals(products[0].productIdIos, "p_ios_1")
+        assertEquals(products[0].productIdAndroid, "p_android_1")
 
     }