API 1.0.30 CustomerActivity, Sort ExercisePlanTemplateDetail.sort

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

@@ -1,29 +1,30 @@
 package com.aitrainer.api.model
 
 import com.google.gson.annotations.Expose
+import org.hibernate.annotations.Fetch
+import org.hibernate.annotations.FetchMode
 import javax.persistence.*
 
 @Entity
 data class Customer (
-        @Expose var name: String = "",
-        @Expose var firstname: String = "",
-        @Expose var email: String = "",
+        @Expose var name: String? = null,
+        @Expose var firstname: String? = null,
+        @Expose var email: String? = null,
         @Expose var age: Int? = 0,
         @Expose var sex: String = "m",
-        @Expose var active: String = "N",
+        @Expose var active: String = "Y",
         @Expose var dateAdd: String? = null,
         @Expose var dateChange: String? = null,
-        @Expose var dataPolicyAllowed: Int = 0,
-        @Expose var admin: Int = 0,
-        @Expose var trainer: Int = 0,
-        @Expose var trainerId: Long = 0,
-        @Expose var password: String? = "",
+        @Expose var dataPolicyAllowed: Int? = 1,
+        @Expose var admin: Boolean? = null,
+        @Expose var trainer: Boolean? = null,
+        @Expose var trainerId: Long? = null,
+        @Expose var password: String? = null,
         @Expose var birthYear:Int = 0,
         @Expose var goal: String? = null,
         @Expose var fitnessLevel: String = "beginner",
         @Expose var bodyType: String? = null,
         @Expose var firebaseUid: String? = null,
 
-        @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        @Expose var customerId: Long = 0
+        @Id @GeneratedValue(strategy = GenerationType.IDENTITY)  @Expose var customerId: Long = 0
 )

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

@@ -0,0 +1,17 @@
+package com.aitrainer.api.model
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.google.gson.annotations.Expose
+import javax.persistence.*
+import javax.validation.constraints.NotNull
+
+@Entity
+data class CustomerActivity (
+    @Expose @Id @GeneratedValue(strategy = GenerationType.IDENTITY) var activityId: Long = 0,
+    @Expose @get: NotNull var customerId: Long?,
+    @Expose @get: NotNull var type: String? = null,
+    @Expose @get: NotNull var dateAdd: String? = null,
+    @Expose @get: NotNull var skipped: Boolean?
+
+)
+

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

@@ -1,21 +0,0 @@
-package com.aitrainer.api.model
-
-import javax.persistence.Entity
-import javax.persistence.GeneratedValue
-import javax.persistence.GenerationType
-import javax.persistence.Id
-import javax.validation.constraints.NotBlank
-
-@Entity
-class CustomerInformation (
-    @get: NotBlank  var title: String = "",
-    var description: String = "",
-
-    var dateAdd: String? = null,
-    var displayBegin: String? = null,
-    var displayEnd: String? = null,
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    val customerInformationId: Long = 0
-)

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

@@ -13,7 +13,8 @@ data class ExercisePlanTemplateDetail (
     @Expose @get: Null var serie: Int? = 0,
     @Expose @get: Null var quantity: Double? = 0.0,
     @Expose @get: Null var quantityUnitQuantity: Double? = 0.0,
-    @Expose @get: NonNull var restingTime: String? = null
+    @Expose @get: NonNull var restingTime: String? = null,
+    @Expose @get: Null var sort: Int? = 0,
 
 
 ) {