--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/04/19 12:39:38	3004
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/07/22 09:53:45	3070
@@ -1,10 +1,13 @@
 package dk.daoas.adressevedligehold.dawa;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.TreeMap;
-import java.util.TreeSet;
+
+import com.google.common.base.Splitter;
 
 import dk.daoas.adressevedligehold.MailSender;
 import dk.daoas.adressevedligehold.beans.Address;
@@ -12,7 +15,9 @@
 import dk.daoas.adressevedligehold.db.DatabaseCoverageUpdate;
 import dk.daoas.adressevedligehold.tasks.Task;
 import dk.daoas.adressevedligehold.tasks.TaskLogger;
+import dk.daoas.adressevedligehold.util.CountMap;
 import dk.daoas.adressevedligehold.util.DeduplicateHelper;
+import dk.daoas.adressevedligehold.util.TimingHelper;
 
 /*
  * Alle regioner: http://dawa.aws.dk/regioner/
@@ -22,18 +27,21 @@
 
 public class DawaTask extends Task {
 	
-	final String kommentarTemplate = "Oprettet via DAWA";
+	final static String KOMMENTAR_TEMPLATE = "Oprettet via DAWA";
 	
 	private TaskLogger logger = TaskLogger.getInstance(); 
 	
 	private short regionCode;
 	private String regionName;
 	
+	int antalBehandlede = 0;
+	int antalKommuner = 0;
+	
 	
+	DeduplicateHelper<String> dedup = new DeduplicateHelper<>();
 	
-	DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
 	
-	DeduplicateHelper<String> dedup = new DeduplicateHelper<>(); 
+	 
 	
 	public DawaTask(short regionCode, String regionName){
 		this.regionCode = regionCode;		
@@ -43,21 +51,20 @@
 
 	@Override
 	protected void taskRun() throws Exception {
+		TimingHelper timer = new TimingHelper();
+				
+		DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
 		
-		int kommunekode = 615;
-		String kommunenavn = "Horsens";
-		
-		// stage 1 - hent alle data		
 		DawaWebservice dawa = new DawaWebservice();
-		List<Address> dawaListe = dawa.lookup(kommunekode);
+		TreeMap<String, DawaGade> search = new TreeMap<>();
 		
+		// stage 1 - hent alle data			
 		List<Address> adresser = db.getAllAdresses();
 		
 		
-		
 		// stage 2 opbyg søge struktur		
 		logger.info("Building search structure");
-		TreeMap<String, DawaGade> search = new TreeMap<>();
+
 		
 		for (Address addr : adresser) {
 			String dav = getDAVid(addr);
@@ -71,85 +78,164 @@
 		}
 		logger.info("Build search structure done");
 		
-		// stage 3 søg		
-		Set<String> ukendteDAV = new TreeSet<>();
-		Set<String> dobbeltGadeidDAV = new TreeSet<>();
-		List<Address> nyeAdresser = new ArrayList<>();
+		Map<String,Integer> kommuner = dawa.kommunerIRegion(regionCode);
 		
-		for (Address dawaAddr : dawaListe) {
-			String dav = getDAVid(dawaAddr);
-			DawaGade gade = search.get(dav);
-			if (gade == null) {
-				ukendteDAV.add(dav + " " + dawaAddr.vejnavn);
-				continue;
-			}
+		String subject = "DAWA indlæsning - " + regionName;
+		
+		StringBuilder headerSB = new StringBuilder();
+		headerSB.append("<h1>Indlæsnings rapport for " + regionName + " </h1><br>");
+		
+		List<Address> totalNye = new ArrayList<>();
+		List<Address> totalFejl = new ArrayList<>();
+		CountMap totalUkendtDAV = new CountMap();
+		CountMap totalDobbeltDav = new CountMap();
+		
+		
+		
+		antalKommuner = kommuner.size();
+		
+		
+		StringBuilder sb = new StringBuilder();
+		
+		for (Map.Entry<String, Integer> entry : kommuner.entrySet()) {
+			int kommunekode = entry.getValue();
+			String kommunenavn = entry.getKey();
 			
-			if (gade.gadeids.size() != 1) {
-				dobbeltGadeidDAV.add(dav + " " + dawaAddr.vejnavn);
+			logger.info("Behandler: " + kommunekode + " " + kommunenavn);
+		
+			
+			List<Address> dawaListe = dawa.adresserIKommune(kommunekode);
+			// stage 3 søg		
+			CountMap ukendteDAV = new CountMap();
+			CountMap dobbeltGadeidDAV = new CountMap();
+			List<Address> nyeAdresser = new ArrayList<>();
+			
+			for (Address dawaAddr : dawaListe) {
+				String dav = getDAVid(dawaAddr);
+				DawaGade gade = search.get(dav);
+				if (gade == null) {
+					String key = dav + " " + dawaAddr.vejnavn;
+					ukendteDAV.increment(key);
+					continue;
+				}
+				
+				if (gade.gadeids.size() != 1) {
+					String key = dav + " " + dawaAddr.vejnavn;
+					dobbeltGadeidDAV.increment(key);
+					continue;
+				}
+				
+				boolean fundet = false;
+				for (Address target : gade.adresser) {
+					if ( target.husnr == dawaAddr.husnr && target.husnrbogstav.equals(dawaAddr.husnrbogstav) ) {
+						fundet = true;
+						break;
+					}	
+				}
+				
+				if (fundet == false) {
+					dawaAddr.gadeid = gade.gadeids.iterator().next();
+					dawaAddr.state = AddressState.CREATED;
+					dawaAddr.kommentar = KOMMENTAR_TEMPLATE;
+					nyeAdresser.add(dawaAddr);
+				}			
 			}
+			logger.info("Address Search done - starting save to DB");
+			
+			db.saveNewAddresses(nyeAdresser);
 			
-			boolean fundet = false;
-			for (Address target : gade.adresser) {
-				if ( target.husnr == dawaAddr.husnr && target.husnrbogstav.equals(dawaAddr.husnrbogstav) ) {
-					fundet = true;
-					break;
-				}	
+			logger.info("Save to db done - adding to report mail");
+			
+			List<Address> saveOK = new ArrayList<>();
+			List<Address> saveFail = new ArrayList<>();
+			for (Address a : nyeAdresser) {
+				if (a.state == AddressState.CREATE_FAIL) {
+					saveFail.add(a);
+				} else {
+					saveOK.add(a);
+				}
 			}
 			
-			if (fundet == false) {
-				dawaAddr.gadeid = gade.gadeids.iterator().next();
-				dawaAddr.state = AddressState.CREATED;
-				dawaAddr.kommentar = kommentarTemplate;
-				nyeAdresser.add(dawaAddr);
-			}			
+			totalNye.addAll(saveOK);
+			totalFejl.addAll(saveFail);
+			
+			totalUkendtDAV.putAll(ukendteDAV);
+			totalDobbeltDav.putAll(dobbeltGadeidDAV);
+		
+			
+			antalBehandlede++;
+	
+			
+			sb.append("<h2>Kommune: " + kommunenavn + "</h2>\n");
+			
+			sb.append("Kommunekode: " + kommunekode + "<br>\n");
+			sb.append("Antal Inserts: " + saveOK.size() + "<br>\n");
+			sb.append("Antal insert fails: " + saveFail.size() + "<br>\n");
+			sb.append("Antal ukendte dav: " + ukendteDAV.size() + "<br>\n");
+			sb.append("Antal dobbelt gadeid dav: " + dobbeltGadeidDAV.size() + "<br>\n");
 		}
-		logger.info("Address Search done - starting save to DB");
 		
-		db.saveNewAddresses(nyeAdresser);
+		logger.info("Sendingreport mail");
 		
-		logger.info("Save to db done - sending report mail");
+		headerSB.append("Antal Inserts: " + totalNye.size() + "<br>\n");
+		headerSB.append("Antal insert fails: " + totalFejl.size() + "<br>\n");
+		headerSB.append("Antal ukendte dav: " + totalUkendtDAV.size() + "<br>\n");
+		headerSB.append("Antal dobbelt gadeid dav: " + totalDobbeltDav.size() + "<br>\n");
+		headerSB.append("Elapsed: " + timer.getElapsed() + " ms.<br>\n");
 		
-		List<Address> saveOK = new ArrayList<>();
-		List<Address> saveFail = new ArrayList<>();
-		for (Address a : nyeAdresser) {
-			if (a.state == AddressState.CREATE_FAIL) {
-				saveFail.add(a);
-			} else {
-				saveOK.add(a);
-			}
-		}
+		Map<String,String> attachments = new TreeMap<>();
+		attachments.put("saveok.csv", buildAddressFile(totalNye) );
+		attachments.put("savefailed.csv", buildAddressFile(totalFejl) );
+		
+		attachments.put("ukendte_dav.csv", buildDavFile(totalUkendtDAV) );
+		attachments.put("dobbelt_dav_gadeid.csv", buildDavFile(totalDobbeltDav) );
 		
-		String subject = "DAWA indlæsning done";
 		
+		MailSender.sendMailWithAttachments(subject, headerSB.toString() + sb.toString(), attachments);
+
+		
+		//Cleaning
+		dedup.clear();
+	}
+	
+	private String buildDavFile(CountMap dav) {
 		StringBuilder sb = new StringBuilder();
-		sb.append("<h1>Indlæsnings rapport for " + regionName + " / " + regionCode + " </h1><br>");
 		
-		sb.append("<h2>Kommune: " + kommunenavn + " / " + kommunekode + "</h2><br>\n");
-		sb.append("<h3>Adresser ok:</h3>\n");
-		for (Address a: saveOK) {
-			sb.append(a.toString() + "<br>\n");
+		sb.append("DAVid;Vejnavn;Antal\r\n");
+		for ( Entry<String,Integer> entry : dav.entrySet()) {
+			
+			List<String> split = Splitter.on(' ').limit(2).splitToList(entry.getKey());
+			sb.append( split.get(0) ).append(";");//DAVid
+			sb.append( split.get(1) ).append(";");//vejnavn
+			
+			sb.append( entry.getValue() ).append("\r\n");//vejnavn
+			
 		}
 		
-		sb.append("<h3>SQL INSERT fejl:</h3>\n");
-		for (Address a: saveFail) {
-			sb.append(a.toString() + "<br>\n");
-		}
+		return sb.toString();
+	}
+	
+	private String buildAddressFile(List<Address> addr) {
 		
-		sb.append("<h3>Ukendte DAV:</h3>\n");
-		for (String dav : ukendteDAV) {
-			sb.append(dav + "<br>\n");
-		}
+		Collections.sort(addr); //brug dens egen compareTo funktion
 		
-		sb.append("<h3>Dobbelt gadeid DAV:</h3>\n");
-		for (String dav : dobbeltGadeidDAV) {
-			sb.append(dav + "<br>\n");
+		StringBuilder sb = new StringBuilder();
+				
+		sb.append("GadeID;Postnr;Kom.kode;Vejkode;Vejnavn;Husnr;Litra\r\n");
+		for (Address a: addr) {
+			sb.append(a.gadeid).append(";");
+			sb.append(a.postnr).append(";");
+			sb.append(a.kommunekode).append(";");
+			sb.append(a.vejkode).append(";");
+			sb.append(a.vejnavn).append(";");
+			sb.append(a.husnr).append(";");
+			sb.append(a.husnrbogstav).append("\r\n");
 		}
+		return sb.toString();
 		
-		MailSender.sendMail(subject, sb.toString() );
-
-
 	}
 	
+	
 	String getDAVid(Address addr) {
 		String dav = String.format("%04d%03d%04d", addr.postnr, addr.kommunekode, addr.vejkode);
 		
@@ -168,7 +254,12 @@
 
 	@Override
 	public double getPercentCompleted() {
-		return 0;
+		if (antalKommuner == 0) {
+			return 0;	
+		}
+		
+		return  (antalBehandlede / ((double)antalKommuner) ) * 100.0;
+		
 	}