Address PR comments

Co-authored-by: Vinicius Negrisolo <vinicius.negrisolo@hashrocket.com>
Co-authored-by: Gabriel Reis <gabriel.reis@hashrocket.com>

Author: 3 people

lib/tilex/stats.ex

@@ -5,6 +5,7 @@ defmodule Tilex.Stats do
   alias Ecto.Adapters.SQL
   alias Tilex.Blog.Channel
   alias Tilex.Blog.Post
+  alias Tilex.Posts
   alias Tilex.Repo
 
   def developer(%{start_date: start_date, end_date: end_date}) do
@@ -13,10 +14,9 @@ defmodule Tilex.Stats do
 
     posts_query =
       from(p in Post,
-        where:
-          not is_nil(p.published_at) and p.published_at <= fragment("now()") and
-            between(p.inserted_at, ^start_time, ^end_time)
+        where: between(p.inserted_at, ^start_time, ^end_time)
       )
+      |> Posts.published()
 
     [
       start_date: format_date(start_date),
@@ -35,11 +35,7 @@ defmodule Tilex.Stats do
 
   def all do
     posts_for_days = query_posts_for_days!()
-
-    posts_query =
-      from(p in Post,
-        where: not is_nil(p.published_at) and p.published_at <= fragment("now()")
-      )
+    posts_query = Posts.published()
 
     [
       channels: get_posts_by_channels_count(posts_query),

lib/tilex/tracking.ex

@@ -25,7 +25,7 @@ defmodule Tilex.Tracking do
         where: matches?(req.page, "/posts/"),
         where: not matches?(req.page, "/posts/.+/edit$"),
         where: between(req.request_time, ^start_date, ^end_date),
-        order_by: [desc: count(req.page)],
+        order_by: [desc: count(req.page), asc: req.page],
         select: %{
           url: req.page,
           view_count: count(req.page),

lib/tilex_web/controllers/feed_controller.ex

@@ -1,17 +1,18 @@
 defmodule TilexWeb.FeedController do
   use TilexWeb, :controller
 
+  alias Tilex.Posts
+
   def index(conn, _params) do
     posts =
-      Repo.all(
-        from(
-          p in Tilex.Blog.Post,
-          where: not is_nil(p.published_at) and p.published_at <= fragment("now()"),
-          order_by: [desc: p.inserted_at],
-          preload: [:channel, :developer],
-          limit: 25
-        )
+      from(
+        p in Tilex.Blog.Post,
+        order_by: [desc: p.inserted_at],
+        preload: [:channel, :developer],
+        limit: 25
       )
+      |> Posts.published()
+      |> Repo.all()
 
     conn
     |> put_resp_content_type("application/xml")

lib/tilex_web/controllers/post_controller.ex

@@ -63,10 +63,9 @@ defmodule TilexWeb.PostController do
   def show(%{assigns: %{slug: slug}} = conn, _) do
     post =
       from(p in Post,
-        where:
-          not is_nil(p.published_at) and p.published_at <= fragment("now()") and
-            p.slug == ^slug
+        where: p.slug == ^slug
       )
+      |> Posts.published()
       |> Repo.one!(slug: slug)
       |> Repo.preload([:channel])
       |> Repo.preload([:developer])
@@ -78,16 +77,15 @@ defmodule TilexWeb.PostController do
   end
 
   def random(conn, _) do
-    query =
+    post =
       from(
         post in Post,
-        where: not is_nil(post.published_at) and post.published_at <= fragment("now()"),
         order_by: fragment("random()"),
         limit: 1,
         preload: [:channel, :developer]
       )
-
-    post = Repo.one(query)
+      |> Posts.published()
+      |> Repo.one()
 
     conn
     |> assign(:meta_robots, "noindex")