Author: bleny Date: 2011-01-27 11:04:07 +0000 (Thu, 27 Jan 2011) New Revision: 956 Log: fix Boats page : user was allowed to see rows associated with the boat even those in a different program Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-01-27 11:02:57 UTC (rev 955) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-01-27 11:04:07 UTC (rev 956) @@ -170,16 +170,16 @@ * * @param transaction * @param boatImmatriculation immatriculation of the boat - * @param errorArgs + * @param errorArgs + * @param obsProgram we will return only sample rows with the given obsProgram * @param company the Company to filter the ElligibleBoats * @return an ElligibleBoatsCompany wich contains the map of ElligibleBoat, * the company and an empty list for deleted elements. * @throws TopiaException */ @Override - public CompanyBoatInfos executeGetCompanyBoatInfos(TopiaContext transaction, - List<Object> errorArgs, int boatImmatriculation, Company company) - throws TopiaException { + public CompanyBoatInfos executeGetCompanyBoatInfos(TopiaContext transaction, List<Object> errorArgs, + ObsProgram obsProgram, int boatImmatriculation, Company company) throws TopiaException { errorArgs.add(boatImmatriculation); errorArgs.add(company.getName()); @@ -221,7 +221,7 @@ String companyId = sampleRow.getCompany() != null ? sampleRow.getCompany().getTopiaId() : ""; - if (companyId.equals(company.getTopiaId())) { + if (companyId.equals(company.getTopiaId()) && sampleRow.getObsProgram().equals(obsProgram)) { elligibleBoats.put(sampleRow.getCode(), elligible); } //} @@ -229,7 +229,7 @@ // Last contact ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); - TopiaQuery query = contactDAO.createQueryLastContactForBoat(ObsProgram.OBSMER, boat, company). + TopiaQuery query = contactDAO.createQueryLastContactForBoat(obsProgram, boat, company). addLoad(Contact.PROPERTY_SAMPLE_ROW, Contact.PROPERTY_MAIN_OBSERVER); Contact contact = contactDAO.findByQuery(query); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2011-01-27 11:02:57 UTC (rev 955) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2011-01-27 11:04:07 UTC (rev 956) @@ -213,7 +213,7 @@ /** EXEC METHOD **/ - CompanyBoatInfos result = service.getCompanyBoatInfos(174592, company); + CompanyBoatInfos result = service.getCompanyBoatInfos(ObsProgram.OBSMER, 174592, company); Assert.assertNotNull(result); Assert.assertEquals(174592, result.getBoatInfos().getBoat().getImmatriculation()); Assert.assertEquals("TARTANPION", result.getCompany().getName()); @@ -301,7 +301,7 @@ contact1.setContactState(ContactState.CONTACT_START); serviceContact.saveContact(contact1, false); - CompanyBoatInfos companyBoatInfos = service.getCompanyBoatInfos(174592, company); + CompanyBoatInfos companyBoatInfos = service.getCompanyBoatInfos(ObsProgram.OBSMER, 174592, company); /** EXEC METHOD **/ BoatInfos boatInfos = companyBoatInfos.getBoatInfos(); @@ -318,7 +318,7 @@ service.createUpdateCompanyBoatInfos(companyBoatInfos); - companyBoatInfos = service.getCompanyBoatInfos(174592, company); + companyBoatInfos = service.getCompanyBoatInfos(ObsProgram.OBSMER, 174592, company); Map<String, ElligibleBoat> results = companyBoatInfos.getElligibleBoats(); Assert.assertEquals(2, results.size()); @@ -338,7 +338,7 @@ service.createUpdateCompanyBoatInfos(companyBoatInfos); - companyBoatInfos = service.getCompanyBoatInfos(174592, company); + companyBoatInfos = service.getCompanyBoatInfos(ObsProgram.OBSMER, 174592, company); results = companyBoatInfos.getElligibleBoats(); Assert.assertEquals(1, results.size()); @@ -433,11 +433,11 @@ BufferedReader reader = new BufferedReader(new FileReader(file)); try { - String line = reader.readLine(); - Assert.assertTrue(line.contains("Jean Michmuche")); - Assert.assertTrue(line.contains("TARTANPION")); - Assert.assertTrue(line.contains("TESTBOAT")); - Assert.assertTrue(line.contains("174592")); + String line = reader.readLine(); + Assert.assertTrue(line.contains("Jean Michmuche")); + Assert.assertTrue(line.contains("TARTANPION")); + Assert.assertTrue(line.contains("TESTBOAT")); + Assert.assertTrue(line.contains("174592")); } finally { reader.close(); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-01-27 11:02:57 UTC (rev 955) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-01-27 11:04:07 UTC (rev 956) @@ -628,7 +628,8 @@ public CompanyBoatInfos getCompanyBoatInfos() throws WaoException { if (companyBoatInfos == null && boatSelectedImmatriculation != null && getCompany() != null) { - companyBoatInfos = serviceBoat.getCompanyBoatInfos(boatSelectedImmatriculation, getCompany()); + companyBoatInfos = serviceBoat.getCompanyBoatInfos(user.getProfile().getObsProgram(), + boatSelectedImmatriculation, getCompany()); } return companyBoatInfos; }