X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FExpireRange.java;h=c7d4e7d4bd03d7711f648a0e1ff1e15e0db75c36;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=c459dc6652b94d6711223d64afc03eeabfd509fa;hpb=ac83763af54e635eab032835c36b88a6a08f06ea;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java
index c459dc66..c7d4e7d4 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/ExpireRange.java
@@ -31,149 +31,201 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.onap.aaf.auth.org.Organization.Identity;
 import org.onap.aaf.cadi.Access;
 
 public class ExpireRange {
-	private static final String AAF_BATCH_RANGE = "aaf_batch_range.";
-	public Map<String,List<Range>> ranges;
-	public final Date now;
-	public String rangeOneMonth = "OneMonth";
-	
-	public ExpireRange(final Access access) {
-		now = new Date();
-		ranges = new HashMap<>();
-		int i=0;
-		String prop = access.getProperty(AAF_BATCH_RANGE + i,null);
-		if(prop==null && i==0) {
-				List<Range> lcred = getRangeList("cred");
-				List<Range> lur = getRangeList("ur");
-				List<Range> lx509 = getRangeList("x509");
-				
-				Range del = new Range("Delete",0,0,-1,0,GregorianCalendar.WEEK_OF_MONTH,-2);
-				lur.add(del);
-				lcred.add(del);
-				lx509.add(del);
-				
-				lcred.add(new Range("CredOneWeek",3,1,0,0,GregorianCalendar.WEEK_OF_MONTH,1));
-				lcred.add(new Range("CredTwoWeek",2,1,GregorianCalendar.WEEK_OF_MONTH,1,GregorianCalendar.WEEK_OF_MONTH,2));
-				lcred.add(new Range(rangeOneMonth,1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
-				lcred.add(new Range("TwoMonth",1,0,GregorianCalendar.MONTH,1,GregorianCalendar.MONTH,2));
-				
-				lur.add(new Range(rangeOneMonth,1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
-				
-				lx509.add(new Range(rangeOneMonth,1,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
-			}
-	}
-	
-	public Set<String> names() {
-		Set<String> names = new HashSet<>();
+    private static final String DELETE = "Delete";
+    public static final String ONE_MONTH = "OneMonth";
+    public static final String TWO_MONTH = "TwoMonth";
+    public static final String TWO_WEEK = "TwoWeek";
+    public static final String ONE_WEEK = "OneWeek";
+    private static final String AAF_BATCH_RANGE = "aaf_batch_range.";
+    public final Map<String,List<Range>> ranges;
+    private final Map<Integer,Date> intervalDates;
+    private static final Date now = new Date();
+    public final Range approveDelete ;
+
+    private Range delRange;
+    
+    public ExpireRange(final Access access) {
+        ranges = new HashMap<>();
+        intervalDates = new HashMap<>();
+        int i=0;
+        approveDelete = new Range(DELETE,0,0,0,-1,0,GregorianCalendar.DAY_OF_YEAR,-100);
+        String prop = access.getProperty(AAF_BATCH_RANGE + i,null);
+        if(prop==null && i==0) {
+                List<Range> lcred = getRangeList("cred");
+                List<Range> lur = getRangeList("ur");
+                List<Range> lx509 = getRangeList("x509");
+    
+                
+                /*
+                   Range(Name, ReportingLevel, PeopleInterval, AppInterval, Start(Type,Qty) End(Type,Qty) )
+                   Interval of -1 Means "only once"
+                   Interval of 0 means none
+                   Interval > 0 means only X number of Days.
+                */
+                delRange = new Range(DELETE,0,0,0,-1,0,GregorianCalendar.WEEK_OF_MONTH,-2);
+                lur.add(delRange);
+                lcred.add(delRange);
+                lx509.add(delRange);
+                
+                lcred.add(new Range(ONE_WEEK ,3,-1,1,0,0,GregorianCalendar.WEEK_OF_MONTH,1));
+                lcred.add(new Range(TWO_WEEK ,2,-1,-1,GregorianCalendar.WEEK_OF_MONTH,1,GregorianCalendar.WEEK_OF_MONTH,2));
+                lcred.add(new Range(ONE_MONTH,1,7,7,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
+                lcred.add(new Range(TWO_MONTH,1,-1,-1,GregorianCalendar.MONTH,1,GregorianCalendar.MONTH,2));
+                
+                lur.add(  new Range(ONE_MONTH,1,-1,-1,0,0,GregorianCalendar.MONTH,1));
+                // Comment out until we can get some more clear actions in place for GUI
+                // lur.add(  new Range(ONE_MONTH,1,-1,-1,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
+                // lur.add(  new Range(ONE_WEEK,2,-1,1,0,0,GregorianCalendar.WEEK_OF_MONTH,1));
+                
+                lx509.add(new Range(ONE_MONTH,1,-1,-1,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
+            }
+    }
+    
+    public Range newFutureRange() {
+        return new Range("Approval",7,7,1,0,0,GregorianCalendar.MONTH,1);
+    }
+    
+    public Set<String> names() {
+        Set<String> names = new HashSet<>();
         for(List<Range> lr : ranges.values()) {
-        	for(Range r : lr) {
-        		names.add(r.name);
-        	}
+            for(Range r : lr) {
+                names.add(r.name);
+            }
+        }
+
+        return names;
+    }
+    
+    private synchronized List<Range> getRangeList(final String key) {
+        List<Range> rv = ranges.get(key);
+        if(rv==null) {
+            rv = new ArrayList<>();
+            ranges.put(key, rv);
+        }
+        return rv;
+    }
+    
+    public class Range {
+        private final String name;
+        private final int reportingLevel;
+        private final int peopleInterval; // in Days
+        private final int appInterval; // in Days
+        private final Date start;
+        private final Date end;
+        private final Date lowerValid;
+        
+        public Range(
+                final String name, final int reportingLevel, 
+                final int peopleInterval, final int appInterval,  
+                final int startGCType, final int startQty,  
+                final int endGCType,final int endQty) {
+            this.name = name;
+            this.reportingLevel = reportingLevel;
+            this.peopleInterval = peopleInterval;
+            this.appInterval = appInterval;
+            GregorianCalendar gc = new GregorianCalendar();
+            if(startGCType<0) {
+                gc.set(GregorianCalendar.YEAR, 1);
+            } else {
+                gc.setTime(now);
+                gc.add(startGCType, startQty);
+            }
+            start = gc.getTime();
+            
+            if(endGCType<0) {
+                gc.set(GregorianCalendar.YEAR, 1);
+            } else {
+                gc.setTime(now);
+                gc.add(endGCType, endQty);
+            }
+            end = gc.getTime();
+            
+
+            if(endGCType<0) {
+                gc.set(GregorianCalendar.YEAR, -1);
+            } else {
+                gc.setTime(now);
+                gc.add(endGCType, endQty * -1);
+            }
+            lowerValid = gc.getTime();
+
+        }
+        
+        public String name() {
+            return name;
+        }
+        
+        public int reportingLevel() {
+            return reportingLevel;
         }
 
-		return names;
-	}
-	
-	private synchronized List<Range> getRangeList(final String key) {
-		List<Range> rv = ranges.get(key);
-		if(rv==null) {
-			rv = new ArrayList<>();
-			ranges.put(key, rv);
-		}
-		return rv;
-	}
-	
-	public class Range {
-		private final String name;
-		private final int reportingLevel;
-		private final int interval; // in Days
-		private final Date start;
-		private final Date end;
-		
-		public Range(
-				final String name, final int reportingLevel, final int interval,  
-				final int startGCType, final int startQty,  
-				final int endGCType,final int endQty) {
-			this.name = name;
-			this.reportingLevel = reportingLevel;
-			this.interval = interval;
-			GregorianCalendar gc = new GregorianCalendar();
-			if(startGCType<0) {
-				gc.set(GregorianCalendar.YEAR, 1);
-			} else {
-				gc.setTime(now);
-				gc.add(startGCType, startQty);
-			}
-			start = gc.getTime();
-			
-			if(endGCType<0) {
-				gc.set(GregorianCalendar.YEAR, 1);
-			} else {
-				gc.setTime(now);
-				gc.add(endGCType, endQty);
-			}
-			end = gc.getTime();
-		}
-		
-		public String name() {
-			return name;
-		}
-		
-		public int reportingLevel() {
-			return reportingLevel;
-		}
+        public boolean needsContact(Date lnd, Identity identity) {
+            final int interval;
+            if(identity==null || identity.isPerson()) {
+                interval = peopleInterval;
+            } else {
+                interval = appInterval;
+            }
+            if(interval == 0) {
+                return false;
+            } else if(interval < 0) { // "-1 = only once "
+                return (lnd==null || lnd.before(lowerValid));
+            } else {
+                Date rv = intervalDates.get(interval);
+                if(rv==null) {
+                    GregorianCalendar gc = new GregorianCalendar();
+                    gc.setTime(now);
+                    gc.add(GregorianCalendar.DAY_OF_YEAR, -1*interval);
+                    rv = gc.getTime();
+                    intervalDates.put(interval, rv);
+                }
+                return rv.after(lnd);
+            }
+        }
 
-		public Date getStart() {
-			return start;
-		}
-		
-		public Date getEnd() {
-			return end;
-		}
-		
-		private boolean inRange(final Date date) {
-			if(date==null) {
-				return false;
-			} else {
-				return date.getTime()>=start.getTime() && date.before(end);
-			}
-		}
+        public Date getStart() {
+            return start;
+        }
+        
+        public Date getEnd() {
+            return end;
+        }
+        
+        public boolean inRange(final Date date) {
+            if(date==null) {
+                return false;
+            } else {
+                return date.getTime()>=start.getTime() && date.before(end);
+            }
+        }
+
+    }
 
-		public boolean shouldContact(final Date lastContact) {
-			if(reportingLevel<=0) {
-				return false;
-			} else if(lastContact==null) {
-				return true;
-			} else if(interval==0) {
-				return lastContact.before(start);
-			} else {
-				GregorianCalendar gc = new GregorianCalendar();
-				gc.setTime(now);
-				gc.add(GregorianCalendar.DAY_OF_WEEK, interval);
-				return lastContact.before(gc.getTime());
-			}
-		}
-	}
+    public Range getRange(final String key, final Date date) {
+        Range rv = null;
+        if(date!=null) {
+            List<Range> lr = ranges.get(key);
+            if(lr==null) {
+                return null;
+            } else {
+                for(Range r : lr) {
+                    if(r.inRange(date)) {
+                        rv = r;
+                        break;
+                    }
+                }
+            }
+        }
+        return rv;
+    }
 
-	public Range getRange(final String key, final Date date) {
-		Range rv = null;
-		if(date!=null) {
-			List<Range> lr = ranges.get(key);
-			if(lr==null) {
-				return null;
-			} else {
-				for(Range r : lr) {
-					if(r.inRange(date)) {
-						rv = r;
-						break;
-					}
-				}
-			}
-		}
-		return rv;
-	}
-	
+    public Date now() {
+        return now;
+    }
+    
 
 }