conflict

Author: dcanar9

pom.xml

@@ -4,7 +4,11 @@
     <artifactId>api-audit</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
+<<<<<<< HEAD
     <version>3.7.31-SNAPSHOT</version>
+=======
+    <version>3.7.33-SNAPSHOT</version>
+>>>>>>> 08ecbf57c4b88a7120a1122ae7e42c2bfe4def05
     <description>Hygieia Audit Rest API Layer</description>
     <url>https://github.com/Hygieia/${repository.name}</url>
 
@@ -42,9 +46,17 @@
     </parent>
 
     <properties>
+<<<<<<< HEAD
         <repository.name>hygieia-auditapi-ace</repository.name>
         <com.capitalone.dashboard.core.version>04.06.03.54</com.capitalone.dashboard.core.version>
         <spring-security.version>5.5.7</spring-security.version>
+=======
+        <repository.name>api-audit</repository.name>
+
+        <!-- Dependencies -->
+        <com.capitalone.dashboard.core.version>3.15.45</com.capitalone.dashboard.core.version>
+        <spring-security.version>4.2.18.RELEASE</spring-security.version>
+>>>>>>> 08ecbf57c4b88a7120a1122ae7e42c2bfe4def05
         <spring.cloud.version>1.3.1.RELEASE</spring.cloud.version>
         <tomcat.version>9.0.65</tomcat.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>

src/main/java/com/capitalone/dashboard/evaluator/InfrastructureEvaluator.java

@@ -73,17 +73,22 @@ private InfrastructureAuditResponse getInfrastructureScanResponse(CollectorItem
 
 
         List<InfrastructureScan> infrastructureScans = infrastructureScanRepository.findByCollectorItemIdAndTimestampIsBetweenOrderByTimestampDesc(collectorItem.getId(), beginDate - 1, endDate + 1);
+
         List<InfrastructureScan> filteredForBAP = StringUtils.isEmpty(businessComponent) ? Collections.EMPTY_LIST :
-                infrastructureScans.stream().filter(infrastructureScan -> infrastructureScan.getBusinessApplication().equalsIgnoreCase(businessComponent)).collect(Collectors.toList());
+                infrastructureScans.stream().filter(infrastructureScan ->
+                        businessComponent.equalsIgnoreCase(infrastructureScan.getBusinessApplication())).collect(Collectors.toList()
+                );
 
         if (CollectionUtils.isNotEmpty(filteredForBAP)) {
             List<InfrastructureScan> sortedDistinctForBAP = getSortedAndDistinctByInstanceId(filteredForBAP);
             setInfraAudit(infrastructureAuditResponse, sortedDistinctForBAP, InfrastructureAuditStatus.INFRA_SCAN_BUSS_COMP_CRITICAL, InfrastructureAuditStatus.INFRA_SCAN_BUSS_COMP_HIGH, InfrastructureAuditStatus.INFRA_SCAN_BUSS_COMP_OK);
             infrastructureAuditResponse.setInfrastructureScans(sortedDistinctForBAP);
         } else {
             infrastructureAuditResponse.addAuditStatus(InfrastructureAuditStatus.INFRA_SEC_SCAN_BUSS_COMP_NOT_FOUND);
+
             List<InfrastructureScan> filteredForASV = StringUtils.isEmpty(businessService) ? Collections.EMPTY_LIST :
-                    infrastructureScans.stream().filter(infrastructureScan -> infrastructureScan.getBusinessService().equalsIgnoreCase(businessService)).collect(Collectors.toList());
+                    infrastructureScans.stream().filter(infrastructureScan -> businessService.equalsIgnoreCase(infrastructureScan.getBusinessService())).collect(Collectors.toList());
+
             if (CollectionUtils.isNotEmpty(filteredForASV)) {
                 List<InfrastructureScan> sortedDistinctForASV = getSortedAndDistinctByInstanceId(filteredForASV);
                 setInfraAudit(infrastructureAuditResponse, sortedDistinctForASV, InfrastructureAuditStatus.INFRA_SEC_SCAN_BUSS_APP_CRITICAL, InfrastructureAuditStatus.INFRA_SEC_SCAN_BUSS_APP_HIGH, InfrastructureAuditStatus.INFRA_SEC_SCAN_BUSS_APP_OK);

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

@@ -27,6 +27,7 @@
 import com.google.common.collect.Sets;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections4.IterableUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.json.simple.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -296,10 +297,51 @@ public JSONObject getAuditReport(DashboardAuditRequest dashboardAuditRequest) {
 
         AuditReport auditReport = auditReportRepository.findTop1ByBusinessApplicationAndBusinessServiceAndAuditTypeAndIdentifierNameAndIdentifierVersionAndIdentifierUrlOrderByTimestampDesc(
                 businessApplication, businessService, auditType, identifierName, identifierVersion, identifierUrl);
-        if (Objects.nonNull(auditReport) && Objects.nonNull(auditReport.getAuditResponse())) {
+        if (Objects.nonNull(auditReport) && !ObjectUtils.isEmpty(auditReport.getAuditResponse())) {
             return (JSONObject) auditReport.getAuditResponse();
+        }else{
+            Cmdb busServItem = cmdbRepository.findByConfigurationItemAndItemType(businessService, "app");
+            Cmdb busAppItem = cmdbRepository.findByConfigurationItemAndItemType(businessApplication, "component");
+
+            if(busServItem == null){
+                JSONObject invalidBAResponse = createLookupResponseWhenEmpty(DashboardAuditStatus.DASHBOARD_INVALID_BA, businessApplication, businessService);
+                return invalidBAResponse;
+            }else if(busAppItem == null){
+                JSONObject invalidComponentResponse = createLookupResponseWhenEmpty(DashboardAuditStatus.DASHBOARD_INVALID_COMPONENT, businessApplication, businessService);
+                return invalidComponentResponse;
+            }else if(!componentInfoMatch(busServItem, businessApplication)){
+                JSONObject componentBAMismatchResponse = createLookupResponseWhenEmpty(DashboardAuditStatus.DASHBOARD_COMPONENT_BA_MISMATCH, businessApplication, businessService);
+                return componentBAMismatchResponse;
+            }else{
+                JSONObject noDataResponse = createLookupResponseWhenEmpty(DashboardAuditStatus.DASHBOARD_AUDIT_NO_DATA, businessApplication, businessService);
+                return noDataResponse;
+            }
+        }
+
+
+    }
+
+    private JSONObject createLookupResponseWhenEmpty(DashboardAuditStatus dashboardAuditStatus, String businessApplication, String businessService){
+        JSONObject auditResponse = new JSONObject();
+        auditResponse.put("businessApplication", businessApplication);
+        auditResponse.put("businessService", businessService);
+        auditResponse.put("auditStatuses", Collections.singleton(dashboardAuditStatus));
+        auditResponse.put("lastUpdated", 0);
+        auditResponse.put("auditEntity", new JSONObject());
+        auditResponse.put("review", new JSONObject());
+        return auditResponse;
+    }
+
+    private boolean componentInfoMatch(Cmdb businessApplication, String businessService){
+        if(businessApplication.getComponents() == null){
+            return false;
         }
-        return new JSONObject();
+
+        if(businessApplication.getComponents().contains(businessService)){
+            return true;
+        }
+
+        return false;
     }
 
     private void validateParameters(String dashboardTitle, DashboardType dashboardType, String businessService, String businessApp, long beginDate, long endDate) throws AuditException{