Author: fdesbois Date: 2010-02-03 20:17:06 +0000 (Wed, 03 Feb 2010) New Revision: 318 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImplTest.java trunk/suiviobsmer-business/src/test/resources/import/echantillonnage.csv Log: - Evo #1984 : non compliance boarding indicator (only business) - Add an other company in samplingPlan csv for tests Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java 2010-02-02 23:48:45 UTC (rev 317) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java 2010-02-03 20:17:06 UTC (rev 318) @@ -25,7 +25,6 @@ import fr.ifremer.suiviobsmer.entity.FishingZone; import fr.ifremer.suiviobsmer.entity.SampleRow; import java.util.Calendar; -import java.util.Date; import java.util.GregorianCalendar; import org.apache.commons.lang.StringUtils; import org.nuiton.topia.framework.TopiaQuery; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-02 23:48:45 UTC (rev 317) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-02-03 20:17:06 UTC (rev 318) @@ -39,6 +39,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -234,4 +235,93 @@ return result; } + @Override + public Map<Company, Double> getNonComplianceBoardingIndicator(Company company) throws SuiviObsmerException { + TopiaContext transaction = null; + // Carefull with results, the company may not be present in the map : + // only if there is no unfinished sampleRow or no contact done + Map<Company, Double> results = new HashMap<Company, Double>(); + try { + transaction = rootContext.beginTransaction(); + + ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction); + + // Only for done contacts with no constraint + TopiaQuery<Contact> query = + dao.createQueryDoneContactsFromDate(null, null); + + String contactKey = query.getMainAlias(); + String sampleRowKey = contactKey + "." + Contact.SAMPLE_ROW; + String companyKey = sampleRowKey + "." + SampleRow.COMPANY; + + // Only for unfinished sampleRows + Date current = SuiviObsmerContext.getCurrentDate(); + query.add(sampleRowKey + "." + SampleRow.PERIOD_END, Op.GE, current); + + if (company != null) { + query.add(companyKey, company); + } + + // Prepare results + query.setSelect(companyKey). + addSelect("COUNT(*)"). + addGroup(companyKey); + + if (log.isTraceEnabled()) { + log.trace("Exec query for total : " + query); + } + + List<Object[]> totalResults = query.execute(); + + // Use the same query and add the constraint of non compliance + //i.e. nbObservantsReal (contact) < nbObservantsExpected (sampleRow) + query.add(contactKey + "." + Contact.NB_OBSERVANTS + " < " + + sampleRowKey + "." + SampleRow.NB_OBSERVANTS); + + if (log.isTraceEnabled()) { + log.trace("Exec query for result : " + query); + } + + List<Object[]> diffResults = query.execute(); + + // Use the map to set the number of non compliance results + for (Object[] row : diffResults) { + Company rowCompany = (Company)row[0]; + Long rowCount = (Long)row[1]; + if (log.isTraceEnabled()) { + log.trace("result row : " + rowCompany.getName() + " = " + rowCount); + } + results.put(rowCompany, rowCount.doubleValue()); + } + + // Get the previous value from the map and make the division to have + // the result percent of non compliance. Put 0 in the map if no + // previous result is set + for (Object[] row : totalResults) { + Company rowCompany = (Company)row[0]; + Long rowCount = (Long)row[1]; + if (log.isTraceEnabled()) { + log.trace("total row : " + rowCompany.getName() + " = " + rowCount); + } + Double value = results.get(rowCompany); + if (value == null) { + results.put(rowCompany, 0.); + } else { + results.put(rowCompany, value / rowCount); + } + } + + transaction.closeContext(); + } catch (Exception eee) { + String msgEnd = ""; + if (company != null) { + msgEnd = " pour la société " + company.getName(); + } + SuiviObsmerContext.serviceException(transaction, + "Impossible de récupérer l'indicateur de non respect du " + + "nombre d'observateurs embarqués" + msgEnd, eee); + } + return results; + } + } Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2010-02-02 23:48:45 UTC (rev 317) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2010-02-03 20:17:06 UTC (rev 318) @@ -98,6 +98,10 @@ Company company = new CompanyImpl(); company.setName("TARTANPION"); serviceUser.createUpdateCompany(company); + Company company2 = new CompanyImpl(); + company2.setName("BIS"); + serviceUser.createUpdateCompany(company2); + WaoUser user = new WaoUserImpl(); user.setLogin("user"); user.setFirstName("Jean"); Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java 2010-02-02 23:48:45 UTC (rev 317) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java 2010-02-03 20:17:06 UTC (rev 318) @@ -218,6 +218,7 @@ CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); SuiviObsmerContext.prepareTopiaId(Company.class, company); companyDAO.update(company); + companyDAO.create(Company.NAME, "BIS"); transaction.commitTransaction(); ServiceSampling serviceSampling = new ServiceSamplingImpl(); Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-02-02 23:48:45 UTC (rev 317) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-02-03 20:17:06 UTC (rev 318) @@ -424,6 +424,7 @@ CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); companyDAO.create(Company.NAME, "TARTANPION"); + companyDAO.create(Company.NAME, "BIS"); transaction.commitTransaction(); @@ -470,6 +471,7 @@ CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); companyDAO.create(Company.NAME, "TARTANPION"); + companyDAO.create(Company.NAME, "BIS"); transaction.commitTransaction(); transaction.closeContext(); @@ -526,6 +528,7 @@ CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); companyDAO.create(Company.NAME, "TARTANPION"); + companyDAO.create(Company.NAME, "BIS"); transaction.commitTransaction(); transaction.closeContext(); @@ -552,6 +555,7 @@ CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); companyDAO.create(Company.NAME, "TARTANPION"); + companyDAO.create(Company.NAME, "BIS"); transaction.commitTransaction(); ServiceSampling serviceSampling = new ServiceSamplingImpl(); Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImplTest.java 2010-02-02 23:48:45 UTC (rev 317) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImplTest.java 2010-02-03 20:17:06 UTC (rev 318) @@ -23,6 +23,7 @@ import java.io.InputStream; import java.util.Date; import java.util.List; +import java.util.Map; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -82,7 +83,7 @@ */ @Test public void testGetBoardingBoats() throws Exception { - System.out.println("getBoardingBoats"); + log.info("getBoardingBoats"); /** PREPARE DATA **/ InputStream input = getClass().getResourceAsStream("/import/navires.csv"); ServiceBoat serviceBoat = new ServiceBoatImpl(); @@ -155,6 +156,7 @@ contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); + /** EXEC METHOD **/ BoardingResult result = service.getBoardingBoats(null, null); // one boat with one boarding (177474) assertEquals(1, result.getData().get("1").intValue()); @@ -164,4 +166,111 @@ assertEquals(174258, result.getMaxBoardingBoat().getImmatriculation()); } + /** + * Test of getBoardingBoats method, of class ServiceSynthesisImpl. + */ + @Test + public void testGetNonComplianceBoardingIndicator() throws Exception { + log.info("getNonComplianceBoardingIndicator"); + /** PREPARE DATA **/ + InputStream input = getClass().getResourceAsStream("/import/navires.csv"); + ServiceBoat serviceBoat = new ServiceBoatImpl(); + serviceBoat.importBoatCsv(input); + List<Boat> boats = serviceBoat.getBoatsByImmatriculations("174258"); + Boat boat = boats.get(0); + + List<Boat> boats2 = serviceBoat.getBoatsByImmatriculations("177474"); + Boat boat2 = boats2.get(0); + + TopiaContext transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction(); + + CompanyDAO companyDAO = SuiviObsmerModelDAOHelper.getCompanyDAO(transaction); + Company company = companyDAO.create(Company.NAME, "TARTANPION"); + Company company2 = companyDAO.create(Company.NAME, "BIS"); + + WaoUserDAO userDAO = SuiviObsmerModelDAOHelper.getWaoUserDAO(transaction); + WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche", + WaoUser.COMPANY, company); + company.addWaoUser(user); + WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray", + WaoUser.COMPANY, company2); + company2.addWaoUser(user2); + + transaction.commitTransaction(); + + input = getClass().getResourceAsStream("/import/zonesPeche.csv"); + ServiceReferential serviceReferential = new ServiceReferentialImpl(); + serviceReferential.importFishingZoneCsv(input); + + input = getClass().getResourceAsStream("/import/echantillonnage.csv"); + ServiceSampling serviceSampling = new ServiceSamplingImpl(); + serviceSampling.importSamplingPlanCsv(input); + + SampleRowDAO rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); + SampleRow row = rowDAO.findByCode("2010_0001"); + SampleRow row2 = rowDAO.findByCode("2009_0006"); + + transaction.closeContext(); + + + ServiceContact serviceContact = new ServiceContactImpl(); + // First contact : OK + Contact contact1 = new ContactImpl(); + contact1.setBoat(boat); + contact1.setObserver(user); + contact1.setSampleRow(row); + // 1 real observer over 1 + contact1.setNbObservants(1); + contact1.setState(ContactState.BOARDING_DONE.toString()); + Date begin = DateUtils.createDate(3, 3, 2009); + contact1.setTideBeginDate(begin); + contact1.setValidationCompany(Boolean.TRUE); + serviceContact.saveContact(contact1, false); + + Contact contact2 = new ContactImpl(); + contact2.setBoat(boat); + contact2.setObserver(user); + contact2.setSampleRow(row); + // 2 real observer over 1 + contact2.setNbObservants(2); + contact2.setState(ContactState.BOARDING_DONE.toString()); + begin = DateUtils.createDate(3, 3, 2009); + contact2.setTideBeginDate(begin); + contact2.setValidationCompany(Boolean.TRUE); + serviceContact.saveContact(contact2, false); + + Contact contact3 = new ContactImpl(); + contact3.setBoat(boat2); + contact3.setObserver(user2); + contact3.setSampleRow(row2); + // 1 real observer over 2 + contact3.setNbObservants(1); + contact3.setState(ContactState.BOARDING_DONE.toString()); + begin = DateUtils.createDate(3, 3, 2009); + contact3.setTideBeginDate(begin); + contact3.setValidationCompany(Boolean.TRUE); + serviceContact.saveContact(contact3, false); + + /** EXEC METHOD **/ + + // result for company TARTANPION + Map<Company, Double> results = + service.getNonComplianceBoardingIndicator(company); + + assertEquals(1, results.size()); + + // 0% of non compliance + Double value = results.get(company); + assertEquals(0., value, 0); + + // result for company BIS using admin mode (no company filtered) + results = service.getNonComplianceBoardingIndicator(null); + + assertEquals(2, results.size()); + + // 100% of non compliance + value = results.get(company2); + assertEquals(1., value, 0); + } + } \ No newline at end of file Modified: trunk/suiviobsmer-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/suiviobsmer-business/src/test/resources/import/echantillonnage.csv 2010-02-02 23:48:45 UTC (rev 317) +++ trunk/suiviobsmer-business/src/test/resources/import/echantillonnage.csv 2010-02-03 20:17:06 UTC (rev 318) @@ -7,6 +7,6 @@ "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",,"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, +"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,