X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Freports%2Fbodies%2FNotifyCredBody.java;h=1f8d978234a249afab00d7422d8ed678352cddfc;hb=d86e3224e6a5af2bd2b713f93bea5e6677d3ebc2;hp=2369582d525269a2e020259b055458dd651a4000;hpb=b24f7e097f17761a5c1b02c4dbfe6ee7d78836dd;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyCredBody.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyCredBody.java
index 2369582d..1f8d9782 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyCredBody.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/bodies/NotifyCredBody.java
@@ -21,46 +21,70 @@
 package org.onap.aaf.auth.batch.reports.bodies;
 
 import java.io.IOException;
+import java.util.GregorianCalendar;
 import java.util.List;
 
+import org.onap.aaf.auth.batch.helpers.LastNotified;
 import org.onap.aaf.auth.batch.reports.Notify;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.cadi.Access;
+import org.onap.aaf.misc.env.util.Chrono;
 
 public abstract class NotifyCredBody extends NotifyBody {
 
 	private final String explanation;
+	private final String instruction;
+	 
 	public NotifyCredBody(Access access, String name) throws IOException {
-		super("cred",name);
+		super(access,"cred",name);
 		
 		// Default
-		explanation = "The following Credentials are expiring on the dates shown. "
-				+ "Failure to act before the expiration date will cause your App's Authentications to fail.";
+		explanation = "The following Credentials that you are responsible for "
+				+ "are expiring on the dates shown. <br><br>"
+				;
+				
+        instruction = "<br><h3>Instructions for 'Password':</h3><ul>" 
+				+ "<li><b><i>Click</i></b> on the Fully Qualified ID to ADD a new Password</li>"
+				+ "<li><b>REMEMBER!</b> You are not finished until you <ol>"
+				+ "<li><b>CHANGE <i>ALL</i></b> the configurations on <b><i>ALL</i></b> your processes!!</li>"
+				+ "<li><b>BOUNCE</b> them</li></ol>"
+				+ "<li>IF there is a WARNING, click the link for more information</li>"
+				+ "</ul>";
+	}
+	
+	/**
+	 * Default Dynamic Text.  Override is expected
+	 * @return
+	 */
+	protected String dynamic() {
+		return "Failure to act before the expiration date will cause your App's Authentications to fail.";
 	}
 
 	@Override
 	public boolean body(AuthzTrans trans, StringBuilder sb, int indent, Notify n, String id) {
-		println(sb,indent,explanation);
-		println(sb,indent,"<br><br>");
+		print(sb,indent,explanation);
+		print(sb,indent,dynamic());
+		println(sb,indent,instruction);
 		println(sb,indent,"<table>");
 		indent+=2;
 		println(sb,indent,"<tr>");
 		indent+=2;
 		println(sb,indent,"<th>Fully Qualified ID</th>");
+		println(sb,indent,"<th>Unique ID</th>");
 		println(sb,indent,"<th>Type</th>");
-		println(sb,indent,"<th>Details</th>");
 		println(sb,indent,"<th>Expires</th>");
-		println(sb,indent,"<th>Cred Detail Page</th>");
+		println(sb,indent,"<th>Warnings</th>");
 		indent-=2;
 		println(sb,indent,"</tr>");
-		String theid, type, info, gui, expires, notes;
-		String p_theid=null, p_type=null, p_gui=null, p_expires=null;
+		String theid, type, info, expires, warnings;
+		GregorianCalendar gc = new GregorianCalendar();
 		for(List<String> row : rows.get(id)) {
 			theid=row.get(1);
 			switch(row.get(3)) {
 				case "1":
 				case "2":
 					type = "Password";
+					break;
 				case "200":
 					type = "x509 (Certificate)";
 					break;
@@ -68,33 +92,38 @@ public abstract class NotifyCredBody extends NotifyBody {
 					type = "Unknown, see AAF GUI";
 					break;
 			}
-			gui = "<a href=\""+n.guiURL+"/creddetail?ns="+row.get(2)+"\">"+row.get(2)+"</a>";
-			expires = row.get(4);
+			theid = "<a href=\""+n.guiURL+"/creddetail?ns="+row.get(2)+"\">"+theid+"</a>";
+			gc.setTimeInMillis(Long.parseLong(row.get(5)));
+			expires = Chrono.niceUTCStamp(gc);
 			info = row.get(6);
-			notes = row.get(8);
-			if(notes!=null && !notes.isEmpty()) {
-				info += "<br>" + notes; 
-			}
+			//TODO get Warnings 
+			warnings = "";
 			
 			println(sb,indent,"<tr>");
 			indent+=2;
-			printCell(sb,indent,theid,p_theid);
-			printCell(sb,indent,type,p_type);
-			printCell(sb,indent,info,null);
-			printCell(sb,indent,expires,p_expires);
-			printCell(sb,indent,gui,p_gui);
+			printCell(sb,indent,theid);
+			printCell(sb,indent,info);
+			printCell(sb,indent,type);
+			printCell(sb,indent,expires);
+			printCell(sb,indent,warnings);
 			indent-=2;
 			println(sb,indent,"</tr>");
-			p_theid=theid;
-			p_type=type;
-			p_gui=gui;
-			p_expires=expires;
 		}
 		indent-=2;
 		println(sb,indent,"</table>");
 		
 		return true;
 	}
+	
+	@Override
+	public void record(AuthzTrans trans, StringBuilder query, String id, List<String> notified, LastNotified ln) {
+		for(List<String> row : rows.get(id)) {
+			for(String n : notified) {
+				// Need to match LastNotified Key ... cred.id + '|' + inst.type + '|' + inst.tag;
+				ln.update(query, n, row.get(0), row.get(1)+'|'+row.get(3)+'|'+row.get(6));
+			}
+		}
+	}
 
 	@Override
 	public String user(List<String> row) {