From b6106cffafc89a9c3051c3196f54df643197e4ad Mon Sep 17 00:00:00 2001 From: Sean Hassan Date: Thu, 21 May 2020 16:22:11 -0500 Subject: 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 Change-Id: Iaf04456abe78f2cb7972587b50f00bcaac3f83aa --- .../src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'auth/auth-batch/src') 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())); + } } } } -- cgit 1.2.3-korg