Merge pull request #186 from tatlax3636/fix-empty-response

Add informative statuses instead of empty responses

Author: nameisaravind

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>api-audit</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>3.7.30-SNAPSHOT</version>
+    <version>3.7.31-SNAPSHOT</version>
     <description>Hygieia Audit Rest API Layer</description>
     <url>https://github.com/Hygieia/${repository.name}</url>
 
@@ -60,7 +60,7 @@
         <repository.name>api-audit</repository.name>
 
         <!-- Dependencies -->
-        <com.capitalone.dashboard.core.version>3.15.42</com.capitalone.dashboard.core.version>
+        <com.capitalone.dashboard.core.version>3.15.45</com.capitalone.dashboard.core.version>
         <spring-security.version>4.2.18.RELEASE</spring-security.version>
         <spring.cloud.version>1.3.1.RELEASE</spring.cloud.version>
         <tomcat.version>8.5.70</tomcat.version>

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

@@ -298,8 +298,49 @@ public JSONObject getAuditReport(DashboardAuditRequest dashboardAuditRequest) {
                 businessApplication, businessService, auditType, identifierName, identifierVersion, identifierUrl);
         if (Objects.nonNull(auditReport) && Objects.nonNull(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{