From 11b21cdcd0674175ba38e87cc803d1bbb93398bb Mon Sep 17 00:00:00 2001
From: "m.dalakov" <m.dalakov@samsung.com>
Date: Fri, 20 Oct 2017 13:48:26 +0300
Subject: [PATCH] [SECIOTSRK-649] REST getDevices by iotCloudUserUuId function

---
 .../com/samsung/commons/repository/DeviceRepository.java   | 10 ++++++++++
 .../java/com/samsung/commons/service/DeviceService.java    |  3 +++
 .../samsung/commons/service/impl/DeviceServiceImpl.java    |  6 ++++++
 .../main/java/com/samsung/dsm/rest/device/DeviceApi.java   | 14 ++++++++++++++
 4 files changed, 33 insertions(+)

diff --git a/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java b/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java
index 1692d0e..11c365a 100644
--- a/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java
+++ b/servers/commons/src/main/java/com/samsung/commons/repository/DeviceRepository.java
@@ -76,4 +76,14 @@ public interface DeviceRepository extends CrudRepository<Device, Long> {
      * @return Device instances
      */
     List<Device> findByUserAndRemovedOrderByIdAsc(User user, boolean removed);
+
+    /**
+     * Find by user and model is not list.
+     *
+     * @param user  the user
+     * @param model the model
+     * @return the list
+     */
+    List<Device> findByUserAndModelIsNot(User user, String model);
+
 }
diff --git a/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java b/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java
index 9878032..7b8d25c 100644
--- a/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java
+++ b/servers/commons/src/main/java/com/samsung/commons/service/DeviceService.java
@@ -118,4 +118,7 @@ public interface DeviceService extends CommonService<Device> {
      * @param devices devices
      */
     void markNotRemoved(Set<Device> devices);
+
+    List<Device> findByUserAndModelIsNot(User user, String model);
+
 }
diff --git a/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java b/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java
index 9aa6cd6..b99dddd 100644
--- a/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java
+++ b/servers/commons/src/main/java/com/samsung/commons/service/impl/DeviceServiceImpl.java
@@ -140,4 +140,10 @@ public class DeviceServiceImpl implements DeviceService {
             deviceRepository.save(device);
         }
     }
+
+    @Override
+    public List<Device> findByUserAndModelIsNot(User user, String model) {
+        return deviceRepository.findByUserAndModelIsNot(user, model);
+    }
+
 }
diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java
index 310ae7a..3c167e0 100644
--- a/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java
+++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/device/DeviceApi.java
@@ -106,4 +106,18 @@ public class DeviceApi {
                 .orElseThrow(IotCloudAssociatedUserNotExists::new);
         return new ResponseEntity<>(deviceConverter.convert(deviceService.findByUser(user)), OK);
     }
+
+    /**
+     * Find by cloud user uuid except model standard response entity.
+     *
+     * @param iotCloudUserUuId the iot cloud user uu id
+     * @return the response entity
+     */
+    @RequestMapping(value = "/{iotCloudUserUuId}/byCloudUserUuidNotStandard")
+    public ResponseEntity<List<RestDevice>> findByCloudUserUuidExceptModelStandard(@PathVariable String iotCloudUserUuId) {
+        User user = ofNullable(iotCloudService.findAssociatedUserByUuid(iotCloudUserUuId))
+                .orElseThrow(IotCloudAssociatedUserNotExists::new);
+        return new ResponseEntity<>(deviceConverter.convert(deviceService.findByUserAndModelIsNot(user,"standard")), OK);
+    }
+
 }
-- 
2.7.4