Merge pull request #116 from montrealrb/make-events-location-id-required

Events: make 'location_id' a required field

app/models/event.rb

@@ -17,15 +17,12 @@ class Event < ActiveRecord::Base
 
   validates :title, presence: true
   validates :starts_at, presence: true
+  validates :location, presence: true
 
   def self.published
     order(starts_at: :desc)
   end
 
-  def location
-    super || TBALocation.new
-  end
-
   def title_with_date
     date = starts_at.strftime("%B %d")
     [title, date].join(' : ')

app/models/location.rb

@@ -3,26 +3,3 @@ class Location < ActiveRecord::Base
 
   validates :name, presence: true
 end
-
-class TBALocation
-  def name
-    'TBA'
-  end
-
-  def address
-    'TBA'
-  end
-
-  def directions
-    ''
-  end
-
-  def description
-    ''
-  end
-
-  def url
-    ''
-  end
-
-end

db/migrate/20151204174632_make_events_location_id_required.rb

@@ -0,0 +1,9 @@
+class MakeEventsLocationIdRequired < ActiveRecord::Migration
+  def up
+    change_column :events, :location_id, :integer, null: false
+  end
+
+  def down
+    change_column :events, :location_id, :integer, null: true
+  end
+end

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: 20151204172708) do
+ActiveRecord::Schema.define(version: 20151204174632) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -33,7 +33,7 @@
     t.datetime "starts_at",   null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "location_id"
+    t.integer  "location_id", null: false
   end
 
   add_index "events", ["location_id"], name: "index_events_on_location_id", using: :btree

spec/models/event_spec.rb

@@ -11,7 +11,7 @@
 
 require "rails_helper"
 
-RSpec.describe Event, :type => :model do
+RSpec.describe Event, type: :model do
 
   describe "attribute validations" do
     it "does not validate when 'starts_at' is not defined" do
@@ -20,6 +20,12 @@
       expect(event.errors.messages.keys).to include :starts_at
     end
 
+    it "does not validate when 'location_id' is not defined" do
+      event = Event.new(location_id: nil)
+      expect(event).to be_invalid
+      expect(event.errors.messages.keys).to include :location
+    end
+
     it "does not validate when 'title' is not defined" do
       event = Event.new(title: nil)
       expect(event).to be_invalid