a_user_with_all_assourances_can_show_the_vote

Author: lbarjak

Diff for: pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>org.rulez.demokracia</groupId>
   <artifactId>PDEngine</artifactId>
-  <version>0.0.1-feature_matrix.64f1423</version>
+  <version>0.0.1-feature_for_show_vote_the_user_needs_a_counted_assurance_40.5a79d7b</version>
   <packaging>war</packaging>
 
   <name>PDEngine</name>

Diff for: src/main/java/org/rulez/demokracia/pdengine/VoteRegistry.java

@@ -97,33 +97,48 @@ private void checkIfVotingEnabled(final Vote vote) {
 
 	@Override
 	public void modifyVote(final VoteAdminInfo voteAdminInfo, final String voteName) {
-		Vote vote = getVote(voteAdminInfo.voteId);
-		vote.checkAdminKey(voteAdminInfo.adminKey);
 		ValidationUtil.checkVoteName(voteName);
-
-		if (vote.hasIssuedBallots())
-			throw new IllegalArgumentException("The vote cannot be modified there are ballots issued.");
+		Vote vote = checkIfVoteCanBeModified(voteAdminInfo);
 
 		vote.name = voteName;
 	}
 
 	public void deleteVote(final VoteAdminInfo adminInfo) {
-		Vote vote = getVote(adminInfo.voteId);
-		vote.checkAdminKey(adminInfo.adminKey);
-
-		if (vote.hasIssuedBallots())
-			throw new IllegalArgumentException("This vote cannot be deleted it has issued ballots.");
+		Vote vote = checkIfVoteCanBeModified(adminInfo);
 
 		session.remove(vote);
 	}
 
-	public JSONObject showVote(final VoteAdminInfo adminInfo) {
+	private Vote checkIfVoteCanBeModified(final VoteAdminInfo adminInfo) {
+		Vote vote = checkAdminInfo(adminInfo);
+
+		if (vote.hasIssuedBallots())
+			throw new IllegalArgumentException("This vote cannot be modified it has issued ballots.");
+		return vote;
+	}
+
+	private Vote checkAdminInfo(final VoteAdminInfo adminInfo) {
 		Vote vote = getVote(adminInfo.voteId);
 		vote.checkAdminKey(adminInfo.adminKey);
+		return vote;
+	}
+	
+	@Override
+	public JSONObject showVote(final VoteAdminInfo adminInfo) {
+		Vote vote = checkAdminInfo(adminInfo);
+		if (!adminInfo.adminKey.equals(vote.adminKey))
+			checkAssurances(vote);
 
 		return vote.toJson(adminInfo.voteId);
 	}
 
+	private void checkAssurances(final Vote vote) throws ReportedException {
+
+		for(String assurance : vote.countedAssurances) 
+			if (!this.hasAssurance(assurance))
+				throw new ReportedException("missing assurances", assurance);
+	}
+
 	@Override
 	public String deleteChoice(final VoteAdminInfo voteAdminInfo, final String choiceId) {
 		Vote vote = getVoteIfModifiable(voteAdminInfo.voteId, voteAdminInfo.adminKey);
@@ -164,8 +179,7 @@ public void modifyChoice(final VoteAdminInfo adminInfo, final String choiceId, f
 
 	@Override
 	public void setVoteParameters(final VoteAdminInfo adminInfo, final VoteParameters voteParameters) {
-		Vote vote = getVote(adminInfo.voteId);
-		vote.checkAdminKey(adminInfo.adminKey);
+		Vote vote = checkAdminInfo(adminInfo);
 
 		if (voteParameters.minEndorsements >= 0)
 			vote.setParameters(voteParameters.minEndorsements, voteParameters.canAddin, voteParameters.canEndorse, voteParameters.canVote, voteParameters.canView);

Diff for: src/test/java/org/rulez/demokracia/pdengine/ForShowVoteTheUserNeedsACountedAssurance.java

@@ -1,22 +1,22 @@
 package org.rulez.demokracia.pdengine;
 
+import static org.junit.Assert.assertNotNull;
+
+import org.json.JSONObject;
 import org.junit.Test;
 import org.rulez.demokracia.pdengine.annotations.TestedBehaviour;
 import org.rulez.demokracia.pdengine.annotations.TestedFeature;
 import org.rulez.demokracia.pdengine.annotations.TestedOperation;
+import org.rulez.demokracia.pdengine.dataobjects.VoteAdminInfo;
 import org.rulez.demokracia.pdengine.exception.ReportedException;
 import org.rulez.demokracia.pdengine.testhelpers.CreatedDefaultVoteRegistry;
 
+@TestedFeature("Manage votes")
+@TestedOperation("show vote")
+@TestedBehaviour("if adminKey is anon, the user should have any of the countedAssurances")
 public class ForShowVoteTheUserNeedsACountedAssurance extends CreatedDefaultVoteRegistry {
-	
-	public ForShowVoteTheUserNeedsACountedAssurance() {
-		super();
-	}
 
 	@Test
-	@TestedFeature("Manage votes")
-	@TestedOperation("show vote")
-	@TestedBehaviour("if adminKey is anon, the user should have any of the countedAssurances")
 	public void a_user_with_not_all_assourances_cannot_show_the_vote() throws ReportedException {
 
 		Vote vote = getTheVote();
@@ -26,9 +26,6 @@ public void a_user_with_not_all_assourances_cannot_show_the_vote() throws Report
 	}
 
 	@Test
-	@TestedFeature("Manage votes")
-	@TestedOperation("show vote")
-	@TestedBehaviour("if adminKey is anon, the user should have any of the countedAssurances")
 	public void a_user_with_not_all_assourances_cannot_show_the_vote_even_with_more_assurances() throws ReportedException {
 
 		Vote vote = getTheVote();
@@ -37,10 +34,23 @@ public void a_user_with_not_all_assourances_cannot_show_the_vote_even_with_more_
 
 		assertAssurancesMissing(vote);
 	}
+	
+	@Test
+	public void a_user_with_all_assourances_can_show_the_vote() throws ReportedException {
+	
+		Vote vote = getTheVote();
+		vote.countedAssurances.add("magyar");
+		VoteAdminInfo aminInfo = new VoteAdminInfo(vote.id, "user");
+		JSONObject voteJson = voteManager.showVote(aminInfo);
+		
+		assertNotNull(voteJson);
+	}
 
-	private void assertAssurancesMissing(Vote vote) {
-//		assertThrows(
-//				() -> voteManager.showVote(vote.id, "user")
-//			).assertMessageIs("missing assurances");
+	private void assertAssurancesMissing(final Vote vote) {
+		VoteAdminInfo aminInfo = new VoteAdminInfo(vote.id, "user");
+		
+		assertThrows(
+				() -> voteManager.showVote(aminInfo)
+			).assertMessageIs("missing assurances");
 	}
 }

Diff for: src/test/java/org/rulez/demokracia/pdengine/VoteDeleteValidationTest.java

@@ -38,7 +38,7 @@ public void proper_voteId_and_adminKey_with_ballot_does_not_delete_vote() {
 		vote.ballots.add("TestBallot");
 		assertThrows(
 			() -> voteManager.deleteVote(new VoteAdminInfo(voteId, adminInfo.adminKey))
-		).assertMessageIs("This vote cannot be deleted it has issued ballots.");
+		).assertMessageIs("This vote cannot be modified it has issued ballots.");
 	}
 
 	@TestedBehaviour("deletes the vote with all parameters, choices, ballots and votes cast")
@@ -60,6 +60,6 @@ public void proper_voteId_and_adminKey_with_issued_ballots_does_not_delete_vote(
 
 		assertThrows(
 			() -> voteManager.deleteVote(new VoteAdminInfo(voteId, adminInfo.adminKey))
-		).assertMessageIs("This vote cannot be deleted it has issued ballots.");
+		).assertMessageIs("This vote cannot be modified it has issued ballots.");
 	}
 }

Diff for: src/test/java/org/rulez/demokracia/pdengine/VoteModificationValidationTest.java

@@ -51,6 +51,6 @@ public void modifyVote_with_ballot_get_an_exception() {
 		assertThrows(
 			() -> voteManager.modifyVote(
 					new VoteAdminInfo(voteId, adminInfo.adminKey), voteName)
-		).assertMessageIs("The vote cannot be modified there are ballots issued.");
+		).assertMessageIs("This vote cannot be modified it has issued ballots.");
 	}
 }