Coderabbit

Author: Sakai Developer

polls/api/src/java/org/sakaiproject/poll/repository/VoteRepository.java

@@ -9,7 +9,7 @@ public interface VoteRepository extends SpringCrudRepository<Vote, Long> {
 
     List<Vote> findByPollId(Long pollId);
 
-    List<Vote> findByPollIdAndPollOption(Long pollId, Long pollOption);
+    List<Vote> findByPollIdAndPollOption(Long pollId, Long optionId);
 
     List<Vote> findByUserId(String userId);
 

polls/impl/src/java/org/sakaiproject/poll/repository/impl/VoteRepositoryImpl.java

@@ -37,8 +37,8 @@ public List<Vote> findByPollId(Long pollId) {
     }
 
     @Override
-    public List<Vote> findByPollIdAndPollOption(Long pollId, Long pollOption) {
-        if (pollId == null || pollOption == null) {
+    public List<Vote> findByPollIdAndPollOption(Long pollId, Long optionId) {
+        if (pollId == null || optionId == null) {
             return Collections.emptyList();
         }
         CriteriaBuilder cb = sessionFactory.getCriteriaBuilder();
@@ -48,7 +48,7 @@ public List<Vote> findByPollIdAndPollOption(Long pollId, Long pollOption) {
         Join<Vote, Option> optionJoin = root.join("option");
 
         Predicate pollPredicate = cb.equal(pollJoin.get("pollId"), pollId);
-        Predicate optionPredicate = cb.equal(optionJoin.get("optionId"), pollOption);
+        Predicate optionPredicate = cb.equal(optionJoin.get("optionId"), optionId);
 
         query.select(root)
                 .where(cb.and(pollPredicate, optionPredicate));
@@ -60,7 +60,7 @@ public List<Vote> findByPollIdAndPollOption(Long pollId, Long pollOption) {
 
     @Override
     public List<Vote> findByUserId(String userId) {
-        if (userId == null) {
+        if (userId == null || userId.trim().isEmpty()) {
             return Collections.emptyList();
         }
         CriteriaBuilder cb = sessionFactory.getCriteriaBuilder();
@@ -98,7 +98,7 @@ public List<Vote> findByUserIdAndPollIds(String userId, List<Long> pollIds) {
 
     @Override
     public boolean existsByPollIdAndUserId(Long pollId, String userId) {
-        if (pollId == null || userId == null) {
+        if (pollId == null || userId == null || userId.trim().isEmpty()) {
             return false;
         }
         CriteriaBuilder cb = sessionFactory.getCriteriaBuilder();
@@ -114,9 +114,9 @@ public boolean existsByPollIdAndUserId(Long pollId, String userId) {
 
         Long count = sessionFactory.getCurrentSession()
                 .createQuery(query)
-                .uniqueResult();
+                .getSingleResult();
 
-        return count != null && count > 0;
+        return count > 0;
     }
 
     @Override
@@ -134,8 +134,8 @@ public int countDistinctSubmissionIds(Long pollId) {
 
         Long count = sessionFactory.getCurrentSession()
                 .createQuery(query)
-                .uniqueResult();
+                .getSingleResult();
 
-        return count == null ? 0 : count.intValue();
+        return Math.toIntExact(count);
     }
 }

polls/tool/src/java/org/sakaiproject/poll/tool/entityproviders/PollsEntityProvider.java

@@ -794,7 +794,7 @@ public Object getVoteEntity(EntityReference ref) {
 
 		// is this a new object?
 		if (ref.getId() == null) {
-			new Vote();
+			return new Vote();
 		}
 
 		Vote vote = getVoteById(id);

polls/tool/src/java/org/sakaiproject/poll/tool/service/PollsUiService.java

@@ -105,6 +105,9 @@ public Poll savePoll(Poll poll, Locale locale) {
 
         if (poll.getPollId() != null) {
             Poll existing = pollListManager.getPollById(poll.getPollId(), false);
+            if (existing == null) {
+                throw new PollValidationException("poll_not_found");
+            }
             if (poll.getCreationDate() == null) {
                 poll.setCreationDate(existing.getCreationDate());
             }
@@ -181,6 +184,9 @@ public Poll deleteOption(Long optionId, String orphanVoteHandling) {
         }
 
         Poll poll = pollListManager.getPollById(option.getPollId());
+        if (poll == null) {
+            throw new PollValidationException("poll_not_found");
+        }
         List<Vote> votes = pollVoteManager.getAllVotesForOption(option);
 
         if (votes != null && !votes.isEmpty()) {