X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Freports%2FAnalyze.java;h=a49fc943012ed0d58082da215ec5dd3855bfe065;hb=refs%2Fchanges%2F26%2F84126%2F2;hp=60902f1e130a45c638d6e6cd8bae5adaa84fdd9b;hpb=bd7def7ee2098af56ce66752f59c062d7923fb69;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java
index 60902f1e..a49fc943 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java
@@ -207,8 +207,19 @@ public class Analyze extends Batch {
 						deleteCW.comment("Approval is Orphaned");
 						Approval.row(deleteCW, appr);
 					} else {
-						ticket.approvals.add(appr); // add to found Ticket
-						approvers.add(appr.getApprover());
+						// for users and approvers still valid
+						String user = appr.getUser();
+						
+						if(org.isRevoked(trans, appr.getApprover())) {
+							deleteCW.comment("Approver ID is revoked");
+							Approval.row(deleteCW, appr);
+						} else if(user!=null && !user.isEmpty() && org.isRevoked(trans, user)) {
+							deleteCW.comment("USER ID is revoked");
+							Approval.row(deleteCW, appr);
+						} else {
+							ticket.approvals.add(appr); // add to found Ticket
+							approvers.add(appr.getApprover());
+						}
 					}
 				}
 	    	} finally {