- Pollen-commits - mailman.cloud.codelutin.com

r3656 - trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:46:52 +0200 (Tue, 28 Aug 2012) New Revision: 3656 Url: http://chorem.org/repositories/revision/pollen/3656 Log: remove old packages Removed: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/anonymousPoll/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/creatorOnly/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/everybody/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/voterOnly/

1 0

r3655 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:38:58 +0200 (Tue, 28 Aug 2012) New Revision: 3655 Url: http://chorem.org/repositories/revision/pollen/3655 Log: refs #717: Restricted and authentication user (creator can vote loggued or not) fixes #795: Can not delete your own vote in anonymous poll (can modify or delete his own vote in anonymous poll) fixes #564: Cannot remove vote (can remove votes except for anonymous poll, only user can do it since creator can not see all votes) refs #746: Improve security model (weak security linked by email for the moment...) Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-08-28 16:32:07 UTC (rev 3654) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-08-28 16:38:58 UTC (rev 3655) @@ -555,7 +555,12 @@ if (StringUtils.isNotEmpty(accountId) || withUserAccount) { - if (poll.isPollFree()) { + if (poll.getCreator().getAccountId().equals(accountId)) { + + // let's use the creator account + pollAccountLoaded = poll.getCreator(); + + } else if (poll.isPollFree()) { try { pollAccountLoaded = dao.findVoterPollAccount(poll.getPollId(), @@ -1034,167 +1039,4 @@ + thumbCopied.length() + ")"); } } - - -// /** -// * Build a new Poll instance with given {@code user} as creator -// * -// * @param user Build a new Poll instance with given {@code user} as creator -// * @return Build a new Poll instance with given {@code user} as creator -// */ -// protected Poll getNewPoll(UserAccount user) { -// -// PollDAO pollDAO = getDAO(Poll.class); -// Poll result = newInstance(pollDAO); -// -// PollenConfiguration configuration = getConfiguration(); -// -// // default values from configuration -// result.setChoiceType(configuration.getDefaultChoiceType()); -// result.setVoteCountingType(configuration.getDefaultVoteCountingType()); -// result.setPollType(configuration.getDefaultPollType()); -// result.setPollVoteVisibility(configuration.getDefaultPollVoteVisibility()); -// result.setPollCommentVisibility(configuration.getDefaultPollCommentVisibility()); -// -// // Initialize creator of the poll -// PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); -// PollAccount creator = newInstance(pollAccountDAO); -// -// if (user != null) { -// -// // Link the creator with the user -// creator.setVotingId(user.getDisplayName()); -// creator.setEmail(user.getEmail()); -// creator.setUserAccount(user); -// } -// result.setCreator(creator); -// -// return result; -// } -// -// /** -// * Obtains a copy of an existing poll given his {@code pollUid}. -// * <p/> -// * If flag {@code clone} is setted to {@code true}, then all id will -// * be removed (pollId, accountId, topiaId). -// * -// * @param pollUid the {@link Poll#getPollId()} of the poll to copy -// * @param userAccount optional incoming user account to link to the -// * {@link Poll#getCreator()} -// * @param clone flag to clone or not the copy of the poll (if setted -// * to {@code true} then all id will be removed). -// * @return the copy of the poll -// * @throws PollNotFoundException if poll was not found -// */ -// protected Poll getNewPollCopy(String pollUid, -// UserAccount userAccount, -// boolean clone) throws PollNotFoundException { -// -// // pollUid can not be blank -// Preconditions.checkState(StringUtils.isNotBlank(pollUid)); -// -// // load for sure existing poll -// Poll poll = getExistingPollByPollId(pollUid); -// -// PollDAO pollDAO = getDAO(Poll.class); -// Poll result = newInstance(pollDAO); -// -// PollenBinderHelper.simpleCopy(poll, result, !clone); -// if (clone) { -// // reset id for clone case -// result.setPollId(null); -// } -// -// // -- Creator -- // -// PollAccount creatorLoaded = poll.getCreator(); -// PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); -// PollAccount creatorEditable = newInstance(pollAccountDAO); -// result.setCreator(creatorEditable); -// -// PollenBinderHelper.simpleCopy(creatorLoaded, creatorEditable, !clone); -// if (clone) { -// // reset id for clone case -// creatorEditable.setAccountId(null); -// } -// -// if (creatorEditable.getUserAccount() == null) { -// // use the incoming userAccount -// creatorEditable.setUserAccount(userAccount); -// } -// -// // -- Choice -- // -// Function<Choice, Choice> choiceCreator = -// PollenServiceFunctions.newChoiceCreator(poll.getChoiceType()); -// Iterable<Choice> choices = -// Iterables.transform(poll.getChoice(), choiceCreator); -// -// for (Choice choiceLoaded : choices) { -// if (clone) { -// // reset id for clone case -// choiceLoaded.setTopiaId(null); -// } -// result.addChoice(choiceLoaded); -// } -// -// // -- VotingList -- // -// VotingListDAO votingListDAO = getDAO(VotingList.class); -// PersonToListDAO personToListDAO = getDAO(PersonToList.class); -// for (VotingList votingListLoaded : poll.getVotingList()) { -// VotingList votingListEditable = newInstance(votingListDAO); -// result.addVotingList(votingListEditable); -// // Do not keep votingLists topiaId, to simplify the update will delete old votingLists and create new ones -// PollenBinderHelper.simpleCopy( -// votingListLoaded, votingListEditable, false); -// -// for (PersonToList personToListLoaded : votingListLoaded.getPollAccountPersonToList()) { -// PersonToList personToListEditable = newInstance(personToListDAO); -// votingListEditable.addPollAccountPersonToList(personToListEditable); -// // Do not keep personToLists topiaId, to simplify the update will delete old personToLists and create new ones -// PollenBinderHelper.simpleCopy( -// personToListLoaded, personToListEditable, false); -// -// PollAccount personLoaded = personToListLoaded.getPollAccount(); -// PollAccount personEditable = newInstance(pollAccountDAO); -// personToListEditable.setPollAccount(personEditable); -// // copy the person, keeping topiaId is useless because we have the link with PersonToList -// PollenBinderHelper.simpleCopy( -// personLoaded, personEditable, false); -// if (clone) { -// // reset id for clone case -// personEditable.setAccountId(null); -// } -// } -// } -// -// // -- PreventRule -- // -// PreventRuleDAO preventRuleDAO = getDAO(PreventRule.class); -// for (PreventRule preventRuleLoaded : poll.getPreventRule()) { -// PreventRule preventRuleEditable = newInstance(preventRuleDAO); -// PollenBinderHelper.simpleCopy( -// preventRuleLoaded, preventRuleEditable, !clone); -// result.addPreventRule(preventRuleEditable); -// } -// -// // Load votes to have the correct size used to check if vote is started -// result.setVote(poll.getVote()); -// -// return result; -// } - -// protected PollAccount copyPollAccount(PollAccount source) { -// PollAccountDAO dao = getDAO(PollAccount.class); -// PollAccount result = newInstance(dao); -// PollenBinderHelper.copy("", source, result, true); -// result.setUserAccount(source.getUserAccount()); -// return result; -// } - -// public PollAccount getNewPollAccount(UserAccount userAccount) { -// PollAccountDAO dao = getDAO(PollAccount.class); -// PollAccount result = newInstance(dao); -// String votingId = userAccount != null ? userAccount.getDisplayName() : ""; -// result.setVotingId(votingId); -// result.setUserAccount(userAccount); -// return result; -// } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-08-28 16:32:07 UTC (rev 3654) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-08-28 16:38:58 UTC (rev 3655) @@ -192,13 +192,6 @@ return false; } - if (securityContext.isWithAccountId() && - securityContext.getAccountId().equals(poll.getCreator().getAccountId())) { - - // user can not vote with his creator accountId (must use a new one) - return false; - } - if (!poll.isPollFree() && !securityContext.isRestrictedVoter()) { // on none free poll, only restricted user can vote @@ -209,28 +202,6 @@ return true; } - public boolean isCanVoteFromSummary(PollenUserSecurityContext securityContext) { - - Poll poll = securityContext.getPoll(); - - Date now = serviceContext.getCurrentTime(); - - if (!poll.isRunning(now)) { - - // poll is not running, can not vote - return false; - } - - if (!poll.isPollFree() && !securityContext.isRestrictedVoter()) { - - // on none free poll, only restricted user can vote - return false; - } - - // ok can vote - return true; - } - public boolean isCanModifyVote(PollenUserSecurityContext securityContext, String voteId) { @@ -247,12 +218,6 @@ return false; } - if (poll.isAnonymous()) { - - // poll is anonymous, no vote can be modify - return false; - } - Vote vote = poll.getVoteByTopiaId(voteId); if (vote == null) { @@ -276,6 +241,13 @@ // user conntected is the voter return true; } + + if (userConnected.getEmail().equals(votePollAccount.getEmail())) { + + //FIXME-tchemit-2012-08-28 : voir http://chorem.org/issues/796 + // owner linked by email + return true; + } } // can not modify vote in other cases @@ -329,13 +301,6 @@ return false; } - if (poll.isAnonymous()) { - - // poll is anonymous, no vote can be delete (?) FIXME Check this - return false; - } - - Vote vote = poll.getVoteByTopiaId(voteId); if (vote == null) { @@ -365,6 +330,13 @@ // owner of vote (linked by userAccount) can delete his own vote return true; } + + if (userConnected.getEmail().equals(votePollAccount.getEmail())) { + + //FIXME-tchemit-2012-08-28 : voir http://chorem.org/issues/796 + // owner linked by email + return true; + } } // can not modify vote in other cases @@ -429,7 +401,8 @@ result = Lists.newArrayList(); - if (!poll.isAnonymous() && userSecurityContext.isVoter()) { + if (userSecurityContext.isVoter() || + userSecurityContext.isRestrictedVoter()) { // but can still see his own vote @@ -453,6 +426,20 @@ break; } } + + //FIXME-tchemit-2012-08-28 : voir http://chorem.org/issues/796 + // owner linked by email + + if (result.isEmpty()) { + String userAccountEmail = userAccount.getEmail(); + for (Vote vote : allVotes) { + + if (userAccountEmail.equals(vote.getPollAccount().getEmail())) { + result.add(vote); + break; + } + } + } } } @@ -483,6 +470,7 @@ result = true; } else { + //FIXME-tchemit-2012-08-28 : voir http://chorem.org/issues/796 // try to link bo user account email result = ObjectUtils.equals(poll.getCreator().getEmail(), userAccount.getEmail()); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-08-28 16:32:07 UTC (rev 3654) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-08-28 16:38:58 UTC (rev 3655) @@ -41,43 +41,19 @@ import org.chorem.pollen.business.persistence.VoteToChoiceDAO; import org.chorem.pollen.common.PollType; import org.chorem.pollen.entities.PollenBinderHelper; -import org.chorem.pollen.entities.PollenDAOHelper; import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.PollAccountNotFound; import org.chorem.pollen.services.exceptions.VoteNotFoundException; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import java.util.List; -import java.util.Map; public class VoteService extends PollenServiceSupport { /** Logger. */ private static final Log log = LogFactory.getLog(VoteService.class); -// public Vote getNewVote(Poll poll, PollAccount account) { -// -// Preconditions.checkNotNull(poll); -// -// VoteDAO voteDAO = getDAO(Vote.class); -// VoteToChoiceDAO voteToChoiceDAO = getDAO(VoteToChoice.class); -// -// Vote result = newInstance(voteDAO); -// result.setPollAccount(account); -// result.setWeight(1.); -// -// // Prepare the List of VoteToChoice with Poll's choices -// for (Choice choice : poll.getChoice()) { -// VoteToChoice element = newInstance(voteToChoiceDAO); -// element.setChoice(choice); -// result.addChoiceVoteToChoice(element); -// } -// -// return result; -// } - public Vote getVoteEditable(Poll poll, PollAccount accountEditable) { Preconditions.checkNotNull(poll); @@ -143,11 +119,17 @@ } // Retrieve weight for Restricted Poll with existing account - if (!poll.isPollFree()&& accountEditable.getTopiaId() != null) { + if (!poll.isPollFree() && accountEditable.getTopiaId() != null) { PersonToListDAO personToListDAO = getDAO(PersonToList.class); PersonToList personToList = personToListDAO.findByPollAndAccount(poll, accountEditable); result.setWeight(personToList.getWeight()); } + + if (poll.isAnonymous()) { + + // force anonymous flag on vote + result.setAnonymous(true); + } return result; } @@ -157,8 +139,10 @@ Vote result = create(voteDAO); result.setWeight(vote.getWeight()); - result.setAnonymous(vote.isAnonymous()); + // make sure vote is anonymous if poll is + result.setAnonymous(vote.isAnonymous() || poll.isAnonymous()); + // -- PollAccount -- // PollAccount pollAccount = vote.getPollAccount(); String pollAccountId = pollAccount.getTopiaId(); @@ -176,20 +160,17 @@ pollAccountLoaded = getEntityById(PollAccount.class, pollAccountId); } - // Update user data if not anonymous - if (!vote.isAnonymous()) { + // Update user data - pollAccountLoaded.setVotingId(pollAccount.getVotingId()); - pollAccountLoaded.setEmail(pollAccount.getEmail()); + pollAccountLoaded.setVotingId(pollAccount.getVotingId()); + pollAccountLoaded.setEmail(pollAccount.getEmail()); - UserAccount userAccount = pollAccount.getUserAccount(); - if (userAccount != null) { - UserAccount userAccountLoaded = - getEntityById(UserAccount.class, userAccount.getTopiaId()); - pollAccountLoaded.setUserAccount(userAccountLoaded); - } + UserAccount userAccount = pollAccount.getUserAccount(); + if (userAccount != null) { + UserAccount userAccountLoaded = + getEntityById(UserAccount.class, userAccount.getTopiaId()); + pollAccountLoaded.setUserAccount(userAccountLoaded); } - // TODO Manage anonymous for existing account ??? problem with restricted and email result.setPollAccount(pollAccountLoaded); // -- List of VoteToChoice -- // @@ -245,17 +226,12 @@ // -- PollAccount -- // PollAccount voteAccount = vote.getPollAccount(); PollAccount pollAccountEntity = result.getPollAccount(); - if (vote.isAnonymous()) { - pollAccountEntity.setVotingId(null); - pollAccountEntity.setEmail(null); - pollAccountEntity.setUserAccount(null); + pollAccountEntity.setVotingId(voteAccount.getVotingId()); + pollAccountEntity.setEmail(voteAccount.getEmail()); + pollAccountEntity.setUserAccount(voteAccount.getUserAccount()); - } else { - pollAccountEntity.setVotingId(voteAccount.getVotingId()); - pollAccountEntity.setEmail(voteAccount.getEmail()); - pollAccountEntity.setUserAccount(voteAccount.getUserAccount()); - } - result.setAnonymous(vote.isAnonymous()); + // make sure vote is anonymous if poll is + result.setAnonymous(vote.isAnonymous() || poll.isAnonymous()); VoteToChoiceDAO voteToChoiceDao = getDAO(VoteToChoice.class); @@ -334,14 +310,16 @@ if (poll.isPollFree()) { - // Delete vote PollAccount if the Poll is free and account is not the creator if (!voteAccount.equals(poll.getCreator())) { + + // Delete vote PollAccount if the Poll is free and account is not the creator PollAccountDAO accountDAO = getDAO(PollAccount.class); delete(accountDAO, voteAccount); } - // Update pollAccount hasVoted flag } else { + + // Update pollAccount hasVoted flag PersonToList personToList = poll.getPersonToListByVote(entityToDelete); personToList.setHasVoted(false); } @@ -398,35 +376,6 @@ } } - public List<Vote> selectVotes(Map<String, Object> properties) { - TopiaContext transaction = getTransaction(); - try { - VoteDAO voteDAO = PollenDAOHelper.getVoteDAO(transaction); - - List<Vote> voteEntities; - - if (properties == null) { - voteEntities = voteDAO.findAll(); - if (log.isWarnEnabled()) { - log.warn("Attention : tous les votes ont été sélectionnés !"); - } - } else { - voteEntities = voteDAO.findAllByProperties(properties); - } - - List<Vote> results = Lists.newArrayList(voteEntities); - - if (log.isDebugEnabled()) { - log.debug("Entities found: " - + ((results == null) ? "null" : results.size())); - } - - return results; - } catch (Exception e) { - throw new PollenTechnicalException("Could not obtain votes", e); - } - } - protected VoteToChoice createVoteToChoice(Vote vote, VoteToChoice source) { VoteToChoiceDAO voteToChoiceDao = getDAO(VoteToChoice.class);

1 0

r3654 - trunk/pollen-services/src/main/java/org/chorem/pollen/bean
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:32:07 +0200 (Tue, 28 Aug 2012) New Revision: 3654 Url: http://chorem.org/repositories/revision/pollen/3654 Log: add equals and hashcode method on PollUri Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-08-28 16:31:46 UTC (rev 3653) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-08-28 16:32:07 UTC (rev 3654) @@ -104,4 +104,24 @@ public String toString() { return getUri(); } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof PollUri)) { + return false; + } + + PollUri pollUri = (PollUri) o; + return getUri().equals(pollUri.getUri()); + + } + + @Override + public int hashCode() { + int result = getUri().hashCode(); + return result; + } }

1 0

r3653 - in trunk/pollen-persistence/src: main/java/org/chorem/pollen/business/persistence test/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:31:46 +0200 (Tue, 28 Aug 2012) New Revision: 3653 Url: http://chorem.org/repositories/revision/pollen/3653 Log: avoid logic in DAO, poll anonymous must not be used to obtain votes from db... Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-08-28 16:30:53 UTC (rev 3652) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-08-28 16:31:46 UTC (rev 3653) @@ -23,7 +23,6 @@ package org.chorem.pollen.business.persistence; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -34,22 +33,15 @@ public List<E> findAllVotes(Poll poll) throws TopiaException { Preconditions.checkNotNull(poll); - List<E> results; - // No need to load votes for an anonymous poll - if (poll.isAnonymous()) { + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + + "p = :p AND " + + "e IN ELEMENTS(p.vote) " + + "ORDER BY e.topiaCreateDate DESC"; - results = Lists.newArrayList(); - } else { + List<E> result = findAllByQuery(hql, "p", poll); - String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + - "p = :p AND " + - "e IN ELEMENTS(p.vote) " + - "ORDER BY e.topiaCreateDate DESC"; - - results = findAllByQuery(hql, "p", poll); - } - return results; + return result; } public List<E> findAllVotesByPoll(Poll poll, @@ -58,28 +50,19 @@ Preconditions.checkNotNull(poll); Preconditions.checkNotNull(pager); - List<E> results; + String countHql = "SELECT COUNT(e) FROM " + + "VoteImpl e, PollImpl p WHERE " + + "p = :p AND e IN ELEMENTS(p.vote)"; - // No need to load votes for an anonymous poll - if (poll.isAnonymous()) { + computeAndAddRecordsToPager(countHql, pager, "p", poll); - results = Lists.newArrayList(); - } else { + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + + "p = :p AND " + + "e IN ELEMENTS(p.vote) " + + "ORDER BY e.topiaCreateDate DESC"; - String countHql = "SELECT COUNT(e) FROM " + - "VoteImpl e, PollImpl p WHERE " + - "p = :p AND e IN ELEMENTS(p.vote)"; - - computeAndAddRecordsToPager(countHql, pager, "p", poll); - - String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + - "p = :p AND " + - "e IN ELEMENTS(p.vote) " + - "ORDER BY e.topiaCreateDate DESC"; - - results = findAllByQueryAndPager(hql, pager, "p", poll); - } - return results; + List<E> result = findAllByQueryAndPager(hql, pager, "p", poll); + return result; } public boolean hasAlreadyVoted(Poll poll, String votingId) throws TopiaException { Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-08-28 16:30:53 UTC (rev 3652) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-08-28 16:31:46 UTC (rev 3653) @@ -49,7 +49,8 @@ Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2", - Poll.PROPERTY_POLL_VOTE_VISIBILITY, PollVoteVisibility.NOBODY); + Poll.PROPERTY_POLL_VOTE_VISIBILITY, + PollVoteVisibility.NOBODY); Vote vote1 = voteDAO.create(); vote1.setTopiaCreateDate(DateUtil.createDate(0, 0, 0, 1, 1, 2010)); @@ -76,7 +77,8 @@ actual = voteDAO.findAllVotes(poll2); Assert.assertNotNull(actual); - Assert.assertTrue(actual.isEmpty()); + Assert.assertEquals(1, actual.size()); + Assert.assertEquals(vote3, actual.get(0)); } @Test @@ -89,7 +91,8 @@ Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2", - Poll.PROPERTY_POLL_VOTE_VISIBILITY, PollVoteVisibility.NOBODY); + Poll.PROPERTY_POLL_VOTE_VISIBILITY, + PollVoteVisibility.NOBODY); Vote vote1 = voteDAO.create(); vote1.setTopiaCreateDate(DateUtil.createDate(0, 0, 0, 1, 1, 2010)); @@ -120,7 +123,8 @@ actual = voteDAO.findAllVotesByPoll(poll2, pager); Assert.assertNotNull(actual); - Assert.assertTrue(actual.isEmpty()); + Assert.assertEquals(1, actual.size()); + Assert.assertEquals(vote3, actual.get(0)); } @Test @@ -134,7 +138,8 @@ Poll poll1 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId1"); Poll poll2 = pollDAO.create(Poll.PROPERTY_POLL_ID, "pollId2", - Poll.PROPERTY_POLL_VOTE_VISIBILITY, PollVoteVisibility.NOBODY); + Poll.PROPERTY_POLL_VOTE_VISIBILITY, + PollVoteVisibility.NOBODY); String votingId1 = "votingId1"; String votingId2 = "votingId2";

1 0

r3652 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:30:53 +0200 (Tue, 28 Aug 2012) New Revision: 3652 Url: http://chorem.org/repositories/revision/pollen/3652 Log: creator can now vote as a normal user + change log levels and comment dummy code Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-08-28 16:29:38 UTC (rev 3651) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-08-28 16:30:53 UTC (rev 3652) @@ -294,6 +294,8 @@ getUserSecurityContext().isAdmin(); } + //FIXME-tchemit-2012-08-27, why ? in none free poll can not see votingId ? + //FIXME-tchemit-2012-08-27 ...hum weird, just in anonymous vote (method will be removed after check...) public boolean isAccountFieldDisplayed() { return !poll.isAnonymous() || isRestrictedPoll() || isGroupPoll(); } @@ -469,17 +471,17 @@ feedFileExisting = getPollFeedService().isFeedExists(poll); - if (log.isInfoEnabled()) { + if (log.isDebugEnabled()) { Date now = serviceContext.getCurrentTime(); - log.info("pollChoiceOrVoteStarted = " + isPollChoiceOrVoteStarted()); - log.info("pollChoiceRunning = " + isPollChoiceRunning()); - log.info("pollRunning = " + poll.isRunning(now)); - log.info("accountFieldDisplayed = " + isAccountFieldDisplayed()); - log.info("creatorOrAdminUser = " + isCreatorOrAdmin()); - log.info("isVoteAllowed = " + isVoteAllowed()); - log.info("isCommentAllowed = " + isCommentAllowed()); - log.info("isResultAllowed = " + isResultAllowed()); - log.info("pollVoteVisibility = " + poll.getPollVoteVisibility()); + log.debug("pollChoiceOrVoteStarted = " + isPollChoiceOrVoteStarted()); + log.debug("pollChoiceRunning = " + isPollChoiceRunning()); + log.debug("pollRunning = " + poll.isRunning(now)); +// log.info("accountFieldDisplayed = " + isAccountFieldDisplayed()); + log.debug("creatorOrAdminUser = " + isCreatorOrAdmin()); + log.debug("isVoteAllowed = " + isVoteAllowed()); + log.debug("isCommentAllowed = " + isCommentAllowed()); + log.debug("isResultAllowed = " + isResultAllowed()); + log.debug("pollVoteVisibility = " + poll.getPollVoteVisibility()); } return INPUT; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-08-28 16:29:38 UTC (rev 3651) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-08-28 16:30:53 UTC (rev 3652) @@ -27,7 +27,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.PollenUserSecurityContext; import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; @@ -64,8 +63,6 @@ // Messages Poll poll = getPoll(); - PollenUserSecurityContext securityContext = getUserSecurityContext(); - if (poll.isClosed()) { addFlashWarning(_("pollen.information.pollClosed")); } else if (!isPollStarted()) { @@ -74,18 +71,7 @@ addFlashWarning(_("pollen.information.pollFinished")); } else if (!isVoteAllowed()) { - // check crator does not try to vote with his creator id - if (securityContext.isCreator() && securityContext.isWithAccountId()) { - - if (poll.getCreator().getAccountId().equals(securityContext.getAccountId())) { - - // only participant can see votes - addFlashWarning(_("pollen.information.canNotvotewithCreatorAccountId")); - } - } else { - addFlashWarning(_("pollen.information.pollCanNotVote")); - } } if (isPollChoiceRunning()) { @@ -240,7 +226,7 @@ } else { - // there is a aacountId in url, just inform vote is saved + // there is a accountId in url, just inform vote is saved addFlashMessage(_("pollen.information.vote.created")); }

1 0

r3651 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:29:38 +0200 (Tue, 28 Aug 2012) New Revision: 3651 Url: http://chorem.org/repositories/revision/pollen/3651 Log: forbid to change email after account is created Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-08-28 16:29:02 UTC (rev 3650) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-08-28 16:29:38 UTC (rev 3651) @@ -99,12 +99,15 @@ } } - if (StringUtils.isBlank(pollenUserAccount.getEmail())) { - addFieldError("pollenUserAccount.email", - _("pollen.error.email.required")); - } else if (!StringUtil.isEmail(pollenUserAccount.getEmail())) { - addFieldError("pollenUserAccount.email", - _("pollen.error.email.invalid")); + // can only change email (for the moment at create time not after) + if (!isExists()) { + if (StringUtils.isBlank(pollenUserAccount.getEmail())) { + addFieldError("pollenUserAccount.email", + _("pollen.error.email.required")); + } else if (!StringUtil.isEmail(pollenUserAccount.getEmail())) { + addFieldError("pollenUserAccount.email", + _("pollen.error.email.invalid")); + } } }

1 0

r3650 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:29:02 +0200 (Tue, 28 Aug 2012) New Revision: 3650 Url: http://chorem.org/repositories/revision/pollen/3650 Log: remove all logic code from jsp :( Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-08-28 16:28:18 UTC (rev 3649) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-08-28 16:29:02 UTC (rev 3650) @@ -177,20 +177,20 @@ <s:form id="voteForm" validate="true"> <s:hidden key="pollUri" label=''/> -<s:if test="poll.anonymous"> - <s:hidden key="vote.anonymous" label="" value='true'/> -</s:if> +<%--<s:if test="poll.anonymous">--%> + <%--<s:hidden key="vote.anonymous" label="" value='true'/>--%> +<%--</s:if>--%> <table id="poll"> <thead> <tr> - <s:if test="accountFieldDisplayed"> + <%--<s:if test="accountFieldDisplayed">--%> <th style="width:200px;"> <s:text name="pollen.common.voterName"/> </th> - </s:if> - <s:else> - <th></th> - </s:else> + <%--</s:if>--%> + <%--<s:else>--%> + <%--<th></th>--%> + <%--</s:else>--%> <s:if test="textType"> <s:iterator value="poll.choice" var="choice"> <s:if test="!isChoiceHidden(#choice)"> @@ -285,14 +285,14 @@ <s:if test="voteAllowed"> <tfoot> <tr> - <s:if test="accountFieldDisplayed"> + <s:if test="vote.anonymous"> + <th>?</th> + </s:if> + <s:else> <th id="voterName"> <s:textfield key='pollAccount.votingId' required="true" label='' value="%{pollAccount.votingId}" theme="simple"/> </th> - </s:if> - <s:else> - <th></th> </s:else> <s:set name="template" value="%{choiceFragment}"/> <s:iterator value="poll.choice" var="choice" status="status"> @@ -307,18 +307,18 @@ </tfoot> </s:if> <tbody> -<s:if test="!poll.anonymous"> +<%--s:if test="!poll.anonymous"--%> <s:iterator value="votes" var="vote"> <tr id='vote_<s:property value="%{#vote.pollAccount.accountId}"/>'> <td> - <s:if test="accountFieldDisplayed"> - <s:if test="!#vote.anonymous"> - <s:property value="pollAccount.votingId"/> + <%--<s:if test="accountFieldDisplayed">--%> + <s:if test="vote.anonymous"> + ? </s:if> <s:else> - ? + <s:property value="pollAccount.votingId"/> </s:else> - </s:if> + <%--</s:if>--%> <s:if test="isModifyVoteAllowed(#vote)"> <s:a action="votefor/%{poll.pollId}:%{#vote.pollAccount.accountId}" namespace="/poll" id='modifyVote_%{#vote.pollAccount.accountId}'> @@ -341,10 +341,10 @@ <s:if test="!isChoiceHidden(#choice)"> <s:set name="currentVoteChoice" value="%{#vote.getChoiceVoteToChoice(#choice)}"/> - <s:if test="poll.anonymous"> + <%--s:if test="poll.anonymous"> <td class="anonymous">?</td> </s:if> - <s:else> + <s:else--%> <s:if test="isChoiceInVote(#currentVoteChoice)"> <td class="voted"> <s:property value="%{getChoiceValue(#currentVoteChoice)}"/> @@ -353,12 +353,12 @@ <s:else> <td class="notVoted"></td> </s:else> - </s:else> + <%--</s:else>--%> </s:if> </s:iterator> </tr> </s:iterator> -</s:if> +<%--</s:if>--%> <s:if test="resultAllowed"> <tr> <td>

1 0

r3649 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:28:18 +0200 (Tue, 28 Aug 2012) New Revision: 3649 Url: http://chorem.org/repositories/revision/pollen/3649 Log: creator is now a normal user... Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java 2012-08-28 16:28:01 UTC (rev 3648) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java 2012-08-28 16:28:18 UTC (rev 3649) @@ -53,6 +53,17 @@ // can removed accountId only for free poll //FIXME Should found out in ohter case the accountId (if exists for the connected id) if no accountId is given getUserSecurityContext().removeAccountIdWhenConnected(url); + } else { + if (getUserSecurityContext().isRestrictedVoter()) { + + // special case : creator and restricted user (same account still used! find out why) + // anyway must add the creatorId + if (!getUserSecurityContext().isConnected()) { + + // add the accountId + url.getPollUri().setAccountId(getUserSecurityContext().getAccountId()); + } + } } return url.getUrl(); } @@ -112,7 +123,7 @@ } public boolean isCanVote() { - return getSecurityService().isCanVoteFromSummary(getUserSecurityContext()); + return getSecurityService().isCanVote(getUserSecurityContext()); } @Override

1 0

r3648 - trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:28:01 +0200 (Tue, 28 Aug 2012) New Revision: 3648 Url: http://chorem.org/repositories/revision/pollen/3648 Log: improve tests constructor Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java 2012-08-28 16:26:50 UTC (rev 3647) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java 2012-08-28 16:28:01 UTC (rev 3648) @@ -47,13 +47,12 @@ protected final PollUri creatorUri; protected AbstractPollIT(Class<? extends WebDriver> driverType, - String pollId, String creatorId) { + String pollIdAccountId) { super(driverType); - this.pollId = pollId; - this.creatorId = creatorId; - + creatorUri = PollUri.newPollUri(pollIdAccountId); + this.pollId = creatorUri.getPollId(); + this.creatorId = creatorUri.getAccountId(); pollUri = PollUri.newPollUri(pollId); - creatorUri = PollUri.newPollUri(pollId, creatorId); } protected PollUri newPollUri(String accountId) {

1 0

r3647 - trunk/pollen-ui-struts2/src/it/pollen-ui-it
by tchemit＠users.chorem.org Aug. 28, 2012

Aug. 28, 2012

Author: tchemit Date: 2012-08-28 18:26:50 +0200 (Tue, 28 Aug 2012) New Revision: 3647 Url: http://chorem.org/repositories/revision/pollen/3647 Log: add jetty:runner to avoid classpath missunderstanding :( Modified: trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml Modified: trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml 2012-08-28 16:26:00 UTC (rev 3646) +++ trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml 2012-08-28 16:26:50 UTC (rev 3647) @@ -62,6 +62,11 @@ </dependency> <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency>

1 0