Changes total comments query and partials names

Now instead of making a query to get total comments, comments are preloaded on the stories
and display with length. Changes plural partials names to singular.

Author: elixirprogrammer

web/controllers/story_controller.ex

@@ -11,7 +11,7 @@ defmodule Fmylife.StoryController do
     {stories, kerosene} =
     Story
     |> order_by(desc: :id)
-    |> preload(:user)
+    |> preload([:user, :comments])
     |> Repo.paginate(params)
 
     render(conn, :index,

web/models/comment.ex

@@ -18,11 +18,4 @@ defmodule Fmylife.Comment do
     |> validate_required([:body])
   end
 
-  def count(story_id) do
-    hd Fmylife.Repo.all(
-      from c in Fmylife.Comment,
-      select: count(c.id),
-      where: [story_id: ^story_id]
-    )
-  end
 end

web/models/story.ex

@@ -30,7 +30,7 @@ defmodule Fmylife.Story do
       group_by: s.id,
       select: s,
       limit: 10,
-      preload: [:user]
+      preload: [:user, :comments]
     )
   end
 
@@ -39,22 +39,22 @@ defmodule Fmylife.Story do
       from s in Story,
       order_by: [desc: fragment("Random()")],
       limit: 10,
-      preload: [:user]
+      preload: [:user, :comments]
     )
   end
 
   def stories_of_category(category_id, params) do
     Story
     |> order_by(desc: :id)
     |> where(category_id: ^category_id)
-    |> preload(:user)
+    |> preload([:user, :comments])
     |> Repo.paginate(params)
   end
 
   def search(search_params, params) do
     from(s in Story,
     where: ilike(s.body, ^"%#{search_params}%"),
-    preload: [:user])
+    preload: [:user, :comments])
     |> Repo.paginate(params)
   end
 

web/templates/layout/_header.html.eex

@@ -36,14 +36,6 @@
             </li>
           <% end %>
         </ul>
-        <!-- <form class="navbar-form navbar-left" role="search">
-          <div class="input-group">
-            <input type="text" class="form-control" placeholder="Search for...">
-            <span class="input-group-btn">
-              <button class="btn btn-default" type="button">Search</button>
-            </span>
-          </div>
-        </form> -->
         <%= render Fmylife.StoryView, "_search_form.html", conn: @conn %>
         <ul class="nav navbar-nav navbar-right">
           <%= if @current_user do %>

web/templates/story/_categories.html.eex renamed to web/templates/story/_category.html.eex

@@ -20,6 +20,6 @@
   <span id="total-dislikes-<%= @story.id %>" class="text-warning">
     (<%= Fmylife.Like.total_dislikes(@story.id) %>)
   </span>
-  <%= link "Comments", to: story_path(@conn, :show, @story), class: "btn btn-link btn-xs" %></a><small><em> (<%= Fmylife.Comment.count(@story.id) %>)</em></small>
+  <%= link "Comments", to: story_path(@conn, :show, @story), class: "btn btn-link btn-xs" %><small><em>(<%= length(@story.comments) %>)</em></small>
   <div class="text-muted pull-right"><small>Created by: <%= @story.user.name %>&nbsp;<%= time_ago_in_words(@story.inserted_at) %></small></div>
 </div><!-- /.well -->

web/templates/story/_stories.html.eex renamed to web/templates/story/_story.html.eex

@@ -1,15 +1,15 @@
 <div class="container">
   <div class="row">
     <div class="col-md-8">
-      <%= render_many @stories, StoryView, "_stories.html", conn: @conn, current_user: @current_user %>
+      <%= render_many @stories, StoryView, "_story.html", conn: @conn, current_user: @current_user %>
 
       <%= paginate @conn, @kerosene, class: "pull-right" %>
     </div><!-- /.col-md-8 -->
     <div class="col-md-4 col-sm-12">
       <div class="panel panel-default">
         <div class="panel-heading text-center">Categories</div>
         <ul class="list-group">
-          <%= render_many @categories, StoryView, "_categories.html", as: :category, conn: @conn %>
+          <%= render_many @categories, StoryView, "_category.html", as: :category, conn: @conn %>
         </ul>
       </div><!-- /.panel panel-default -->
     </div><!-- /.col-md-4 col-sm-12 -->

web/templates/story/categories.html.eex

@@ -1,15 +1,15 @@
 <div class="container">
   <div class="row">
     <div class="col-md-8">
-      <%= render_many @stories, StoryView, "_stories.html", conn: @conn, current_user: @current_user %>
+      <%= render_many @stories, StoryView, "_story.html", conn: @conn, current_user: @current_user %>
 
       <%= paginate @conn, @kerosene, class: "pull-right" %>
     </div><!-- /.col-md-8 -->
     <div class="col-md-4 col-sm-12">
       <div class="panel panel-default">
         <div class="panel-heading text-center">Categories</div>
         <ul class="list-group">
-          <%= render_many @categories, StoryView, "_categories.html", as: :category, conn: @conn %>
+          <%= render_many @categories, StoryView, "_category.html", as: :category, conn: @conn %>
         </ul>
       </div><!-- /.panel panel-default -->
     </div><!-- /.col-md-4 col-sm-12 -->

web/templates/story/index.html.eex

@@ -1,13 +1,13 @@
 <div class="container">
   <div class="row">
     <div class="col-md-8">
-      <%= render_many @stories, StoryView, "_stories.html", conn: @conn, current_user: @current_user %>
+      <%= render_many @stories, StoryView, "_story.html", conn: @conn, current_user: @current_user %>
     </div><!-- /.col-md-8 -->
     <div class="col-md-4 col-sm-12">
       <div class="panel panel-default">
         <div class="panel-heading text-center">Categories</div>
         <ul class="list-group">
-          <%= render_many @categories, StoryView, "_categories.html", as: :category, conn: @conn %>
+          <%= render_many @categories, StoryView, "_category.html", as: :category, conn: @conn %>
         </ul>
       </div><!-- /.panel panel-default -->
     </div><!-- /.col-md-4 col-sm-12 -->

web/templates/story/random.html.eex

@@ -2,9 +2,9 @@
   <div class="row">
     <div class="col-md-8">
       <%= if @stories == [] do %>
-        <%= render_many @top_stories, StoryView, "_stories.html", as: :story, conn: @conn, current_user: @current_user %>
+        <%= render_many @top_stories, StoryView, "_story.html", as: :story, conn: @conn, current_user: @current_user %>
       <% else %>
-        <%= render_many @stories, StoryView, "_stories.html", conn: @conn, current_user: @current_user %>
+        <%= render_many @stories, StoryView, "_story.html", conn: @conn, current_user: @current_user %>
       <% end %>
 
       <%= paginate @conn, @kerosene, class: "pull-right" %>
@@ -13,7 +13,7 @@
       <div class="panel panel-default">
         <div class="panel-heading text-center">Categories</div>
         <ul class="list-group">
-          <%= render_many @categories, StoryView, "_categories.html", as: :category, conn: @conn %>
+          <%= render_many @categories, StoryView, "_category.html", as: :category, conn: @conn %>
         </ul>
       </div><!-- /.panel panel-default -->
     </div><!-- /.col-md-4 col-sm-12 -->