branch develop updated (08e27066 -> 8b09a9c0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 08e27066 Fix "resolve" instead of "reject" in f01fcc0c53748358392ffdb658c659746d1846a2 new 8b09a9c0 Some code fix after review The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8b09a9c0ba23590e324b25e17cd9791fca547590 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Oct 21 17:30:18 2019 +0200 Some code fix after review Summary of changes: .../pollen/persistence/entity/VoteTopiaDao.java | 19 +++++-------------- .../chorem/pollen/services/service/VoteService.java | 10 +++++++--- 2 files changed, 12 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 8b09a9c0ba23590e324b25e17cd9791fca547590 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Oct 21 17:30:18 2019 +0200 Some code fix after review --- .../pollen/persistence/entity/VoteTopiaDao.java | 19 +++++-------------- .../chorem/pollen/services/service/VoteService.java | 10 +++++++--- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java index 0d5c0630..7fb9dacd 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java @@ -23,10 +23,8 @@ package org.chorem.pollen.persistence.entity; import org.nuiton.topia.persistence.HqlAndParametersBuilder; -import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.Map; public class VoteTopiaDao extends AbstractVoteTopiaDao<Vote> { @@ -60,18 +58,11 @@ public class VoteTopiaDao extends AbstractVoteTopiaDao<Vote> { Vote.PROPERTY_TOPIA_CREATE_DATE, since).findAll(); } - public List<Vote> findAllOldVotes(int age) { - - HqlAndParametersBuilder<Vote> builder = new HqlAndParametersBuilder<>(Vote.class); - - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.SECOND, -1*age); - Date twoYearsAgo = cal.getTime(); - - builder.addLowerThan(Vote.PROPERTY_TOPIA_CREATE_DATE, twoYearsAgo); - builder.addNotNull(Vote.PROPERTY_VOTER+"."+PollenPrincipal.PROPERTY_POLLEN_USER); - builder.addNotEquals(Vote.PROPERTY_VOTER+"."+PollenPrincipal.PROPERTY_POLLEN_USER+"."+PollenUser.PROPERTY_NAME, ANONYMOUS_NAME); - + public List<Vote> findAllOldVotes(Date until) { + HqlAndParametersBuilder<Vote> builder = newHqlAndParametersBuilder(); + builder.addLowerThan(Vote.PROPERTY_TOPIA_CREATE_DATE, until); + builder.addNotNull(Vote.PROPERTY_VOTER+"."+ PollenPrincipal.PROPERTY_POLLEN_USER); + builder.addNotEquals(Vote.PROPERTY_VOTER+"."+PollenPrincipal.PROPERTY_POLLEN_USER+"."+ PollenUser.PROPERTY_NAME, ANONYMOUS_NAME); List<Vote> oldVotes = findAll(builder.getHql(), builder.getHqlParameters()); return oldVotes; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index 37e28754..4b3a383d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -22,7 +22,7 @@ package org.chorem.pollen.services.service; */ import org.apache.commons.collections4.CollectionUtils; - +import org.apache.commons.lang3.time.DateUtils; import org.chorem.pollen.persistence.entity.Choice; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollType; @@ -591,8 +591,12 @@ public class VoteService extends PollenServiceSupport { VoteTopiaDao voteDao = getVoteDao(); PollenServicesConfig applicationConfig = getPollenServiceConfig(); - - List<Vote> votesToAnon = voteDao.findAllOldVotes(applicationConfig.getAnonymizeOlderVotesAge()); + + int anonymizeOlderVotesAgeSecond = applicationConfig.getAnonymizeOlderVotesAge(); + Date now = serviceContext.getNow(); + Date someTimeAgo = DateUtils.addSeconds(now, -1 * anonymizeOlderVotesAgeSecond); + + List<Vote> votesToAnon = voteDao.findAllOldVotes(someTimeAgo); List<PollenPrincipal> principalsToSave = new ArrayList<>(); List<Vote> votesToSave = new ArrayList<>(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm