add bunch of stuff

src/main/kotlin/mobildata/model/MobilData.kt

 package mobildata.model
 
+import java.util.*
 import javax.persistence.*
 
 @Entity
@@ -14,14 +15,17 @@ data class MobilData(
         var bluetoothOn: Boolean?,
         var nfcOn: Boolean?,
         var mobilDataOn: Boolean?,
+        var isCharging: Boolean?,
         var sleepTime: Int?,
         var batteryTemp: Double?,
         var mobileDataUsage: Int?,
         var wifiDataUsage: Int?,
+        @Temporal(TemporalType.TIMESTAMP)
+        var actualTime: Date?,
         @ElementCollection
         @CollectionTable(
                 name="process",
-                joinColumns = arrayOf(JoinColumn(name = "process_id", referencedColumnName = "id")))
+                joinColumns = arrayOf(JoinColumn(name = "process_id")))
         var processList: List<MobileProcess>?,
         @Id @GeneratedValue(strategy = GenerationType.AUTO)
         var id: Long = 0) {

src/main/kotlin/mobildata/model/MobileProcess.kt

@@ -6,5 +6,5 @@ import javax.persistence.Embeddable
 @Embeddable
 data class MobileProcess(
         @Column(name="process")
-        val process: String
+        val process: String? = null
 ){}
\ No newline at end of file

src/main/kotlin/mobildata/model/inout/MobilDataIn.kt

@@ -2,6 +2,7 @@ package mobildata.model.inout
 
 import io.swagger.annotations.ApiModelProperty
 import mobildata.model.LocationData
+import java.util.*
 import javax.validation.constraints.*
 
 
@@ -41,10 +42,15 @@ class MobilDataIn {
     @ApiModelProperty(required = false)
     var processList: ArrayList<String>?
 
+    @ApiModelProperty(required = false)
+    var actualTime: Date?
+
+    var isCharging: Boolean?
+
     constructor(location: LocationData? = null, battery: Int?, brightness: Int?, wifiOn: Boolean?,
                 bluetoothOn: Boolean?, nfcOn: Boolean?, mobilDataOn: Boolean?,
                 sleepTime: Int?, batteryTemp: Double?, mobileDataUsage: Int?, wifiDataUsage: Int?,
-                processList: ArrayList<String>?) {
+                processList: ArrayList<String>?, actualTime: Date?, isCharging: Boolean?) {
         this.location = location
         this.battery = battery
         this.brightness = brightness
@@ -57,5 +63,7 @@ class MobilDataIn {
         this.mobileDataUsage = mobileDataUsage
         this.wifiDataUsage = wifiDataUsage
         this.processList = processList
+        this.actualTime = actualTime
+        this.isCharging = isCharging
     }
 }

src/main/kotlin/mobildata/web/MobilDataHandler.kt

@@ -28,7 +28,8 @@ class MobilDataHandler (val mobilRepository: MobilDataRepository,
                 brightness = input.brightness, wifiOn = input.wifiOn, bluetoothOn = input.bluetoothOn,
                 mobilDataOn = input.mobilDataOn, nfcOn = input.nfcOn, sleepTime = input.sleepTime,
                 mobileDataUsage = input.mobileDataUsage, wifiDataUsage = input.wifiDataUsage,
-                processList = processes, batteryTemp = input.batteryTemp)
+                processList = processes, batteryTemp = input.batteryTemp, actualTime = input.actualTime,
+                isCharging = input.isCharging)
     }
 
     @ApiKeySecured

src/main/resources/schema.sql

@@ -36,10 +36,14 @@ create table mobil_data (
   battery_temp DOUBLE PRECISION,
   mobile_data_usage INTEGER,
   wifi_data_usage INTEGER,
-  process_id INTEGER
+  process_id INTEGER,
+  actual_time TIMESTAMP not null,
+  is_charging BOOLEAN
 );
 
 alter table mobil_data
     add CONSTRAINT user_id_foreign_key
     FOREIGN KEY ("user_id")
     REFERENCES "user"
+
+-- TODO process foreign key
\ No newline at end of file