Author: bleny Date: 2010-12-15 16:52:03 +0000 (Wed, 15 Dec 2010) New Revision: 836 Log: fix DCF validation at sampling plan import ; make it OK in tests Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/resources/import/echantillonnage.csv Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-12-15 14:11:33 UTC (rev 835) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-12-15 16:52:03 UTC (rev 836) @@ -249,6 +249,9 @@ // Create the default admin in database serviceUser.createDefaultAdmin(); + // import all DCF codes + getServiceFactory().getServiceReferential().importDCFcodes(); + if (log.isInfoEnabled()) { log.info("wao is started !"); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-12-15 14:11:33 UTC (rev 835) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-12-15 16:52:03 UTC (rev 836) @@ -32,10 +32,14 @@ import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.entity.FishingGearDCF; +import fr.ifremer.wao.entity.FishingGearDCFDAO; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.FishingZoneDAO; import fr.ifremer.wao.entity.Profession; import fr.ifremer.wao.entity.ProfessionDAO; +import fr.ifremer.wao.entity.TargetSpeciesDCF; +import fr.ifremer.wao.entity.TargetSpeciesDCFDAO; import fr.ifremer.wao.io.csv.ImportHelper; import fr.ifremer.wao.io.csv.WaoCsvHeader.FISHING_ZONE; import org.apache.commons.lang.StringUtils; @@ -204,4 +208,43 @@ return result; } + protected void executeImportDCFcodes(TopiaContext transaction) throws TopiaException { + + final String[] gearCodesBase = {"DRB", "DRH", "FAR", "FCN", "FG", + "FIX", "FPN", "FPO", "FSN", "FWR", "FYK", "GEN", "GES", "GN", "GNC", + "GND", "GNF", "GNS", "GT", "GTN", "GTR", "HAR", "HMD", "HMP", "HMX", + "LA", "LHM", "LHP", "LL", "LLD", "LLS", "LN", "LNB", "LNP", "LNS", + "LTL", "LX", "MIS", "NK", "OT", "OTB", "OTM", "OTT", "PS", "PS1", + "PS2", "PT", "PTB", "PTM", "RG", "SB", "SDN", "SPR", "SSC", "SV", + "SW", "TB", "TBB", "TBN", "TBS", "TM", "TMS", "TX"}; + final String[] speciesCodesBase = {"ALG", "CAT", "CRU", "CSJ", + "DEF", "DWS", "FIN", "LPF", "MOL", "SPF"}; + + FishingGearDCFDAO fishingGearDCFDAO = WaoDAOHelper.getFishingGearDCFDAO(transaction); + TargetSpeciesDCFDAO targetSpeciesDCFDAO = WaoDAOHelper.getTargetSpeciesDCFDAO(transaction); + + long nbCodes = fishingGearDCFDAO.count() + targetSpeciesDCFDAO.count(); + + if (nbCodes == 0) { + for (String code : gearCodesBase) { + fishingGearDCFDAO.create(FishingGearDCF.PROPERTY_CODE, code); + } + + for (String code : speciesCodesBase) { + targetSpeciesDCFDAO.create(TargetSpeciesDCF.PROPERTY_CODE, code); + } + + transaction.commitTransaction(); + + if (log.isDebugEnabled()) { + nbCodes = fishingGearDCFDAO.count() + targetSpeciesDCFDAO.count(); + log.debug(nbCodes + " dcf codes inserted"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("no DCF codes will be inserted"); + } + } + } + } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-12-15 14:11:33 UTC (rev 835) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-12-15 16:52:03 UTC (rev 836) @@ -952,7 +952,7 @@ // Commit row by row transaction.commitTransaction(); } - + //transaction.closeContext(); // } catch (NumberFormatException eee) { @@ -1059,7 +1059,7 @@ * @throws ParseException for format errors */ protected void updateRow(TopiaContext transaction, SampleRow sampleRow, CsvReader reader) - throws IOException, TopiaException, ParseException { + throws IOException, TopiaException, ParseException, WaoBusinessException { String fishingZoneInfos = ImportHelper.read(reader, SAMPLING.PECHE_AUTRE); @@ -1082,8 +1082,24 @@ sampleRow.setPeriodBegin(period.getFromDate()); sampleRow.setPeriodEnd(period.getThruDate()); sampleRow.setComment(comment); - sampleRow.setDCF5Code(codeDCF5, " et "); - + + // a trick, nullSampleRow is just intantiated to user the parsing + // of the codes in the CSV. This trick is needed cause if we use + // sampleRow to do the parsing, parsed objects will be linked to + // sampleRow and the insertOrSelect will raise an exception, telling + // that a transient object (sampleRow) is not saved. + SampleRow nullSampleRow = new SampleRowImpl(); + nullSampleRow.setDCF5Code(codeDCF5, " et "); + + // now, we have a collection of DCF, we must read it to reuse those + // already in database + Collection<DCF5Code> parsed = insertOrSelect(transaction, nullSampleRow.getDCF5Code()); + + // now we can add those code to sampleRow + sampleRow.clearDCF5Code(); + sampleRow.addAllDCF5Code(parsed); + // sampleRow.setDCF5Code(parsed); works fine too + // 16 fixed columns : 13 before months and 3 after int nbFixedColumns = 16; // Months begin at 14th column Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-12-15 14:11:33 UTC (rev 835) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-12-15 16:52:03 UTC (rev 836) @@ -110,6 +110,7 @@ wao.error.serviceChart.getContactPieChartData= wao.error.serviceChart.getContactPieChartUrl= wao.error.serviceContact.exportContactCsv= +wao.error.serviceContact.getContact= wao.error.serviceContact.getContacts= wao.error.serviceContact.getNbContacts= wao.error.serviceContact.getNewContact= @@ -126,6 +127,7 @@ wao.error.serviceReferential.getFishingZones= wao.error.serviceReferential.getProfessions= wao.error.serviceReferential.getSectors= +wao.error.serviceReferential.importDCFcodes= wao.error.serviceReferential.importFishingZoneCsv= wao.error.serviceSampling.createSampleRowLog= wao.error.serviceSampling.createUpdateSampleRow= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-12-15 14:11:33 UTC (rev 835) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-12-15 16:52:03 UTC (rev 836) @@ -127,6 +127,7 @@ wao.error.serviceChart.getContactPieChartData= wao.error.serviceChart.getContactPieChartUrl= wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts +wao.error.serviceContact.getContact=Impossible de trouver le contact wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact @@ -143,6 +144,7 @@ wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00EAche wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00E9tiers wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00EAche +wao.error.serviceReferential.importDCFcodes=Impossible de créer le référentiel des codes DCF wao.error.serviceReferential.importFishingZoneCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00E9tails. wao.error.serviceSampling.createSampleRowLog= wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00E9chantillon Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-12-15 14:11:33 UTC (rev 835) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-12-15 16:52:03 UTC (rev 836) @@ -562,6 +562,7 @@ CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); companyDAO.create(Company.PROPERTY_NAME, "BIS"); + transaction.commitTransaction(); transaction.closeContext(); @@ -609,6 +610,9 @@ zones.contains(zoneI); zones.contains(zoneIId); + Collection<DCF5Code> dcf5codes = row1.getDCF5Code(); + assertEquals(1, dcf5codes.size()); + transaction.closeContext(); } Modified: trunk/wao-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/wao-business/src/test/resources/import/echantillonnage.csv 2010-12-15 14:11:33 UTC (rev 835) +++ trunk/wao-business/src/test/resources/import/echantillonnage.csv 2010-12-15 16:52:03 UTC (rev 836) @@ -1,14 +1,14 @@ "PLAN_CODE","SOCIETE_NOM","PECHE_DIVISION","PECHE_AUTRE","METIER_CODE_DCF5","METIER_MAILLAGE","METIER_TAILLE","METIER_AUTRE","METIER_LIBELLE","METIER_ESPECES","PROGRAMME_CODE","PROGRAMME_DEBUT","PROGRAMME_FIN",12/2009,01/2010,02/2010,03/2010,04/2010,05/2010,06/2010,07/2010,08/2010,09/2010,10/2010,11/2010,12/2010,01/2011,02/2011,03/2011,"PLAN_DUREE_MOY","PLAN_NB_OBSERV","PLAN_COMMENT" -"2010_1",TARTANPION,"IId / I",,"DB_MOL",,,,,,"MA-2009",03/2010,01/2011,,,,0,0,0,0,0,0,0,2,0,0,4,,,"1,5",1,"Un petit commentaire" -"2010_2",,"IId",,"GTR_DEAEF et ANS_DEF",,,,"Fileyage","poissons tubes","MANY",01/2008,12/2008,,20,0,0,21,0,0,21,0,0,21,0,0,,,,1,1, -"2010_03",,"IId / IV",,"ORM",,,,"balottage en plein air","divers choses visqueuses","MA-2009",03/2010,01/2011,,,,0,22,0,0,25,0,0,21,0,0,25,,,2,1, +"2010_1",TARTANPION,"IId / I",,"DRB_ALG",,,,,,"MA-2009",03/2010,01/2011,,,,0,0,0,0,0,0,0,2,0,0,4,,,"1,5",1,"Un petit commentaire" +"2010_2",,"IId",,"DRH_CAT et DRH_CRU",,,,"Fileyage","poissons tubes","MANY",01/2008,12/2008,,20,0,0,21,0,0,21,0,0,21,0,0,,,,1,1, +"2010_03",,"IId / IV",,"FAR",,,,"balottage en plein air","divers choses visqueuses","MA-2009",03/2010,01/2011,,,,0,22,0,0,25,0,0,21,0,0,25,,,2,1, "2009_1",,"IId / IV",,"GTR_DEF et GNS_DEF","110-119",,,"Fileyage à poissons tubes","poissons plats","PPP2010",12/2009,10/2010,0,1,1,1,2,1,1,1,1,1,2,,,,,,1,1, "2009_2",,"IId",,"GTR_DEF et GNS_DEF","9888-99",,,"Fileyage à sirènes ","nymphes","PPP2010",12/2009,10/2010,1,1,1,2,3,4,4,4,4,3,3,,,,,,1,1, -"2009_3",TARTANPION,"IV",,"GTR_DF et GNS_DP",,,,"Fileyages à baleines à bosse","chameaux","PPP2010",12/2009,10/2010,2,2,2,2,2,2,2,2,2,2,4,,,,,,1,1, -"2009_4",,"IId",,"B_DEF",">=190",">18",,"Chalutage de fond machiavélique","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2, -"2009_5",,"IId",,"OP_DEF","70-1100",">1140",,"Plongeur de fond sous-marin","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2, -"2009_6",BIS,"I / IV",,"OP_DEF","70-1100",">1140",,"Leon","poissons plats","PPP2010",12/2009,10/2010,0,1,0,1,0,1,2,2,2,2,1,,,,,,3,2, -"2010_4",TARTANPION,"IId / IV",,"OTB_TEF et OTB_U et OL",,,,"Chalutage de fond","gadidés, poissons plats, divers","BLOB",01/2010,12/2010,,3,0,0,3,0,0,3,0,0,3,0,0,,,,3,1, -"2010_5",,,,"OTB_TEF et OTB_U et OL",,,,"Kamoulox","merlu, poissons cerises, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, -"2010_10",,"I / IV",,"OTB_TEF et OTB_U et OL","70-1100",,,"Kamoulox","merlu, poissons pommes, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, -"2010_11",,"I / IV",,"OTB_TEF et OTB_U et OL","70-1100",,,"Troubidou","merlu, poissons cerises","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, +"2009_3",TARTANPION,"IV",,"GTR_MOL et GNS_FIN",,,,"Fileyages à baleines à bosse","chameaux","PPP2010",12/2009,10/2010,2,2,2,2,2,2,2,2,2,2,4,,,,,,1,1, +"2009_4",,"IId",,"PTB_ALG",">=190",">18",,"Chalutage de fond machiavélique","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2, +"2009_5",,"IId",,"PTB_ALG","70-1100",">1140",,"Plongeur de fond sous-marin","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2, +"2009_6",BIS,"I / IV",,"OT_DEF","70-1100",">1140",,"Leon","poissons plats","PPP2010",12/2009,10/2010,0,1,0,1,0,1,2,2,2,2,1,,,,,,3,2, +"2010_4",TARTANPION,"IId / IV",,"OT_DEF et PTB_ALG et DRH",,,,"Chalutage de fond","gadidés, poissons plats, divers","BLOB",01/2010,12/2010,,3,0,0,3,0,0,3,0,0,3,0,0,,,,3,1, +"2010_5",,,,"DRB",,,,"Kamoulox","merlu, poissons cerises, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, +"2010_10",,"I / IV",,"DRB","70-1100",,,"Kamoulox","merlu, poissons pommes, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, +"2010_11",,"I / IV",,"DRB_CSJ","70-1100",,,"Troubidou","merlu, poissons cerises","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1,