added database relationship topic and blog

JohnnyB00y · Jun 19, 2017 · a28d6a9 · a28d6a9
1 parent 1daf1e4
commit a28d6a9
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 6 deletions.
diff --git a/app/models/blog.rb b/app/models/blog.rb
@@ -2,4 +2,5 @@ class Blog < ApplicationRecord
   enum status: { draft: 0, published: 1 }
   extend FriendlyId
   friendly_id :title, use: :slugged
+  belongs_to :topic
 end
diff --git a/app/models/topic.rb b/app/models/topic.rb
@@ -0,0 +1,4 @@
+class Topic < ApplicationRecord
+    validates_presence_of :title
+    has_many :blogs
+end
diff --git a/app/views/blogs/index.html.erb b/app/views/blogs/index.html.erb
@@ -5,9 +5,9 @@
 <table>
   <thead>
     <tr>
-      <th>Title</th>
-      <th>Description</th>
-      <th colspan="3"></th>
+      <th>Blog Title</th>
+      <th>Body</th>
+      <th colspan="4"></th>
     </tr>
   </thead>
 
@@ -16,14 +16,15 @@
       <tr>
         <td><%= blog.title %></td>
         <td><%= blog.description %></td>
+        <td><%= link_to blog.status, toggle_status_blog_path(blog) %></td>
         <td><%= link_to 'Show', blog %></td>
         <td><%= link_to 'Edit', edit_blog_path(blog) %></td>
-        <td><%= link_to 'Destroy', blog, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to 'Delete Post', blog, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>
 </table>
 
 <br>
 
-<%= link_to 'New Blog', new_blog_path %>
+<%= link_to 'New Blog', new_blog_path %>
diff --git a/db/migrate/20170619162842_create_topics.rb b/db/migrate/20170619162842_create_topics.rb
@@ -0,0 +1,9 @@
+class CreateTopics < ActiveRecord::Migration[5.1]
+  def change
+    create_table :topics do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170619180451_add_topic_reference_to_blogs.rb b/db/migrate/20170619180451_add_topic_reference_to_blogs.rb
@@ -0,0 +1,5 @@
+class AddTopicReferenceToBlogs < ActiveRecord::Migration[5.1]
+  def change
+    add_column :blogs, :topic_references, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170619154324) do
+ActiveRecord::Schema.define(version: 20170619162842) do
 
   create_table "blogs", force: :cascade do |t|
     t.string "title"
@@ -51,4 +51,10 @@
     t.datetime "updated_at", null: false
   end
 
+  create_table "topics", force: :cascade do |t|
+    t.string "title"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
 end
diff --git a/test/fixtures/topics.yml b/test/fixtures/topics.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  title: MyString
+
+two:
+  title: MyString
diff --git a/test/models/topic_test.rb b/test/models/topic_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TopicTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end