From 52d182f099b15932dca011196265abfe5175bdf4 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Tue, 3 Jan 2017 18:51:21 +0100
Subject: [PATCH] Removes geozone from budget heading

---
 app/models/budget/heading.rb                               | 1 -
 app/models/budget/investment.rb                            | 4 ++--
 ...0170103170147_remove_geozone_id_from_budget_headings.rb | 5 +++++
 db/schema.rb                                               | 7 +++----
 spec/features/budgets/investments_spec.rb                  | 6 ++----
 5 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 db/migrate/20170103170147_remove_geozone_id_from_budget_headings.rb

diff --git a/app/models/budget/heading.rb b/app/models/budget/heading.rb
index 52da63c4f..ae5dc28ee 100644
--- a/app/models/budget/heading.rb
+++ b/app/models/budget/heading.rb
@@ -1,7 +1,6 @@
 class Budget
   class Heading < ActiveRecord::Base
     belongs_to :group
-    belongs_to :geozone
 
     has_many :investments
 
diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb
index 3487e8a66..9575e7ae7 100644
--- a/app/models/budget/investment.rb
+++ b/app/models/budget/investment.rb
@@ -26,7 +26,7 @@ class Budget
     validates :heading_id, presence: true
     validates_presence_of :unfeasibility_explanation, if: :unfeasibility_explanation_required?
 
-    validates :title, length: { in: 4 .. Budget::Investment.title_max_length }
+    validates :title, length: { in: 4..Budget::Investment.title_max_length }
     validates :description, length: { maximum: Budget::Investment.description_max_length }
     validates :terms_of_service, acceptance: { allow_nil: false }, on: :create
 
@@ -53,7 +53,7 @@ class Budget
     scope :by_tag,      -> (tag_name)    { tagged_with(tag_name) }
     scope :by_valuator, -> (valuator_id) { where("budget_valuator_assignments.valuator_id = ?", valuator_id).joins(:valuator_assignments) }
 
-    scope :for_render,             -> { includes(heading: :geozone) }
+    scope :for_render,             -> { includes(:heading) }
 
     before_save :calculate_confidence_score
     before_validation :set_responsible_name
diff --git a/db/migrate/20170103170147_remove_geozone_id_from_budget_headings.rb b/db/migrate/20170103170147_remove_geozone_id_from_budget_headings.rb
new file mode 100644
index 000000000..bc8a9729c
--- /dev/null
+++ b/db/migrate/20170103170147_remove_geozone_id_from_budget_headings.rb
@@ -0,0 +1,5 @@
+class RemoveGeozoneIdFromBudgetHeadings < ActiveRecord::Migration
+  def change
+    remove_column :budget_headings, :geozone_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 98a2659dd..7ebc5f684 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170102080432) do
+ActiveRecord::Schema.define(version: 20170103170147) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -107,9 +107,8 @@ ActiveRecord::Schema.define(version: 20170102080432) do
 
   create_table "budget_headings", force: :cascade do |t|
     t.integer "group_id"
-    t.integer "geozone_id"
-    t.string  "name",       limit: 50
-    t.integer "price",      limit: 8
+    t.string  "name",     limit: 50
+    t.integer "price",    limit: 8
   end
 
   add_index "budget_headings", ["group_id"], name: "index_budget_headings_on_group_id", using: :btree
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index 097f0bd8f..39f443ce3 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -344,10 +344,8 @@ feature 'Budget Investments' do
       global_group   = create(:budget_group, budget: budget, name: 'Global Group')
       global_heading = create(:budget_heading, group: global_group, name: 'Global Heading')
 
-      carabanchel         = create(:geozone, name: "Carabanchel")
-      new_york            = create(:geozone, name: "New York")
-      carabanchel_heading = create(:budget_heading, group: group, geozone: carabanchel, name: carabanchel.name)
-      new_york_heading    = create(:budget_heading, group: group, geozone: new_york, name: new_york.name)
+      carabanchel_heading = create(:budget_heading, group: group, name: "Carabanchel")
+      new_york_heading    = create(:budget_heading, group: group, name: "New York")
 
 
       sp1 = create(:budget_investment, :selected, price:      1, heading: global_heading)