summaryrefslogtreecommitdiffstats
path: root/auth/auth-batch/src/main
diff options
context:
space:
mode:
authorSean Hassan <sean.hassan@att.com>2020-05-21 16:22:11 -0500
committerHassan, Sean (sh265m) <sean.hassan@att.com>2020-05-22 13:59:04 -0500
commitb6106cffafc89a9c3051c3196f54df643197e4ad (patch)
treecff90ac9839a734428a564a63e98547efa87e626 /auth/auth-batch/src/main
parentf8e4fae3bb0e9a7d40a70a64971efd1813bee2d1 (diff)
Enable Organizations to have a subset of users the user roles of which do not expire
Issue-ID: AAF-1149 Signed-off-by: Sean Hassan <sean.hassan@att.com> Change-Id: Iaf04456abe78f2cb7972587b50f00bcaac3f83aa
Diffstat (limited to 'auth/auth-batch/src/main')
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java7
1 files changed, 6 insertions, 1 deletions
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 ff2c72a5..3a813ecd 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
@@ -438,7 +438,12 @@ public class Analyze extends Batch {
if(r!=null) {
Approval existing = findApproval(ur);
if(existing==null) {
- ur.row(needApproveCW,UserRole.APPROVE_UR);
+ if (org.isUserExpireExempt(ur.user(), ur.expires())) {
+ ur.row(notCompliantCW, UserRole.UR);
+ } else {
+ ur.row(needApproveCW, UserRole.APPROVE_UR,
+ "Expired user role! Membership expired " + Chrono.dateOnlyStamp(ur.expires()));
+ }
}
}
}