Audit- Dashboard review - Added block directCommitFailedValidation (#…

…2718) * Add new status - DIRECT_COMMIT_CHANGE_WHITELISTED_ACCOUNT * Add new status - DIRECT_COMMIT_CHANGE_WHITELISTED_ACCOUNT * Audit- Dashboard review - Added block directCommitFailedValidation * Audit- Dashboard review - Added block directCommitFailedValidation * Audit- Dashboard review - Added block directCommitFailedValidation * Audit- Dashboard review - Added block directCommitFailedValidation
hygieia · Feb 7, 2019 · 09d42fc · 09d42fc
1 parent 6a28bb6
commit 09d42fc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/api-audit/src/main/java/com/capitalone/dashboard/evaluator/CodeReviewEvaluator.java b/api-audit/src/main/java/com/capitalone/dashboard/evaluator/CodeReviewEvaluator.java
@@ -389,10 +389,19 @@ protected void auditIncrementVersionTag(CodeReviewAuditResponseV2 reviewAuditRes
         if (CommonCodeReview.matchIncrementVersionTag(commit.getScmCommitLog(), settings)) {
             reviewAuditResponseV2.addAuditStatus(directCommitIncrementVersionTagStatus);
         } else {
-            reviewAuditResponseV2.addAuditStatus(commit.isFirstEverCommit() ? CodeReviewAuditStatus.DIRECT_COMMITS_TO_BASE_FIRST_COMMIT : CodeReviewAuditStatus.DIRECT_COMMITS_TO_BASE);
+           addDirectCommitsToBase(reviewAuditResponseV2,commit);
         }
     }
 
+    private void addDirectCommitsToBase(CodeReviewAuditResponseV2 reviewAuditResponseV2,Commit commit){
+        if(commit.isFirstEverCommit()){
+            reviewAuditResponseV2.addAuditStatus(CodeReviewAuditStatus.DIRECT_COMMITS_TO_BASE_FIRST_COMMIT );
+        }else{
+            reviewAuditResponseV2.addAuditStatus(CodeReviewAuditStatus.DIRECT_COMMITS_TO_BASE);
+            reviewAuditResponseV2.addDirectCommitsToBase(commit);
+        }
+   }
+
     public Map<String,String> getAllServiceAccounts(){
         List<ServiceAccount> serviceAccounts = (List<ServiceAccount>) serviceAccountRepository.findAll();
         return serviceAccounts.stream().collect(Collectors.toMap(ServiceAccount :: getServiceAccountName, ServiceAccount::getFileNames));

diff --git a/api-audit/src/main/java/com/capitalone/dashboard/response/CodeReviewAuditResponseV2.java b/api-audit/src/main/java/com/capitalone/dashboard/response/CodeReviewAuditResponseV2.java
@@ -37,6 +37,9 @@ public void setCodeActions(List<CodeAction> codeActions) {
     private List<Commit> directCommits = new ArrayList<>();
     private List<PullRequestAudit> pullRequests = new ArrayList<>();
 
+    private List<Commit> directCommitsToBase = new ArrayList<>();
+
+
 
     public List<PullRequestAudit> getPullRequests() {
         return pullRequests;
@@ -93,4 +96,17 @@ public long getLastPRMergeTime() {
     public void setLastPRMergeTime(long lastPRMergeTime) {
         this.lastPRMergeTime = lastPRMergeTime;
     }
+
+    public void addDirectCommitsToBase(Commit commit) {
+        directCommitsToBase.add(commit);
+    }
+
+    public List<Commit> getDirectCommitsToBase() {
+        return directCommitsToBase;
+    }
+
+    public void setDirectCommitsToBase(List<Commit> directCommitsToBase) {
+        this.directCommitsToBase = directCommitsToBase;
+    }
+
 }
diff --git a/api-audit/src/test/java/com/capitalone/dashboard/evaluator/CodeReviewEvaluatorTest.java b/api-audit/src/test/java/com/capitalone/dashboard/evaluator/CodeReviewEvaluatorTest.java
@@ -141,6 +141,7 @@ public void evaluate_DIRECT_COMMIT_TO_BASE_With_Github_WebHook_Enabled() {
         when(serviceAccountRepository.findAll()).thenReturn(Stream.of(makeServiceAccount()).collect(Collectors.toList()));
         CodeReviewAuditResponseV2 responseV2 = codeReviewEvaluator.evaluate(makeCollectorItem(1,"master"), collectorItemList,125634536, 6235263, null);
         Assert.assertTrue(responseV2.getAuditStatuses().contains(CodeReviewAuditStatus.DIRECT_COMMITS_TO_BASE));
+        Assert.assertEquals(3,responseV2.getDirectCommitsToBase().size());
 
         pullRequestList.get(0).setUserId("NotAuthor1");