Author: bleny Date: 2010-11-09 14:05:19 +0000 (Tue, 09 Nov 2010) New Revision: 755 Log: fix estimatedTides criteria on filters in service synthesis (was breaking the build) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-08 23:37:55 UTC (rev 754) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-09 14:05:19 UTC (rev 755) @@ -280,12 +280,12 @@ ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addEquals(contactProperty.validationCompany(), Boolean.TRUE); + addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); if (filter.getEstimatedTides()) { - query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + query.addNullOr(contactProperty.validationCompany(), Op.EQ, Boolean.TRUE); } else { - query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + query.addEquals(contactProperty.validationCompany(), Boolean.TRUE); } // Only for done contacts with no constraint @@ -399,12 +399,13 @@ WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact(); - TopiaQuery query = builder.applySamplingFilter(filter); + TopiaQuery query = builder.applySamplingFilter(filter). + addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); if (filter.getEstimatedTides()) { - query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + query.addNullOr(contactProperty.validationCompany(), Op.EQ, Boolean.TRUE); } else { - query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + query.addEquals(contactProperty.validationCompany(), Boolean.TRUE); } WaoQueryHelper.CompanyProperty companyProperty = @@ -471,15 +472,14 @@ ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addEquals(contactProperty.validationCompany(), Boolean.TRUE); + addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); if (filter.getEstimatedTides()) { - query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + query.addNullOr(contactProperty.validationCompany(), Op.EQ, Boolean.TRUE); } else { - query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + query.addEquals(contactProperty.validationCompany(), Boolean.TRUE); } - // Carefull with results, the company may not be present in the map : // only if there is no unfinished sampleRow or no contact done @@ -558,7 +558,7 @@ TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addEquals(contactProperty.validationCompany(), Boolean.TRUE). + addEquals(contactProperty.validationProgram(), Boolean.TRUE). // Set the results wanted : by company, by reliability, // get number of each realiability level @@ -566,9 +566,9 @@ addGroup(companyProperty.name(), contactProperty.dataReliabilityOrdinal()); if (filter.getEstimatedTides()) { - query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + query.addNullOr(contactProperty.validationCompany(), Op.EQ, Boolean.TRUE); } else { - query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + query.addEquals(contactProperty.validationCompany(), Boolean.TRUE); } if (log.isDebugEnabled()) { Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-11-08 23:37:55 UTC (rev 754) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-11-09 14:05:19 UTC (rev 755) @@ -284,7 +284,7 @@ SamplingFilter filter = new SamplingFilterImpl(); filter.setCompany(company); Map<String, Double> results = - service.getComplianceBoardingIndicator(filter); + service.getComplianceBoardingIndicator(filter); assertEquals(1, results.size()); @@ -421,6 +421,7 @@ // result for company TARTANPION with no period SamplingFilter filter = new SamplingFilterImpl(); + filter.setEstimatedTides(true); filter.setCompany(company); Collection<ContactStateStatistics> results = service.getContactStateStatistics(filter); @@ -437,6 +438,7 @@ // result for company BIS using admin mode filter = new SamplingFilterImpl(); + filter.setEstimatedTides(true); results = service.getContactStateStatistics(filter); assertEquals(2, results.size()); @@ -459,6 +461,7 @@ PeriodDates period = new PeriodDates(begin, end); filter = new SamplingFilterImpl(); + filter.setEstimatedTides(true); filter.setCompany(company2); filter.setPeriod(period); results = service.getContactStateStatistics(filter);