June 2014 - Wao-commits - mailman.cloud.codelutin.com

r2001 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/converter webapp webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 15:26:56 +0200 (Thu, 05 Jun 2014) New Revision: 2001 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2001 Log: refs #4493 a bit of layout Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java 2014-06-05 13:14:00 UTC (rev 2000) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java 2014-06-05 13:26:56 UTC (rev 2001) @@ -53,13 +53,13 @@ options +=" barWidth: 10 \n"; options +=" } \n"; options +=" },\n"; - options +=" axesDefaults: {\n"; - options +=" tickRenderer: $.jqplot.CanvasAxisTickRenderer, \n"; - options +=" tickOptions: { \n"; - options +=" angle: -90, \n"; - options +=" fontSize: '10pt' \n"; - options +=" } \n"; - options +=" },\n"; +// options +=" axesDefaults: {\n"; +// options +=" tickRenderer: $.jqplot.CanvasAxisTickRenderer, \n"; +// options +=" tickOptions: { \n"; +// options +=" angle: -90, \n"; +// options +=" fontSize: '10pt' \n"; +// options +=" } \n"; +// options +=" },\n"; options +=" axes: {\n"; options +=" xaxis: {\n"; options +=" renderer: $.jqplot.CategoryAxisRenderer, \n"; Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 13:14:00 UTC (rev 2000) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 13:26:56 UTC (rev 2001) @@ -53,7 +53,7 @@ </script> </head> - <content tag="mainClass"></content> + <content tag="mainClass">large syntheses</content> <%@include file="contacts-filter.jsp"%> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-05 13:14:00 UTC (rev 2000) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-05 13:26:56 UTC (rev 2001) @@ -783,3 +783,15 @@ main.form .form-wrapper .form-actions button.btn { float: right; } + + +/** + * Synthèse + */ + +.syntheses th, +.syntheses td { + text-align: right; + white-space: nowrap; + max-width: 50%; +}

1 0

r2000 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 15:14:00 +0200 (Thu, 05 Jun 2014) New Revision: 2000 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2000 Log: refs #4493 add data reliability Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 12:53:25 UTC (rev 1999) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 13:14:00 UTC (rev 2000) @@ -439,4 +439,18 @@ return result; } + + public Map<String, Long> getReliableObservationsCount(ContactsFilter filter) { + + HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); + + hqlAndParametersBuilder.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); + hqlAndParametersBuilder.addEquals(Contact.PROPERTY_DATA_RELIABILITY_ORDINAL, DataReliability.RELIABLE.ordinal()); + + Map<String, Long> dataReliabilitiesByCompany = countByCompany(hqlAndParametersBuilder); + + return dataReliabilitiesByCompany; + + } + } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 12:53:25 UTC (rev 1999) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 13:14:00 UTC (rev 2000) @@ -19,6 +19,10 @@ protected double dataInputDateReactivity; + protected double dataReliabilityRatio; + + private Long reliableObservationsCount; + public String getCompanyId() { return companyId; } @@ -71,4 +75,21 @@ return dataInputDateReactivity > 15.; } + public double getDataReliabilityRatio() { + Long doneObservationsCount = getContactsStatesStatistics().get(ContactState.OBSERVATION_DONE); + double ratio = 0.; + if (doneObservationsCount != null && doneObservationsCount > 0) { + double reliableObservationsCount = (double) getReliableObservationsCount(); + ratio = reliableObservationsCount / doneObservationsCount; + } + return ratio; + } + + public void setReliableObservationsCount(Long reliableObservationsCount) { + this.reliableObservationsCount = reliableObservationsCount; + } + + public Long getReliableObservationsCount() { + return reliableObservationsCount; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 12:53:25 UTC (rev 1999) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 13:14:00 UTC (rev 2000) @@ -69,6 +69,8 @@ setDataInputDateReactivity(obsMerSynthesis, filter); + setDataReliability(obsMerSynthesis, filter); + for (CompanySynthesis companySynthesis : obsMerSynthesis.getCompanySyntheses().values()) { String companyId = companySynthesis.getCompanyId(); Company company = getCompanyDao().findByTopiaId(companyId); @@ -83,6 +85,20 @@ } + protected void setDataReliability(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) { + + ContactTopiaDao dao = getContactDao(); + + Map<String, Long> reliableObservationsCount = dao.getReliableObservationsCount(filter); + + for (Map.Entry<String, Long> entry : reliableObservationsCount.entrySet()) { + String companyId = entry.getKey(); + CompanySynthesis companySynthesis = obsMerSynthesis.getCompanySynthesis(companyId); + companySynthesis.setReliableObservationsCount(reliableObservationsCount.get(companyId)); + } + + } + protected void setDataInputDateReactivity(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) { ContactTopiaDao dao = getContactDao(); @@ -111,7 +127,6 @@ } - } protected void setContactStatesStatistics(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) { Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 12:53:25 UTC (rev 1999) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 13:14:00 UTC (rev 2000) @@ -209,10 +209,36 @@ </article> <article> + <h2> <s:text name="SynthesisId.IND_DATA_RELIABILITY"/> </h2> + <table class="table"> + <thead> + <tr> + <th> + <s:text name="wao.ui.entity.Company"/> + </th> + <th> + <s:text name="wao.ui.synthesis.dataReliability.description"/> + </th> + </tr> + </thead> + <tbody> + <s:iterator value="synthesis.companySynthesesOrderedByName"> + <tr> + <td> + <s:property value="companyName"/> + </td> + <td> + <s:property value="dataReliabilityRatio * 100"/> % + </td> + </tr> + </s:iterator> + </tbody> + </table> + </article>

1 0

r1999 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 14:53:25 +0200 (Thu, 05 Jun 2014) New Revision: 1999 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1999 Log: refs #4493 add data input reactivity Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 11:57:57 UTC (rev 1998) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 12:53:25 UTC (rev 1999) @@ -21,13 +21,17 @@ * #L% */ +import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.HqlAndParametersBuilder; @@ -401,4 +405,38 @@ return contactStatesStatistics; } + public Multimap<String, Pair<Date, Date>> getContactsDoneObservationBeginDateAndDateInputDate(ContactsFilter filter) { + + HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); + + hqlAndParametersBuilder.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); + + String hql = "select c.sampleRow.company.topiaId, c.observationEndDate, c.dataInputDate " + hqlAndParametersBuilder.getHql(); + + List<Object[]> rows = findAll(hql, hqlAndParametersBuilder.getHqlParameters()); + + Multimap<String, Pair<Date, Date>> result = + Multimaps.newListMultimap( + new HashMap<String, Collection<Pair<Date, Date>>>(), + new Supplier<List<Pair<Date, Date>>>() { + @Override + public List<Pair<Date, Date>> get() { + return new LinkedList<>(); + } + } + ); + + for (Object[] row : rows) { + + String contactId = (String) row[0]; + Date observationEndDate = (Date) row[1]; + Date dataInputDate = (Date) row[2]; + + result.put(contactId, Pair.of(observationEndDate, dataInputDate)); + + } + + return result; + + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 11:57:57 UTC (rev 1998) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 12:53:25 UTC (rev 1999) @@ -17,6 +17,8 @@ protected long contactsCount; + protected double dataInputDateReactivity; + public String getCompanyId() { return companyId; } @@ -56,4 +58,17 @@ public void setContactsCount(long contactsCount) { this.contactsCount = contactsCount; } + + public void setDataInputDateReactivity(double dataInputDateReactivity) { + this.dataInputDateReactivity = dataInputDateReactivity; + } + + public double getDataInputDateReactivity() { + return dataInputDateReactivity; + } + + public boolean isDataInputDateReactivityHigh() { + return dataInputDateReactivity > 15.; + } + } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 11:57:57 UTC (rev 1998) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 12:53:25 UTC (rev 1999) @@ -1,6 +1,7 @@ package fr.ifremer.wao.services.service; import com.google.common.cache.Cache; +import com.google.common.collect.Multimap; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Boat; @@ -13,12 +14,14 @@ import fr.ifremer.wao.services.utils.BarChartData; import fr.ifremer.wao.services.utils.ChartDataAxis; import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.util.DateUtil; import java.util.Calendar; +import java.util.Collection; import java.util.Date; import java.util.HashSet; import java.util.LinkedHashMap; @@ -26,6 +29,7 @@ import java.util.Locale; import java.util.Map; import java.util.SortedMap; +import java.util.TreeMap; public class SynthesisService extends WaoServiceSupport { @@ -63,6 +67,8 @@ setContactStatesStatistics(obsMerSynthesis, filter); + setDataInputDateReactivity(obsMerSynthesis, filter); + for (CompanySynthesis companySynthesis : obsMerSynthesis.getCompanySyntheses().values()) { String companyId = companySynthesis.getCompanyId(); Company company = getCompanyDao().findByTopiaId(companyId); @@ -77,6 +83,37 @@ } + protected void setDataInputDateReactivity(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) { + + ContactTopiaDao dao = getContactDao(); + + Multimap<String, Pair<Date, Date>> contactsDoneObservationBeginDateAndDateInputDate + = dao.getContactsDoneObservationBeginDateAndDateInputDate(filter); + + for (Map.Entry<String, Collection<Pair<Date, Date>>> entry : + contactsDoneObservationBeginDateAndDateInputDate.asMap().entrySet()) { + + String companyId = entry.getKey(); + CompanySynthesis companySynthesis = obsMerSynthesis.getCompanySynthesis(companyId); + + Collection<Pair<Date, Date>> dates = entry.getValue(); + + int days = 0; + for (Pair<Date, Date> pair : dates) { + Date observationEndDate = pair.getLeft(); + Date dataInputDate = pair.getRight(); + days += DateUtil.getDifferenceInDays(observationEndDate, dataInputDate); + } + + double dataInputDateReactivity = (double) days / dates.size(); + + companySynthesis.setDataInputDateReactivity(dataInputDateReactivity); + + } + + + } + protected void setContactStatesStatistics(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) { ContactTopiaDao dao = getContactDao(); @@ -191,7 +228,7 @@ Map<Boat, LinkedHashMap<String, List<Date>>> data = dao.getBoardingBoats(filter); - Map<String, Integer> mapBoarding = new LinkedHashMap<>(); + Map<Integer, Integer> mapBoarding = new TreeMap<>(); // Prepare map which contains for each entry the number of boardings // for the key and the number of boats for the value. @@ -246,14 +283,12 @@ } // update mapBoarding - String key = String.valueOf(boardingCount); - - Integer oldValue = mapBoarding.get(key); + Integer oldValue = mapBoarding.get(boardingCount); if (oldValue == null) { oldValue = 0; } // add one more boat for "key" number of boardings - mapBoarding.put(key, oldValue + 1); + mapBoarding.put(boardingCount, oldValue + 1); if (log.isTraceEnabled()) { log.trace(boat + " made " + boardingCount + " boardings"); @@ -266,8 +301,8 @@ new BarChartData.BarChartDataSeries(); numberOfBoatsWithBoardingsBarChartDataSeries.setLabel(I18n.l(locale, "wao.ui.chart.numberOfBoatsWithBoardings")); - for (Map.Entry<String, Integer> entry : mapBoarding.entrySet()) { - numberOfBoatsWithBoardingsBarChartDataSeries.addValue(entry.getKey(), entry.getValue()); + for (Map.Entry<Integer, Integer> entry : mapBoarding.entrySet()) { + numberOfBoatsWithBoardingsBarChartDataSeries.addValue(String.valueOf(entry.getKey()), entry.getValue()); } BarChartData boardingBoatsBarChartData = Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 11:57:57 UTC (rev 1998) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 12:53:25 UTC (rev 1999) @@ -177,6 +177,35 @@ <s:text name="SynthesisId.IND_ALLEGRO_REACTIVITY"/> </h2> + <table class="table"> + <thead> + <tr> + <th> + <s:text name="wao.ui.entity.Company"/> + </th> + <th> + <s:text name="wao.ui.synthesis.allegroReactivity.title"/> + </th> + </tr> + </thead> + <tbody> + <s:iterator value="synthesis.companySynthesesOrderedByName"> + <tr> + <td> + <s:property value="companyName"/> + </td> + <td<s:if test="dataInputDateReactivityHigh"> class="lower-than-expected"</s:if>> + <s:property value="dataInputDateReactivity"/> + </td> + </tr> + </s:iterator> + </tbody> + </table> + + <p> + <s:text name="wao.ui.synthesis.allegroReactivity.description"/> + </p> + </article> <article>

1 0

r1998 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 13:57:57 +0200 (Thu, 05 Jun 2014) New Revision: 1998 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1998 Log: refs #4493 add contact state statistics percentages Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 11:46:30 UTC (rev 1997) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 11:57:57 UTC (rev 1998) @@ -331,6 +331,14 @@ return countByCompany; } + public Map<String, Long> countByCompany(ContactsFilter filter) { + + HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); + + return countByCompany(hqlAndParametersBuilder); + + } + public Map<String, Double> getComplianceBoardingIndicator(ContactsFilter filter) { HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 11:46:30 UTC (rev 1997) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 11:57:57 UTC (rev 1998) @@ -15,6 +15,8 @@ protected Map<ContactState, Long> contactsStatesStatistics; + protected long contactsCount; + public String getCompanyId() { return companyId; } @@ -46,4 +48,12 @@ public void setContactsStatesStatistics(Map<ContactState, Long> contactsStatesStatistics) { this.contactsStatesStatistics = contactsStatesStatistics; } + + public long getContactsCount() { + return contactsCount; + } + + public void setContactsCount(long contactsCount) { + this.contactsCount = contactsCount; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 11:46:30 UTC (rev 1997) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 11:57:57 UTC (rev 1998) @@ -81,11 +81,15 @@ ContactTopiaDao dao = getContactDao(); + Map<String, Long> contactsCountsByCompany = dao.countByCompany(filter); + Map<String, Map<ContactState, Long>> contactStatesStatistics = dao.getContactStatesStatistics(filter); for (Map.Entry<String, Map<ContactState, Long>> entry : contactStatesStatistics.entrySet()) { - CompanySynthesis companySynthesis = obsMerSynthesis.getCompanySynthesis(entry.getKey()); + String companyId = entry.getKey(); + CompanySynthesis companySynthesis = obsMerSynthesis.getCompanySynthesis(companyId); companySynthesis.setContactsStatesStatistics(entry.getValue()); + companySynthesis.setContactsCount(contactsCountsByCompany.get(companyId)); } } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 11:46:30 UTC (rev 1997) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 11:57:57 UTC (rev 1998) @@ -144,6 +144,9 @@ <s:text name="%{#contactState.i18nKey}"/> </th> </s:iterator> + <th> + <s:text name="wao.ui.misc.total"/> + </th> </tr> </thead> <tbody> @@ -155,8 +158,13 @@ <s:iterator value="contactsStatesStatistics"> <td> <s:property value="value"/> + <s:set name="percentage" value="%{value.doubleValue() / contactsCount * 100}" /> + (<s:property value="#percentage"/> %) </td> </s:iterator> + <td> + <s:property value="contactsCount"/> + </td> </tr> </s:iterator> </tbody>

1 0

r1997 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 13:46:30 +0200 (Thu, 05 Jun 2014) New Revision: 1997 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1997 Log: refs #4493 add contact state statistics Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 08:42:00 UTC (rev 1996) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 11:46:30 UTC (rev 1997) @@ -315,10 +315,10 @@ String hql = hqlAndParametersBuilder.getHql(); - hql = "select c.sampleRow.company.name, count(c.topiaId) " + hql + " group by c.sampleRow.company.name order by c.sampleRow.company.name"; + hql = "select c.sampleRow.company.topiaId, count(c.topiaId) " + hql + " group by c.sampleRow.company.topiaId"; if (log.isDebugEnabled()) { - log.debug("query count by company" + hql); + log.debug("query count by company '" + hql + "'"); } List<Object[]> findAll = findAll(hql, hqlAndParametersBuilder.getHqlParameters()); @@ -344,18 +344,53 @@ Map<String, Double> complianceBoardingIndicator = new LinkedHashMap<>(); for (Map.Entry<String, Long> entry : countContactsByCompany.entrySet()) { - String companyName = entry.getKey(); + String companyId = entry.getKey(); Long contactsCount = entry.getValue(); - Long contactsWithComplianceCount = countContactsWithComplianceByCompany.get(companyName); + Long contactsWithComplianceCount = countContactsWithComplianceByCompany.get(companyId); if (contactsWithComplianceCount == null) { contactsWithComplianceCount = 0l; } Double ratio = contactsWithComplianceCount.doubleValue() / contactsCount.doubleValue(); - complianceBoardingIndicator.put(companyName, ratio); + complianceBoardingIndicator.put(companyId, ratio); } return complianceBoardingIndicator; } + + public Map<String, Map<ContactState, Long>> getContactStatesStatistics(ContactsFilter filter) { + + HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); + + String hql = hqlAndParametersBuilder.getHql(); + + hql = "select c.sampleRow.company.topiaId, c.state, count(c.topiaId) " + hql + " group by c.sampleRow.company.topiaId, c.state"; + + List<Object[]> rows = findAll(hql, hqlAndParametersBuilder.getHqlParameters()); + + Map<String, Map<ContactState, Long>> contactStatesStatistics = new LinkedHashMap<>(); + + for (Object[] row : rows) { + + String companyId = (String) row[0]; + int contactStateOrdinal = (int) row[1]; + Long count = (Long) row[2]; + + Map<ContactState, Long> companyStatistics = contactStatesStatistics.get(companyId); + if (companyStatistics == null) { + companyStatistics = new TreeMap<>(); + for (ContactState aContactState : ContactState.getAllowedStates(filter.getSampleRowFilter().getObsProgram())) { + companyStatistics.put(aContactState, 0L); + } + contactStatesStatistics.put(companyId, companyStatistics); + } + + ContactState contactState = ContactState.valueOf(contactStateOrdinal); + companyStatistics.put(contactState, count); + } + + return contactStatesStatistics; + } + } Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-05 11:46:30 UTC (rev 1997) @@ -0,0 +1,49 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.ContactState; + +import java.io.Serializable; +import java.util.Map; + +public class CompanySynthesis implements Serializable { + + protected String companyId; + + protected String companyName; + + protected Double complianceBoardingIndicator; + + protected Map<ContactState, Long> contactsStatesStatistics; + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public Double getComplianceBoardingIndicator() { + return complianceBoardingIndicator; + } + + public void setComplianceBoardingIndicator(Double complianceBoardingIndicator) { + this.complianceBoardingIndicator = complianceBoardingIndicator; + } + + public Map<ContactState, Long> getContactsStatesStatistics() { + return contactsStatesStatistics; + } + + public void setContactsStatesStatistics(Map<ContactState, Long> contactsStatesStatistics) { + this.contactsStatesStatistics = contactsStatesStatistics; + } +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-06-05 08:42:00 UTC (rev 1996) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-06-05 11:46:30 UTC (rev 1997) @@ -3,8 +3,11 @@ import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.services.utils.BarChartData; +import java.util.HashMap; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import java.util.TreeMap; public class ObsMerSynthesis { @@ -22,10 +25,14 @@ protected int validBoardingsCount; - protected Map<String, Double> complianceBoardingIndicator; + protected Map<String, CompanySynthesis> companySyntheses = new HashMap<>(); protected Set<String> sampleRowIds; + public Map<String, CompanySynthesis> getCompanySyntheses() { + return companySyntheses; + } + public BarChartData getExpectedVsActualObservationsByMonthsBarChartData() { return expectedVsActualObservationsByMonthsBarChartData; } @@ -82,11 +89,13 @@ this.validBoardingsCount = validBoardingsCount; } - public void setComplianceBoardingIndicator(Map<String, Double> complianceBoardingIndicator) { - this.complianceBoardingIndicator = complianceBoardingIndicator; - } - public Map<String, Double> getComplianceBoardingIndicator() { + Map<String, Double> complianceBoardingIndicator = new TreeMap(); + for (CompanySynthesis companySynthesis : companySyntheses.values()) { + complianceBoardingIndicator.put( + companySynthesis.getCompanyName(), + companySynthesis.getComplianceBoardingIndicator()); + } return complianceBoardingIndicator; } @@ -97,4 +106,25 @@ public Set<String> getSampleRowIds() { return sampleRowIds; } + + public CompanySynthesis getCompanySynthesis(String companyId) { + CompanySynthesis companySynthesis = companySyntheses.get(companyId); + if (companySynthesis == null) { + companySynthesis = new CompanySynthesis(); + companySynthesis.setCompanyId(companyId); + companySyntheses.put(companyId, companySynthesis); + } + return companySynthesis; + } + + public Set<CompanySynthesis> getCompanySynthesesOrderedByName() { + Map<String, CompanySynthesis> companySynthesesOrderedByName = new TreeMap(); + for (CompanySynthesis companySynthesis : companySyntheses.values()) { + companySynthesesOrderedByName.put( + companySynthesis.getCompanyName(), + companySynthesis); + } + return new LinkedHashSet<>(companySynthesesOrderedByName.values()); + } + } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 08:42:00 UTC (rev 1996) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 11:46:30 UTC (rev 1997) @@ -4,6 +4,8 @@ import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.ContactTopiaDao; import fr.ifremer.wao.entity.SampleRowTopiaDao; import fr.ifremer.wao.entity.SynthesisId; @@ -59,6 +61,14 @@ setComplianceBoardingIndicator(obsMerSynthesis, filter); + setContactStatesStatistics(obsMerSynthesis, filter); + + for (CompanySynthesis companySynthesis : obsMerSynthesis.getCompanySyntheses().values()) { + String companyId = companySynthesis.getCompanyId(); + Company company = getCompanyDao().findByTopiaId(companyId); + companySynthesis.setCompanyName(company.getName()); + } + cache.put(filter, obsMerSynthesis); } @@ -67,13 +77,29 @@ } + protected void setContactStatesStatistics(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) { + + ContactTopiaDao dao = getContactDao(); + + Map<String, Map<ContactState, Long>> contactStatesStatistics = dao.getContactStatesStatistics(filter); + + for (Map.Entry<String, Map<ContactState, Long>> entry : contactStatesStatistics.entrySet()) { + CompanySynthesis companySynthesis = obsMerSynthesis.getCompanySynthesis(entry.getKey()); + companySynthesis.setContactsStatesStatistics(entry.getValue()); + } + + } + protected void setComplianceBoardingIndicator(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) { ContactTopiaDao dao = getContactDao(); Map<String, Double> complianceBoardingIndicator = dao.getComplianceBoardingIndicator(filter); - obsMerSynthesis.setComplianceBoardingIndicator(complianceBoardingIndicator); + for (Map.Entry<String, Double> entry : complianceBoardingIndicator.entrySet()) { + CompanySynthesis companySynthesis = obsMerSynthesis.getCompanySynthesis(entry.getKey()); + companySynthesis.setComplianceBoardingIndicator(entry.getValue()); + } } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 08:42:00 UTC (rev 1996) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-05 11:46:30 UTC (rev 1997) @@ -113,22 +113,19 @@ </tr> </thead> <tbody> - <s:iterator value="synthesis.complianceBoardingIndicator"> + <s:iterator value="synthesis.companySynthesesOrderedByName"> <tr> <td> - <s:property value="key"/> + <s:property value="companyName"/> </td> <td> - <s:property value="value * 100"/> % + <s:property value="complianceBoardingIndicator * 100"/> % </td> </tr> </s:iterator> </tbody> </table> - <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - </s:if> - </article> <article> @@ -136,6 +133,35 @@ <s:text name="SynthesisId.IND_CONTACT_STATE"/> </h2> + <table class="table"> + <thead> + <tr> + <th> + <s:text name="wao.ui.entity.Company"/> + </th> + <s:iterator value="synthesis.companySynthesesOrderedByName.iterator.next().contactsStatesStatistics.keySet()" var="contactState"> + <th> + <s:text name="%{#contactState.i18nKey}"/> + </th> + </s:iterator> + </tr> + </thead> + <tbody> + <s:iterator value="synthesis.companySynthesesOrderedByName"> + <tr> + <td> + <s:property value="companyName"/> + </td> + <s:iterator value="contactsStatesStatistics"> + <td> + <s:property value="value"/> + </td> + </s:iterator> + </tr> + </s:iterator> + </tbody> + </table> + </article> <article>

1 0

r1996 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/test/java/fr/ifremer/wao/services wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 10:42:00 +0200 (Thu, 05 Jun 2014) New Revision: 1996 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1996 Log: add cache for synthesis Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -33,6 +33,7 @@ import org.nuiton.topia.persistence.HqlAndParametersBuilder; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; +import org.nuiton.topia.persistence.TopiaQueryBuilderRunQueryStep; import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.PagerBeanUtil; @@ -52,8 +53,10 @@ private static final Log log = LogFactory.getLog(ContactTopiaDao.class); - public List<Contact> findAll(ContactsFilter filter, boolean sort) { + public static final String ALIAS = "c"; + public TopiaQueryBuilderRunQueryStep<Contact> forFilter(ContactsFilter filter, boolean sort) { + HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter); if (sort) { @@ -64,28 +67,17 @@ } } - List<Contact> all = findAll(query.getHql(), query.getHqlParameters()); + return forHql(query.getHql(), query.getHqlParameters()); - return all; - } - public List<Contact> find(ContactsFilter filter, TopiaPagerBean pager) { + public List<String> getSampleRowsIds(ContactsFilter filter) { HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter); - // Note: pager alrady contains the sort - List<Contact> boats = find(query.getHql(), query.getHqlParameters(), pager); - return boats; - } + List<String> sampleRowIds = findAll("select " + ALIAS + ".sampleRow.topiaId " + query.getHql(), query.getHqlParameters()); - public long count(ContactsFilter filter) { - - HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter); - - long count = count("select count(topiaId) " + query.getHql(), query.getHqlParameters()); - - return count; + return sampleRowIds; } public TopiaPagerBean newPager(ContactsFilter filter, @@ -111,7 +103,7 @@ HqlAndParametersBuilder<Contact> query = newHqlAndParametersBuilder(); - query.setAlias("c"); + query.setAlias(ALIAS); if (filter.getSampleRowFilter().isFilled()) { SampleRowTopiaDao sampleRowTopiaDao = Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -22,12 +22,14 @@ */ import com.google.common.cache.Cache; +import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.WaoTopiaPersistenceContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import fr.ifremer.wao.services.service.ObsMerSynthesis; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import java.lang.reflect.Constructor; @@ -130,4 +132,8 @@ return waoApplicationContext.getBoatsFilterValuesCache(); } + @Override + public Cache<ContactsFilter, ObsMerSynthesis> getSynthesesCache() { + return waoApplicationContext.getSynthesesCache(); + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -1,11 +1,13 @@ package fr.ifremer.wao.services; import com.google.common.cache.Cache; +import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaPersistenceContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import fr.ifremer.wao.services.service.ObsMerSynthesis; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import java.util.Date; @@ -31,10 +33,12 @@ WaoWebApplicationContext getWebApplicationContext(); + void close(); + Cache<SamplingPlanCacheKey,ObsMerSamplingPlan> getSamplingPlansCache(); Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache(); - void close(); + Cache<ContactsFilter, ObsMerSynthesis> getSynthesesCache(); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -22,11 +22,13 @@ */ import com.google.common.cache.Cache; +import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaPersistenceContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import fr.ifremer.wao.services.service.ObsMerSynthesis; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import java.util.Date; @@ -58,4 +60,5 @@ Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> getBoatsFilterValuesCache(); + Cache<ContactsFilter,ObsMerSynthesis> getSynthesesCache(); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -191,7 +191,7 @@ filter.getSampleRowFilter().setObsProgram(obsProgram); filter.getBoatFilter().setBoatIds(ImmutableSet.of(boatId)); filter.getSampleRowFilter().setCompanyIds(ImmutableSet.of(companyId)); - long contactsCount = getContactDao().count(filter); + long contactsCount = getContactDao().forFilter(filter, false).count(); Date now = serviceContext.getNow(); @@ -251,16 +251,16 @@ ContactTopiaDao dao = getContactDao(); - long contactsCount = dao.count(filter); + long contactsCount = dao.forFilter(filter, false).count(); filter.getSampleRowFilter().setCompanyIds(ImmutableSet.of(companyId)); - long contactsCompanyCount = dao.count(filter); + long contactsCompanyCount = dao.forFilter(filter, false).count(); filter.setContactStates(ImmutableSet.of(ContactState.OBSERVATION_DONE)); - long observationsCompanyCount = dao.count(filter); + long observationsCompanyCount = dao.forFilter(filter, false).count(); filter.getSampleRowFilter().setCompanyIds(null); - long observationsCount = dao.count(filter); + long observationsCount = dao.forFilter(filter, false).count(); Preconditions.checkState(contactsCompanyCount <= contactsCount); Preconditions.checkState(observationsCount <= contactsCount); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -91,7 +91,7 @@ public ContactsFilterValues getContactsFilterValues(AuthenticatedWaoUser authenticatedWaoUser, ContactsFilter filter) { ContactTopiaDao dao = getContactDao(); - List<Contact> contacts = dao.findAll(filter, false); + List<Contact> contacts = dao.forFilter(filter, false).findAll(); Optional<String> optionalCompanyId = Optional.absent(); if (authenticatedWaoUser.isCoordinatorOrObserver()) { @@ -116,7 +116,7 @@ queryPager.getPageSize(), queryPager.getPageIndex()); - List<Contact> contacts = dao.find(filter, pager); + List<Contact> contacts = dao.forFilter(filter, false).find(pager); PaginationBean paginationBean = new PaginationBean(pager, 10); @@ -228,7 +228,7 @@ public InputStream exportContacts(ContactsFilter filter) { ContactTopiaDao dao = getContactDao(); - List<Contact> contacts = dao.findAll(filter, true); + List<Contact> contacts = dao.forFilter(filter, true).findAll(); ExportModel<Contact> exportModel = ObsMerContactImportExportModel.forExport(getLocale(), filter.getSampleRowFilter().getObsProgram()); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -677,7 +677,7 @@ // on exclue les contacts invalidés par la société contactFilter.setCompanyAcceptations(Sets.newHashSet(true, null)); - Collection<Contact> contacts = getContactDao().findAll(contactFilter, false); + Collection<Contact> contacts = getContactDao().forFilter(contactFilter, false).findAll(); final double minutesPerDay = 24 * 60; // Pour calculer le temps passé, on prend pour chaque observation @@ -774,7 +774,7 @@ // on exclue les contacts invalidés par la société contactFilter.setCompanyAcceptations(Sets.newHashSet(true, null)); - Collection<Contact> contacts = getContactDao().findAll(contactFilter, false); + Collection<Contact> contacts = getContactDao().forFilter(contactFilter, false).findAll(); //---- // Recalcul des tides Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -4,6 +4,7 @@ import fr.ifremer.wao.services.utils.BarChartData; import java.util.Map; +import java.util.Set; public class ObsMerSynthesis { @@ -23,6 +24,8 @@ protected Map<String, Double> complianceBoardingIndicator; + protected Set<String> sampleRowIds; + public BarChartData getExpectedVsActualObservationsByMonthsBarChartData() { return expectedVsActualObservationsByMonthsBarChartData; } @@ -86,4 +89,12 @@ public Map<String, Double> getComplianceBoardingIndicator() { return complianceBoardingIndicator; } + + public void setSampleRowIds(Set<String> sampleRowIds) { + this.sampleRowIds = sampleRowIds; + } + + public Set<String> getSampleRowIds() { + return sampleRowIds; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -1,5 +1,6 @@ package fr.ifremer.wao.services.service; +import com.google.common.cache.Cache; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Boat; @@ -17,6 +18,7 @@ import java.util.Calendar; import java.util.Date; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; @@ -39,14 +41,28 @@ public ObsMerSynthesis getObsMerSynthesis(ContactsFilter filter) { - ObsMerSynthesis obsMerSynthesis = new ObsMerSynthesis(); + Cache<ContactsFilter, ObsMerSynthesis> cache = serviceContext.getSynthesesCache(); - setExpectedVsActualObservationsByMonthsBarChartData(obsMerSynthesis, filter); + ObsMerSynthesis obsMerSynthesis = cache.getIfPresent(filter); - setBoardingBoatsData(obsMerSynthesis, filter); + if (obsMerSynthesis == null) { - setComplianceBoardingIndicator(obsMerSynthesis, filter); + obsMerSynthesis = new ObsMerSynthesis(); + List<String> sampleRowsIds = getContactDao().getSampleRowsIds(filter); + + obsMerSynthesis.setSampleRowIds(new HashSet<>(sampleRowsIds)); + + setExpectedVsActualObservationsByMonthsBarChartData(obsMerSynthesis, filter); + + setBoardingBoatsData(obsMerSynthesis, filter); + + setComplianceBoardingIndicator(obsMerSynthesis, filter); + + cache.put(filter, obsMerSynthesis); + + } + return obsMerSynthesis; } Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -3,6 +3,7 @@ import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.WaoTopiaApplicationContext; @@ -11,6 +12,7 @@ import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.InitWaoService; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import fr.ifremer.wao.services.service.ObsMerSynthesis; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; @@ -50,6 +52,8 @@ protected Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache; + protected Cache<ContactsFilter, ObsMerSynthesis> synthesisCache; + public FakeWaoApplicationContext(String context, boolean initWithReferential) { this.context = context; this.initWithReferential = initWithReferential; @@ -254,4 +258,13 @@ } return boatsFilterValuesCache; } + + @Override + public Cache<ContactsFilter, ObsMerSynthesis> getSynthesesCache() { + if (synthesisCache == null) { + synthesisCache = CacheBuilder.newBuilder().build(); + } + return synthesisCache; + } + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -1,6 +1,7 @@ package fr.ifremer.wao.web; import com.google.common.cache.Cache; +import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ElligibleBoat; @@ -8,6 +9,7 @@ import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import fr.ifremer.wao.services.service.ObsMerSynthesis; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; @@ -34,19 +36,27 @@ protected Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache; + protected Cache<ContactsFilter, ObsMerSynthesis> synthesesCache; + protected Set<String> dirtySampleRowIds = new HashSet<>(); protected Set<String> dirtyBoatIds = new HashSet<>(); + protected Set<String> dirtyContactIds = new HashSet<>(); + protected boolean invalidateAllSampleRows = false; protected boolean invalidateAllBoats = false; + protected boolean invalidateAllContacts = false; + public CacheInvalidationTopiaEntityListener( Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> samplingPlansCache, - Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache) { + Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache, + Cache<ContactsFilter, ObsMerSynthesis> synthesesCache) { this.samplingPlansCache = samplingPlansCache; this.boatsFilterValuesCache = boatsFilterValuesCache; + this.synthesesCache = synthesesCache; } @Override @@ -63,6 +73,7 @@ Contact contact = (Contact) entity; dirtyBoatIds.add(contact.getBoat().getTopiaId()); dirtySampleRowIds.add(contact.getSampleRow().getTopiaId()); + invalidateAllContacts = true; } } @@ -76,12 +87,16 @@ TopiaEntity entity = event.getEntity(); if (entity instanceof SampleRow) { dirtySampleRowIds.add(entity.getTopiaId()); + } else if (entity instanceof ElligibleBoat) { + ElligibleBoat elligibleBoat = (ElligibleBoat) entity; + dirtyBoatIds.add(elligibleBoat.getBoat().getTopiaId()); } else if (entity instanceof Boat) { dirtyBoatIds.add(entity.getTopiaId()); } else if (entity instanceof Contact) { Contact contact = (Contact) entity; dirtyBoatIds.add(contact.getBoat().getTopiaId()); dirtySampleRowIds.add(contact.getSampleRow().getTopiaId()); + dirtyContactIds.add(contact.getTopiaId()); } } @@ -94,6 +109,7 @@ Contact contact = (Contact) entity; dirtyBoatIds.add(contact.getBoat().getTopiaId()); dirtySampleRowIds.add(contact.getSampleRow().getTopiaId()); + dirtyContactIds.add(contact.getTopiaId()); } } @@ -104,6 +120,7 @@ } if (invalidateAllSampleRows || dirtySampleRowIds.size() > 20) { samplingPlansCache.invalidateAll(); + synthesesCache.invalidateAll(); } else { Set<SamplingPlanCacheKey> samplingPlansCacheKeysToInvalidate = new HashSet<>(); for (Map.Entry<SamplingPlanCacheKey, ObsMerSamplingPlan> entry : samplingPlansCache.asMap().entrySet()) { @@ -112,6 +129,13 @@ } } samplingPlansCache.invalidateAll(samplingPlansCacheKeysToInvalidate); + Set<ContactsFilter> synthesesCacheKeysToInvalidate = new HashSet<>(); + for (Map.Entry<ContactsFilter, ObsMerSynthesis> entry : synthesesCache.asMap().entrySet()) { + if (CollectionUtils.containsAny(entry.getValue().getSampleRowIds(), dirtySampleRowIds)) { + synthesesCacheKeysToInvalidate.add(entry.getKey()); + } + } + synthesesCache.invalidateAll(synthesesCacheKeysToInvalidate); } if (invalidateAllBoats || dirtyBoatIds.size() > 20) { boatsFilterValuesCache.invalidateAll(); @@ -135,7 +159,9 @@ protected void clear() { dirtySampleRowIds.clear(); dirtyBoatIds.clear(); + dirtyContactIds.clear(); invalidateAllSampleRows = false; invalidateAllBoats = false; + invalidateAllContacts = false; } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-05 07:37:37 UTC (rev 1995) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-05 08:42:00 UTC (rev 1996) @@ -24,6 +24,7 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.opensymphony.xwork2.util.LocalizedTextUtil; +import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaApplicationContext; import fr.ifremer.wao.WaoTopiaPersistenceContext; @@ -35,6 +36,7 @@ import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; import fr.ifremer.wao.services.service.InitWaoService; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import fr.ifremer.wao.services.service.ObsMerSynthesis; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -69,6 +71,8 @@ protected Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache; + protected Cache<ContactsFilter, ObsMerSynthesis> synthesesCache; + @Override public WaoApplicationConfig getApplicationConfig() { if (applicationConfig == null) { @@ -127,6 +131,14 @@ return boatsFilterValuesCache; } + @Override + public Cache<ContactsFilter, ObsMerSynthesis> getSynthesesCache() { + if (synthesesCache == null) { + synthesesCache = newCacheBuilder(100).expireAfterAccess(30, TimeUnit.DAYS).build(); + } + return synthesesCache; + } + protected <K, V> CacheBuilder<K, V> newCacheBuilder(int expectedMaximumCacheSize) { int maximumCacheSize = applicationConfig.isCachingEnabled() ? expectedMaximumCacheSize : 0; CacheBuilder<K, V> cacheBuilder = (CacheBuilder<K, V>) CacheBuilder.newBuilder().maximumSize(maximumCacheSize); @@ -142,7 +154,10 @@ WaoTopiaPersistenceContext persistenceContext = getTopiaApplicationContext().newPersistenceContext(); CacheInvalidationTopiaEntityListener cacheInvalidationTopiaEntityListener = - new CacheInvalidationTopiaEntityListener(getSamplingPlansCache(), getBoatsFilterValuesCache()); + new CacheInvalidationTopiaEntityListener( + getSamplingPlansCache(), + getBoatsFilterValuesCache(), + getSynthesesCache()); persistenceContext.getTopiaFiresSupport().addTopiaEntityListener(cacheInvalidationTopiaEntityListener); persistenceContext.getTopiaFiresSupport().addTopiaTransactionListener(cacheInvalidationTopiaEntityListener);

1 0

r1995 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 09:37:37 +0200 (Thu, 05 Jun 2014) New Revision: 1995 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1995 Log: in migration remove obsdeb accounts Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-05 07:36:43 UTC (rev 1994) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-05 07:37:37 UTC (rev 1995) @@ -27,4 +27,6 @@ update sampleRow set company=(select topiaId from company where name='ADMIN') where company is null; +-- On ferme l'accès à ObsDeb +delete from userProfile where obsProgramOrdinal=2

1 0

r1994 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 09:36:43 +0200 (Thu, 05 Jun 2014) New Revision: 1994 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1994 Log: in migration affect sample row without company to 'admin' Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-04 14:29:43 UTC (rev 1993) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-05 07:36:43 UTC (rev 1994) @@ -22,3 +22,9 @@ -- On mesure les navires en centimètres et non plus en mètres update boat set boatlength = boatlength * 100; + +-- Une ligne sans société : on l'affecte à la société 'ADMIN' + +update sampleRow set company=(select topiaId from company where name='ADMIN') where company is null; + +

1 0

Build failed in Jenkins: wao-nightly » Wao :: Services #56
by admin+ci-codelutin.com＠codelutin.com June 4, 2014

June 4, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/56/…> Changes: [bleny] refs #4490 introduce cache for boats [bleny] fixes #4483 cache for sampling plan [bleny] refactor to allow caching ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Wao :: Services 4.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-services --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-services --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ wao-services --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ wao-services --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (parseOthersAndGen) @ wao-services --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> includes:[**/*.java] [INFO] 112 file(s) to process (among 112 files) [INFO] Parsing is done. [treated file(s) : 32/112](total time:278.65ms) ( ~ 2.488ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ wao-services --- [INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 200703ns [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services --- [INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 2/93 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ wao-services --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Scan 124 files header done in 201.017ms. [INFO] * uptodate header on 98 files. * add header on 26 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-services --- [INFO] Compiling 112 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.11:check (default) @ wao-services --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.2:generate-changes (jredmine-generate-changes) @ wao-services --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-services --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-services --- [INFO] Compiling 11 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 1

r1993 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com June 4, 2014

June 4, 2014

Author: bleny Date: 2014-06-04 16:29:43 +0200 (Wed, 04 Jun 2014) New Revision: 1993 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1993 Log: introduce CacheInvalidationTopiaEntityListener Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -31,7 +31,9 @@ import fr.ifremer.wao.entity.ShipOwner; import fr.ifremer.wao.entity.TerrestrialLocation; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; @@ -58,6 +60,8 @@ protected SortedSet<FilterOption> boats = new TreeSet<>(); + protected Set<String> boatIds = new HashSet<>(); + public BoatsFilterValues(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { super(locale); this.elligibleForSampleRowsFilterValues = new SampleRowsFilterValues(locale, obsProgram, optionalCompanyId); @@ -100,6 +104,8 @@ elligibleForSampleRowsFilterValues.addSampleRow(sampleRow); } } + + boatIds.add(boat.getTopiaId()); } public SampleRowsFilterValues getElligibleForSampleRowsFilterValues() { @@ -156,4 +162,8 @@ copyProperty(copy, propertyName); return copy; } + + public Set<String> getBoatIds() { + return boatIds; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -42,6 +42,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; public class ObsMerSamplingPlan implements Iterable<ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart>, Serializable { @@ -93,6 +94,11 @@ */ protected SampleRowsFilterValues filterValues; + /** + * Ids of all the sample rows included in this sampling plan. + */ + protected Set<String> sampleRowIds; + public ObsMerSamplingPlan(List<Date> months, Collection<ObsMerSamplingPlanFacadePart> facadeParts, Map<Date, ObsMerSamplingPlanStatistics> totalsPerMonth, @@ -100,7 +106,8 @@ Double observationTimesInDaysTotalExpected, Long observationTimesInDaysTotalReal, Long observationTimesInDaysTotalEstimated, - SampleRowsFilterValues filterValues) { + SampleRowsFilterValues filterValues, + Set<String> sampleRowIds) { this.months = months; this.facades = facadeParts; this.totalsPerMonth = totalsPerMonth; @@ -109,8 +116,13 @@ this.observationTimesInDaysTotalReal = observationTimesInDaysTotalReal; this.observationTimesInDaysTotalEstimated = observationTimesInDaysTotalEstimated; this.filterValues = filterValues; + this.sampleRowIds = sampleRowIds; } + public Set<String> getSampleRowIds() { + return sampleRowIds; + } + @Override public Iterator<ObsMerSamplingPlanFacadePart> iterator() { return facades.iterator(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -36,9 +36,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; +import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import java.util.TreeMap; /** @@ -63,6 +65,11 @@ protected SampleRowsFilterValues sampleRowsFilterValues; /** + * Ids of all the sample rows included in this sampling plan. + */ + protected Set<String> sampleRowIds; + + /** * List of month computed from the filter. */ protected List<Date> months; @@ -140,6 +147,7 @@ SampleRowsFilter sampleRowsFilter) { this.sampleRowsFilter = sampleRowsFilter; this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, ObsProgram.OBSMER, optionalCompanyId); + this.sampleRowIds = new HashSet<>(); this.facadeMap = new TreeMap<>(); this.observationTimesInDaysTotalExpected = new MutableDouble(); this.observationTimesInDaysTotalReal = new MutableLong(); @@ -191,6 +199,8 @@ sampleRowsFilterValues.addSampleRow(sampleRow); + sampleRowIds.add(sampleRow.getTopiaId()); + return this; } @@ -233,7 +243,8 @@ observationTimesInDaysTotalExpected.toDouble(), observationTimesInDaysTotalReal.toLong(), observationTimesInDaysTotalEstimated.toLong(), - sampleRowsFilterValues); + sampleRowsFilterValues, + sampleRowIds); return result; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -364,28 +364,8 @@ } commit(); - if (updateSampleRowCommand.isCreation()) { - invalidateCachesForAllSampleRows(); - } else { - invalidateCachesForSampleRow(sampleRow); - } - } - protected void invalidateCachesForAllSampleRows() { - serviceContext.getSamplingPlansCache().invalidateAll(); - } - - protected void invalidateCachesForSampleRow(SampleRow sampleRow) { - Set<SamplingPlanCacheKey> toInvalidate = new HashSet<>(); - Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> samplingPlansCache = serviceContext.getSamplingPlansCache(); - for (Map.Entry<SamplingPlanCacheKey, ObsMerSamplingPlan> entry : samplingPlansCache.asMap().entrySet()) { - entry.getValue().getFilterValues().getSampleRowCodes().contains(sampleRow.getCode()); - toInvalidate.add(entry.getKey()); - } - samplingPlansCache.invalidateAll(); - } - public SampleRow getSampleRow(String sampleRowId) { SampleRow sampleRow = getSampleRowDao().findByTopiaId(sampleRowId); @@ -407,8 +387,6 @@ commit(); - invalidateCachesForSampleRow(sampleRow); - } public List<SampleRow> getSamplingPlanRows(SampleRowsFilter sampleRowsFilter) { @@ -572,8 +550,6 @@ commit(); - invalidateCachesForAllSampleRows(); - } protected ImportModel<SampleRow> newSamplingPlanImportModel(AuthenticatedWaoUser authenticatedWaoUser) { @@ -822,8 +798,6 @@ } } - invalidateCachesForSampleRow(sampleRow); - } public List<SampleRow> getUnfinishedSampleRows(AuthenticatedWaoUser authenticatedWaoUser, String companyId) { Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -0,0 +1,141 @@ +package fr.ifremer.wao.web; + +import com.google.common.cache.Cache; +import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ElligibleBoat; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.services.service.BoatsFilterValues; +import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; +import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import fr.ifremer.wao.services.service.SamplingPlanCacheKey; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.event.TopiaEntityEvent; +import org.nuiton.topia.persistence.event.TopiaEntityListener; +import org.nuiton.topia.persistence.event.TopiaTransactionEvent; +import org.nuiton.topia.persistence.event.TopiaTransactionListener; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * Avec ce listener, on scrute ce qu'il se passe sur l'application pour invalider les caches + * qu'il faut. + */ +public class CacheInvalidationTopiaEntityListener implements TopiaEntityListener, TopiaTransactionListener { + + private static final Log log = LogFactory.getLog(CacheInvalidationTopiaEntityListener.class); + + protected Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> samplingPlansCache; + + protected Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache; + + protected Set<String> dirtySampleRowIds = new HashSet<>(); + + protected Set<String> dirtyBoatIds = new HashSet<>(); + + protected boolean invalidateAllSampleRows = false; + + protected boolean invalidateAllBoats = false; + + public CacheInvalidationTopiaEntityListener( + Cache<SamplingPlanCacheKey, ObsMerSamplingPlan> samplingPlansCache, + Cache<BoatsFilterValuesCacheKey, BoatsFilterValues> boatsFilterValuesCache) { + this.samplingPlansCache = samplingPlansCache; + this.boatsFilterValuesCache = boatsFilterValuesCache; + } + + @Override + public void create(TopiaEntityEvent event) { + TopiaEntity entity = event.getEntity(); + if (entity instanceof SampleRow) { + invalidateAllSampleRows = true; + } else if (entity instanceof ElligibleBoat) { + ElligibleBoat elligibleBoat = (ElligibleBoat) entity; + dirtyBoatIds.add(elligibleBoat.getBoat().getTopiaId()); + } else if (entity instanceof Boat) { + invalidateAllBoats = true; + } else if (entity instanceof Contact) { + Contact contact = (Contact) entity; + dirtyBoatIds.add(contact.getBoat().getTopiaId()); + dirtySampleRowIds.add(contact.getSampleRow().getTopiaId()); + } + } + + @Override + public void load(TopiaEntityEvent event) { + + } + + @Override + public void update(TopiaEntityEvent event) { + TopiaEntity entity = event.getEntity(); + if (entity instanceof SampleRow) { + dirtySampleRowIds.add(entity.getTopiaId()); + } else if (entity instanceof Boat) { + dirtyBoatIds.add(entity.getTopiaId()); + } else if (entity instanceof Contact) { + Contact contact = (Contact) entity; + dirtyBoatIds.add(contact.getBoat().getTopiaId()); + dirtySampleRowIds.add(contact.getSampleRow().getTopiaId()); + } + } + + @Override + public void delete(TopiaEntityEvent event) { + TopiaEntity entity = event.getEntity(); + if (entity instanceof SampleRow) { + samplingPlansCache.invalidateAll(); + } else if (entity instanceof Contact) { + Contact contact = (Contact) entity; + dirtyBoatIds.add(contact.getBoat().getTopiaId()); + dirtySampleRowIds.add(contact.getSampleRow().getTopiaId()); + } + } + + @Override + public void commit(TopiaTransactionEvent event) { + if (log.isTraceEnabled()) { + log.trace("will commit for entities " + event.getEntities()); + } + if (invalidateAllSampleRows || dirtySampleRowIds.size() > 20) { + samplingPlansCache.invalidateAll(); + } else { + Set<SamplingPlanCacheKey> samplingPlansCacheKeysToInvalidate = new HashSet<>(); + for (Map.Entry<SamplingPlanCacheKey, ObsMerSamplingPlan> entry : samplingPlansCache.asMap().entrySet()) { + if (CollectionUtils.containsAny(entry.getValue().getSampleRowIds(), dirtySampleRowIds)) { + samplingPlansCacheKeysToInvalidate.add(entry.getKey()); + } + } + samplingPlansCache.invalidateAll(samplingPlansCacheKeysToInvalidate); + } + if (invalidateAllBoats || dirtyBoatIds.size() > 20) { + boatsFilterValuesCache.invalidateAll(); + } else { + Set<BoatsFilterValuesCacheKey> boatsFilterValuesCacheKeysToInvalidate = new HashSet<>(); + for (Map.Entry<BoatsFilterValuesCacheKey, BoatsFilterValues> entry : boatsFilterValuesCache.asMap().entrySet()) { + if (CollectionUtils.containsAny(entry.getValue().getBoatIds(), dirtyBoatIds)) { + boatsFilterValuesCacheKeysToInvalidate.add(entry.getKey()); + } + } + boatsFilterValuesCache.invalidateAll(boatsFilterValuesCacheKeysToInvalidate); + } + clear(); + } + + @Override + public void rollback(TopiaTransactionEvent event) { + clear(); + } + + protected void clear() { + dirtySampleRowIds.clear(); + dirtyBoatIds.clear(); + invalidateAllSampleRows = false; + invalidateAllBoats = false; + } +} Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-04 08:12:57 UTC (rev 1992) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-04 14:29:43 UTC (rev 1993) @@ -141,6 +141,12 @@ WaoTopiaPersistenceContext persistenceContext = getTopiaApplicationContext().newPersistenceContext(); + CacheInvalidationTopiaEntityListener cacheInvalidationTopiaEntityListener = + new CacheInvalidationTopiaEntityListener(getSamplingPlansCache(), getBoatsFilterValuesCache()); + + persistenceContext.getTopiaFiresSupport().addTopiaEntityListener(cacheInvalidationTopiaEntityListener); + persistenceContext.getTopiaFiresSupport().addTopiaTransactionListener(cacheInvalidationTopiaEntityListener); + return persistenceContext; }

1 0