Merge pull request #243 from tatlax3636/update-infra-widget

Update widget infra endpoint

pom.xml

@@ -59,7 +59,7 @@
 
     <properties>
         <!-- Dependencies -->
-        <com.capitalone.dashboard.core.version>3.15.9</com.capitalone.dashboard.core.version>
+        <com.capitalone.dashboard.core.version>3.15.16</com.capitalone.dashboard.core.version>
         <spring-security.version>4.2.18.RELEASE</spring-security.version>
         <tomcat.version>8.5.57</tomcat.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>

src/main/java/com/capitalone/dashboard/service/InfraStructureServiceImpl.java

@@ -6,8 +6,9 @@
 import com.capitalone.dashboard.request.InfraStructureRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 @Service
 public class InfraStructureServiceImpl implements InfraStructureService {
@@ -21,7 +22,18 @@ public InfraStructureServiceImpl(InfrastructureScanRepository infrastructureScan
 
     @Override
     public DataResponse<Iterable<InfrastructureScan>> getInfraScanForWidget(InfraStructureRequest request) {
-        InfrastructureScan infrastructureScan = infrastructureScanRepository.findTopByCollectorItemIdOrderByTimestampDesc(request.getCollectorItemId());
-        return new DataResponse<>(Collections.singletonList(infrastructureScan), System.currentTimeMillis());
+        List<InfrastructureScan> tempInfraScanList = infrastructureScanRepository.findByCollectorItemIdOrderByTimestampDesc(request.getCollectorItemId());
+        List<InfrastructureScan> infrastructureScanList = new ArrayList<InfrastructureScan>();
+
+        ArrayList<String> instanceIdArray = new ArrayList<String>();
+        tempInfraScanList.forEach(scan -> {
+            String instanceId = scan.getInstanceId();
+            if(!instanceIdArray.contains(instanceId)){
+                instanceIdArray.add(instanceId);
+                infrastructureScanList.add(scan);
+            }
+        });
+
+        return new DataResponse<>(infrastructureScanList, System.currentTimeMillis());
     }
 }