SECARSP-268 *Implement device policies state request mechanism: update data type...

[platform/core/security/suspicious-activity-monitor.git] / server / samserver / src / main / java / com / samsung / samserver / web / rest / service / device / SendDataRestService.java

diff --git a/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/device/SendDataRestService.java b/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/device/SendDataRestService.java
index 6c8bc7d..c1c2093 100644 (file)
--- a/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/device/SendDataRestService.java
+++ b/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/device/SendDataRestService.java
@@ -67,8 +67,9 @@ public class SendDataRestService {
         return ResponseEntity.ok().headers(new HttpHeaders()).build();
     }
 
-    private ResponseEntity<Void> policy(Device device, List<DPolicy> polices) {
+    private ResponseEntity<Void> statePolicy(Device device, List<DPolicy> polices) {
         Map<String, PolicyType> allPolicies = policyTypeService.findAllAsMap();
+        HashMap<String, UIPolicy> listUIPolicy = new HashMap();
         ObjectMapper mapper = new ObjectMapper();
         for (DPolicy dPolicy: polices) {
             String policyTypeName = dPolicy.getName();
@@ -79,7 +80,7 @@ public class SendDataRestService {
             }
             try {
                 String uiType = policyType.getUitype();
-                UIPolicy uiPolicy = UIPolicy.make(uiType).bind(dPolicy);
+                UIPolicy uiPolicy = UIPolicy.make(uiType).bind(dPolicy, listUIPolicy);
                 policyService.update(device, policyType, mapper.writeValueAsString(uiPolicy));
             } catch (JsonProcessingException | NullPointerException e) {
                 log.error("send date update device policies: message: {} stacktrace: {}", e.getMessage(), e.getStackTrace());
@@ -98,9 +99,9 @@ public class SendDataRestService {
 
         switch (data.getType()) {
             case "report":
-                return report(device.get(), data.getLogs());
+                return report(device.get(), data.getData());
             case "state-policy":
-                return policy(device.get(), data.getPolicies());
+                return statePolicy(device.get(), data.getData());
             default:
                 throw new DeviceServiceError.DataTypeNotFoundException();
         }