From 1da0fe1ee2ffa6e477f4e112b520dada3a65a073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Fri, 25 Oct 2019 03:13:17 +0200
Subject: [PATCH] Apply Rails/HasAndBelongsToMany rubocop rule

We were using it everywhere except in one place.
---
 .rubocop.yml                | 3 ---
 .rubocop_basic.yml          | 3 +++
 app/models/geozones_poll.rb | 4 ++++
 app/models/poll.rb          | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 app/models/geozones_poll.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index e96c53e69..1f4d68f62 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -15,9 +15,6 @@ Performance/EndWith:
 Performance/StartWith:
   Enabled: true
 
-Rails/HasAndBelongsToMany:
-  Enabled: true
-
 Rails/HasManyOrHasOneDependent:
   Enabled: true
 
diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml
index d261ee85a..364ae1b84 100644
--- a/.rubocop_basic.yml
+++ b/.rubocop_basic.yml
@@ -206,6 +206,9 @@ Rails/FindEach:
 Rails/HttpPositionalArguments:
   Enabled: true
 
+Rails/HasAndBelongsToMany:
+  Enabled: true
+
 Rails/InverseOf:
   Enabled: true
   Exclude:
diff --git a/app/models/geozones_poll.rb b/app/models/geozones_poll.rb
new file mode 100644
index 000000000..1b45be021
--- /dev/null
+++ b/app/models/geozones_poll.rb
@@ -0,0 +1,4 @@
+class GeozonesPoll < ApplicationRecord
+  belongs_to :geozone
+  belongs_to :poll
+end
diff --git a/app/models/poll.rb b/app/models/poll.rb
index b28c17b97..8b07b8aeb 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -27,7 +27,8 @@ class Poll < ApplicationRecord
   has_many :comments, as: :commentable, inverse_of: :commentable
   has_many :ballot_sheets
 
-  has_and_belongs_to_many :geozones
+  has_many :geozones_polls
+  has_many :geozones, through: :geozones_polls
   belongs_to :author, -> { with_hidden }, class_name: "User", inverse_of: :polls
   belongs_to :related, polymorphic: true
   belongs_to :budget