[NO-TICKET] *expand device registration info

[platform/core/security/suspicious-activity-monitor.git] / server / src / main / java / com / samsung / samserver / domain / Device.java

diff --git a/server/src/main/java/com/samsung/samserver/domain/Device.java b/server/src/main/java/com/samsung/samserver/domain/Device.java
index 5ae8a1f..599c5bb 100644 (file)
--- a/server/src/main/java/com/samsung/samserver/domain/Device.java
+++ b/server/src/main/java/com/samsung/samserver/domain/Device.java
@@ -37,8 +37,8 @@ public class Device implements Serializable {
     @Column(name = "model")
     private String model;
 
-    @Column(name = "dos")
-    private String dos;
+    @Column(name = "location")
+    private String location;
 
     @Column(name = "sn")
     private String sn;
@@ -49,6 +49,15 @@ public class Device implements Serializable {
     @Column(name = "jhi_locked")
     private String locked;
 
+    @Column(name = "sw")
+    private String sw;
+
+    @Column(name = "osname")
+    private String osname;
+
+    @Column(name = "osver")
+    private String osver;
+
     @OneToMany(mappedBy = "device")
     @JsonIgnore
     private Set<Report> reports = new HashSet<>();
@@ -62,14 +71,18 @@ public class Device implements Serializable {
     public Device() {
     }
 
-    public Device(String duid, String model, String dos, String sn, String descr, DeviceType dtype) {
+    public Device(String duid, String model, String location, String sn, String descr,
+                  DeviceType dtype, String sw, String osname, String osver) {
         this.duid = duid;
         this.model = model;
-        this.dos = dos;
+        this.location = location;
         this.sn = sn;
         this.descr = descr;
         this.dtype = dtype;
         this.ctime = Instant.now();
+        this.sw = sw;
+        this.osname = osname;
+        this.osver = osver;
     }
 
     public Device duid(String duid) {
@@ -87,8 +100,8 @@ public class Device implements Serializable {
         return this;
     }
 
-    public Device dos(String dos) {
-        this.dos = dos;
+    public Device location(String location) {
+        this.location = location;
         return this;
     }