X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fupdate%2FApprovals.java;h=2047098a871c761215e81241f98b2b11ebb45244;hb=refs%2Fchanges%2F52%2F79452%2F3;hp=36fd6274aeae6cfea6a12478727f8edb7a69cfc5;hpb=fe3c40d9686febe8b6dd633bb9b1bbebba00288b;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Approvals.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Approvals.java
index 36fd6274..2047098a 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Approvals.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Approvals.java
@@ -25,9 +25,11 @@ import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.TreeMap;
 
 import org.onap.aaf.auth.batch.Batch;
@@ -37,8 +39,10 @@ import org.onap.aaf.auth.batch.approvalsets.Pending;
 import org.onap.aaf.auth.batch.approvalsets.URApprovalSet;
 import org.onap.aaf.auth.batch.helpers.BatchDataView;
 import org.onap.aaf.auth.batch.helpers.NS;
+import org.onap.aaf.auth.batch.helpers.Notification;
 import org.onap.aaf.auth.batch.helpers.Role;
 import org.onap.aaf.auth.batch.helpers.UserRole;
+import org.onap.aaf.auth.batch.reports.bodies.NotifyPendingApprBody;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
@@ -56,6 +60,7 @@ public class Approvals extends Batch {
 	private BatchDataView dataview;
 	private List<CSV> csvList;
 	private GregorianCalendar now;
+	
 
     public Approvals(AuthzTrans trans) throws APIException, IOException, OrganizationException {
         super(trans.env());
@@ -90,7 +95,6 @@ public class Approvals extends Batch {
 			}
         }
         
-        
     }
 
     @Override
@@ -104,10 +108,11 @@ public class Approvals extends Batch {
 					switch(row.get(0)) {
 						case Pending.REMIND:
 							try {
+								String user = row.get(1);
 								Pending p = new Pending(row);
-								Pending mp = mpending.get(row.get(1));
+								Pending mp = mpending.get(user);
 								if(mp==null) {
-									mpending.put(row.get(1), p);
+									mpending.put(user, p);
 								} else {
 									mp.inc(p); // FYI, unlikely
 								}
@@ -165,9 +170,21 @@ public class Approvals extends Batch {
             trans.info().printf("Processed %d UserRoles", count.get());
 
             count.set(0);
+        	NotifyPendingApprBody npab;
+        	GregorianCalendar gc = new GregorianCalendar();
+        	gc.add(GregorianCalendar.DAY_OF_MONTH, 7);
+        	Date oneWeek = gc.getTime();
+        	
+        	Pending p;
         	tt = trans.start("Notify for Pending", Trans.SUB);
         	try {
-        		
+        		for(Entry<String, Pending> es : mpending.entrySet()) {
+        			p = es.getValue();
+        			Date earliest = p.earliest();
+        			if(p.newApprovals() || earliest==null || earliest.before(oneWeek) ) {
+        				System.out.println("update");
+        			}
+        		}
         	} finally {
         		tt.done();
         	}