From c8096efa7354db372f11e25f2fa8f3131bfee905 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Thu, 18 Feb 2016 17:51:24 +0100
Subject: [PATCH] adds geozone reference to users

---
 app/models/user.rb                                   | 1 +
 db/migrate/20160218164923_add_geozone_id_to_users.rb | 5 +++++
 db/schema.rb                                         | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20160218164923_add_geozone_id_to_users.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 2daa64ec2..cf96a69cf 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -22,6 +22,7 @@ class User < ActiveRecord::Base
   has_many :comments, -> { with_hidden }
   has_many :failed_census_calls
   has_many :notifications
+  belongs_to :geozone
 
   validates :username, presence: true, if: :username_required?
   validates :username, uniqueness: true, if: :username_required?
diff --git a/db/migrate/20160218164923_add_geozone_id_to_users.rb b/db/migrate/20160218164923_add_geozone_id_to_users.rb
new file mode 100644
index 000000000..162a28653
--- /dev/null
+++ b/db/migrate/20160218164923_add_geozone_id_to_users.rb
@@ -0,0 +1,5 @@
+class AddGeozoneIdToUsers < ActiveRecord::Migration
+  def change
+    add_reference :users, :geozone, index: true, foreign_key: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5b3a8831e..cfc16b44b 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: 20160217101004) do
+ActiveRecord::Schema.define(version: 20160218164923) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -408,10 +408,12 @@ ActiveRecord::Schema.define(version: 20160217101004) do
     t.boolean  "registering_with_oauth",               default: false
     t.string   "locale"
     t.string   "oauth_email"
+    t.integer  "geozone_id"
   end
 
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["geozone_id"], name: "index_users_on_geozone_id", using: :btree
   add_index "users", ["hidden_at"], name: "index_users_on_hidden_at", using: :btree
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
@@ -491,4 +493,5 @@ ActiveRecord::Schema.define(version: 20160217101004) do
   add_foreign_key "notifications", "users"
   add_foreign_key "organizations", "users"
   add_foreign_key "valuators", "users"
+  add_foreign_key "users", "geozones"
 end