Add OneWeekCred notice

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / reports / Analyze.java

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 60902f1..a49fc94 100644 (file)
--- 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 {