--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java	2016/01/24 21:48:55	2838
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java	2016/02/05 08:01:18	2924
@@ -2,6 +2,7 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Properties;
 
 import javax.mail.Message;
@@ -13,11 +14,17 @@
 
 import dk.daoas.adressevedligehold.beans.Address;
 import dk.daoas.adressevedligehold.beans.Address.AddressState;
+import dk.daoas.adressevedligehold.tasks.TaskLogger;
 import dk.daoas.adressevedligehold.util.TimingHelper;
 
+/* 
+ * TODO: detail rapport pr postnr
+ * TODO: ved mangel oversigten - skeln mellem om det er nye/CREATED eller om det er gamle kendte adresser
+ */
+
 public class AddressReport {
 	
-	class NumEntry {
+	static class NumEntry {
 		int open = 0;
 		int closed = 0;
 		int modified = 0;
@@ -38,7 +45,7 @@
 			this.created += other.created;
 		}
 	}
-	class WeekEntry {
+	static class WeekEntry {
 		NumEntry man = new NumEntry();
 		NumEntry tir = new NumEntry();
 		NumEntry ons = new NumEntry();
@@ -68,72 +75,91 @@
 		}
 	}
 	
+	private static TaskLogger logger = TaskLogger.getInstance();
 	
+	AddressManager addrManager;
 	List<Address> addressList;
 	int entryCount;
 	EntryUgedage ugedage;
 	AddressSource source;
 	TimingHelper timer;
 	boolean writeBack;
+	int duplicateCount;
 	
 	//TODO: Afviste adresser
-	public AddressReport(AddressManager addrManager, int entryCount, EntryUgedage ugedage, AddressSource source, TimingHelper timer, boolean writeBack ) {
+	public AddressReport(AddressManager addrManager, int entryCount, EntryUgedage ugedage, AddressSource source, TimingHelper timer, boolean writeBack, int duplicateCount ) {
+		this.addrManager = addrManager;
 		addressList = addrManager.getAddressList();
 		this.entryCount = entryCount;
 		this.ugedage = ugedage;
 		this.source = source;
 		this.timer = timer;
 		this.writeBack = writeBack;
-		
+		this.duplicateCount = duplicateCount;
 	}
 	
 	public void sendRapport() {
-		System.out.println("Sending mail");
+		logger.info("Sending mail");
 		
 		String reportData = getReportData();
 		String subject = "Indlæsnings rapport for " + source.getDistributor();
 		
-		
-        Properties props = new Properties();
-        props.put("mail.smtp.host", "10.30.1.28");
-        //props.put("mail.smtp.host", "192.168.12.10");
-        
-        try {
-        	// create some properties and get the default Session
-        	Session session = Session.getDefaultInstance(props, null);
-        	session.setDebug(false);
-        	
-        	MimeMessage msg = new MimeMessage(session);
-			msg.setFrom( new InternetAddress("no-reply@daoas.dk") );
-			
-			
-			msg.setRecipient(Message.RecipientType.TO, new InternetAddress("thn@daoas.dk") );//TODO: mulighed for at ændre modtager mail
-			msg.setSubject( subject );			
-			msg.setContent(reportData, "text/html; charset=utf-8");
-			
-			Transport.send(msg);
-			
-        	
-    	} catch (MessagingException e) {
-			System.out.println("Unable to send report mail " + e.getMessage() );
-		}
-        	
+		AddressReport.sendMail(subject, reportData);
 		
 	}
 	
+	public static void sendMail(String subject, String htmlBody) {
+	       Properties props = new Properties();
+	        props.put("mail.smtp.host", "10.30.1.28");
+	        //props.put("mail.smtp.host", "192.168.12.10");
+	        
+	        try {
+	        	// create some properties and get the default Session
+	        	Session session = Session.getDefaultInstance(props, null);
+	        	session.setDebug(false);
+	        	
+	        	MimeMessage msg = new MimeMessage(session);
+				msg.setFrom( new InternetAddress("no-reply@daoas.dk") );
+				
+				
+				msg.setRecipient(Message.RecipientType.TO, new InternetAddress("thn@daoas.dk") );//TODO: mulighed for at ændre modtager mail
+				msg.setSubject( subject );			
+				msg.setContent(htmlBody, "text/html; charset=utf-8");
+				
+				Transport.send(msg);
+				
+	        	
+	    	} catch (MessagingException e) {
+				logger.warning("Unable to send report mail ", e );
+			}		
+	}
+	
+	
 	public String getReportData() {
 	
 		WeekEntry total = new WeekEntry();
 		HashMap<Short, WeekEntry> postnrEntries = new HashMap<Short,WeekEntry>();
 		
+		int createFailCount = 0;
 		
+		int antalUdenGadeid = 0;
 		int antalUdenKommunekode = 0;
 		int antalUdenLatitude = 0;
 		int antalUdenDBKBane = 0;
 		
 		// first gather the intel
 		for (Address a : addressList) {
-			if (a.kommunekode == 0 || a.vejkode == 0) {
+			
+			if (a.state == AddressState.CREATE_FAIL) {
+				createFailCount++;
+				continue;			
+			}
+			
+			if (a.gadeid == 0) {
+				antalUdenGadeid++;
+			}
+			
+			if (a.kommunekode == 0 || a.vejkode == 0) {				
 				antalUdenKommunekode++;
 			}
 			
@@ -154,6 +180,7 @@
 				postnrEntries.put(a.postnr, weekEntry);
 			}
 			
+
 			
 			if (a.state == AddressState.CREATED) {
 				weekEntry.incrementCreated();
@@ -179,10 +206,23 @@
 		sb.append("Tidsforbrug: ").append( timer.getElapsed() ).append("ms. <br>");
 		sb.append("Skriv til DB: ").append( writeBack ).append("<br>");
 		sb.append("Antal entries: " ).append( entryCount ).append("<br>");
+		sb.append("Antal afviste: " ).append( addrManager.getRejectedCount() ).append("<br>");
+		sb.append("Antal dubletter: " ).append( duplicateCount ).append("<br>");
+		sb.append("Antal fejlede inserts: ").append(createFailCount).append("<br>"); 
+		sb.append("Filen indeholder data til: ");
+		if (ugedage.mandag) sb.append("Mandag, ");
+		if (ugedage.tirsdag) sb.append("Tirsdag, ");
+		if (ugedage.onsdag) sb.append("Onsdag, ");
+		if (ugedage.torsdag) sb.append("Torsdag, ");
+		if (ugedage.fredag) sb.append("Fredag, ");
+		if (ugedage.lordag) sb.append("Lørdag, ");
+		if (ugedage.sondag) sb.append("Søndag, ");
+		sb.append("<br>");
 		
 		sb.append("<h2>Data Mangler</h2>\n");
 		sb.append("<pre>");
 		sb.append("Mangler kommune/vejkode: ").append(antalUdenKommunekode).append("\n");
+		sb.append("Mangler gadeid: ").append(antalUdenGadeid).append("\n");
 		sb.append("Mangler DBK bane: ").append(antalUdenDBKBane).append("\n");
 		sb.append("Mangler latitude/longitude: ").append(antalUdenLatitude).append("\n");
 		sb.append("</pre>");
@@ -197,7 +237,16 @@
 		sb.append("<tr><td>Åbnet:</td><td>").append(total.man.open).append("</td><td>").append(total.tir.open).append("</td><td>").append(total.ons.open).append("</td><td>").append(total.tor.open).append("</td><td>").append(total.fre.open).append("</td><td>").append(total.lor.open).append("</td><td>").append(total.son.open).append("</td></tr>");
 		sb.append("<tr><td>Ændret:</td><td>").append(total.man.modified).append("</td><td>").append(total.tir.modified).append("</td><td>").append(total.ons.modified).append("</td><td>").append(total.tor.modified).append("</td><td>").append(total.fre.modified).append("</td><td>").append(total.lor.modified).append("</td><td>").append(total.son.modified).append("</td></tr>");
 		sb.append("<tr><td>Lukket:</td><td>").append(total.man.closed).append("</td><td>").append(total.tir.closed).append("</td><td>").append(total.ons.closed).append("</td><td>").append(total.tor.closed).append("</td><td>").append(total.fre.closed).append("</td><td>").append(total.lor.closed).append("</td><td>").append(total.son.closed).append("</td></tr>");
-
+		sb.append("</table>");
+		
+		sb.append("<br>");
+		sb.append("<h2>Nye/Ukendte gader</h2>");
+		sb.append("<table>");
+		sb.append("<tr><th>Gadeid</th><th>Vejnavn</th></tr>");
+		for( Entry<Integer,String> unknownStreet : addrManager.getUnknownStreets().entrySet() ) {
+			sb.append("<tr><td>").append(unknownStreet.getKey()).append("</td><td>").append(unknownStreet.getValue()).append("</td></tr>");
+		}
+		sb.append("</table>");
 		
 		
 		sb.append("</table><br>\n");