Adds specs for Poll.answerable_by, fixing issue with SQL join

2017-02-02 16:41:04 +01:00
parent 15a82d0c61
commit 86d42ce094
2 changed files with 66 additions and 2 deletions
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -41,7 +41,8 @@ class Poll < ActiveRecord::Base

  def self.answerable_by(user)
    return none if user.nil? || user.unverified?
-    current.joins(:geozones).where('geozone_restricted = ? or geozones.id = ?', false, user.geozone_id)
+    current.joins('LEFT JOIN "geozones_polls" ON "geozones_polls"."poll_id" = "polls"."id"')
+           .where('geozone_restricted = ? OR geozones_polls.geozone_id = ?', false, user.geozone_id)
  end

  def votable_by?(user)