Show heatmap only to logged in users

Author: AntonKhorev

app/controllers/users_controller.rb

@@ -24,31 +24,33 @@ def show
     if @user && (@user.visible? || current_user&.administrator?)
       @title = @user.display_name
 
-      @heatmap_data = Rails.cache.fetch("heatmap_data_of_user_#{@user.id}", :expires_at => Time.zone.now.end_of_day) do
-        from = 1.year.ago.beginning_of_day
-        to = Time.zone.now.end_of_day
-
-        mapped = Changeset
-                 .where(:user_id => @user.id)
-                 .where(:created_at => from..to)
-                 .where(:num_changes => 1..)
-                 .group("date_trunc('day', created_at)")
-                 .select("date_trunc('day', created_at) AS date, SUM(num_changes) AS total_changes, MAX(id) AS max_id")
-                 .order("date")
-                 .map do |changeset|
-                   {
-                     :date => changeset.date.to_date,
-                     :total_changes => changeset.total_changes.to_i,
-                     :max_id => changeset.max_id
-                   }
-                 end
-
-        {
-          :count => mapped.sum { |entry| entry[:total_changes] },
-          :data => mapped.index_by { |entry| entry[:date] },
-          :from => from,
-          :to => to
-        }
+      if current_user
+        @heatmap_data = Rails.cache.fetch("heatmap_data_of_user_#{@user.id}", :expires_at => Time.zone.now.end_of_day) do
+          from = 1.year.ago.beginning_of_day
+          to = Time.zone.now.end_of_day
+
+          mapped = Changeset
+                   .where(:user_id => @user.id)
+                   .where(:created_at => from..to)
+                   .where(:num_changes => 1..)
+                   .group("date_trunc('day', created_at)")
+                   .select("date_trunc('day', created_at) AS date, SUM(num_changes) AS total_changes, MAX(id) AS max_id")
+                   .order("date")
+                   .map do |changeset|
+                     {
+                       :date => changeset.date.to_date,
+                       :total_changes => changeset.total_changes.to_i,
+                       :max_id => changeset.max_id
+                     }
+                   end
+
+          {
+            :count => mapped.sum { |entry| entry[:total_changes] },
+            :data => mapped.index_by { |entry| entry[:date] },
+            :from => from,
+            :to => to
+          }
+        end
       end
     else
       render_unknown_user params[:display_name]

app/views/users/show.html.erb

@@ -246,7 +246,7 @@
 
 <div class="richtext text-break"><%= @user.description.to_html %></div>
 
-<% if @heatmap_data[:count].positive? %>
+<% if @heatmap_data.present? && @heatmap_data[:count].positive? %>
   <h2 class="text-body-secondary fs-5 mt-4"><%= t("users.show.contributions", :count => @heatmap_data[:count]) %></h2>
   <%= render :partial => "heatmap", :locals => @heatmap_data %>
 <% end %>

test/controllers/users_controller_test.rb

@@ -330,13 +330,24 @@ def test_auth_failure_callback
     assert_redirected_to login_path
   end
 
+  def test_show_heatmap_data_when_not_logged_in
+    user = create(:user)
+    create(:changeset, :user => user, :created_at => 6.months.ago, :num_changes => 10)
+
+    get user_path(user)
+
+    assert_response :success
+    assert_nil assigns(:heatmap_data)
+  end
+
   def test_show_heatmap_data
     user = create(:user)
-    # Create two changesets
     create(:changeset, :user => user, :created_at => 6.months.ago, :num_changes => 10)
     create(:changeset, :user => user, :created_at => 3.months.ago, :num_changes => 20)
 
+    session_for(create(:user))
     get user_path(user)
+
     assert_response :success
     # The data should not be empty
     heatmap_data = assigns(:heatmap_data)
@@ -359,6 +370,7 @@ def test_show_heatmap_data_caching
     create(:changeset, :user => user, :created_at => 6.months.ago, :num_changes => 15)
 
     # First request to populate the cache
+    session_for(create(:user))
     get user_path(user)
     first_response_data = assigns(:heatmap_data)
     assert_not_nil first_response_data, "Expected heatmap data to be assigned on the first request"
@@ -391,18 +403,20 @@ def test_show_heatmap_data_caching
     Rails.cache = @original_cache_store
   end
 
-  def test_show_heatmap_data_no_changesets
+  def test_show_heatmap_rendering_when_not_logged_in
     user = create(:user)
+    create(:changeset, :user => user, :created_at => 6.months.ago, :num_changes => 10)
 
     get user_path(user)
+
     assert_response :success
-    assert_empty(assigns(:heatmap_data)[:data].values)
     assert_select ".heatmap", :count => 0
   end
 
   def test_show_heatmap_rendering_of_user_with_no_changesets
     user_without_changesets = create(:user)
 
+    session_for(create(:user))
     get user_path(user_without_changesets)
 
     assert_response :success
@@ -415,6 +429,7 @@ def test_show_heatmap_rendering_of_user_with_changesets
     _changeset5 = create(:changeset, :user => user, :created_at => 3.months.ago.beginning_of_day, :num_changes => 5)
     changeset11 = create(:changeset, :user => user, :created_at => 3.months.ago.beginning_of_day, :num_changes => 11)
 
+    session_for(create(:user))
     get user_path(user)
 
     assert_response :success
@@ -426,9 +441,10 @@ def test_show_heatmap_rendering_of_user_with_changesets
     assert_select ".heatmap [data-date='#{5.months.ago.to_date}']:not([data-count])"
   end
 
-  def test_heatmap_headline_changset_zero
+  def test_heatmap_headline_changeset_zero
     user = create(:user)
 
+    session_for(create(:user))
     get user_path(user)
 
     assert_response :success
@@ -439,6 +455,7 @@ def test_heatmap_headline_changeset_singular
     user = create(:user)
     create(:changeset, :user => user, :created_at => 4.months.ago.beginning_of_day, :num_changes => 1)
 
+    session_for(create(:user))
     get user_path(user)
 
     assert_response :success
@@ -449,6 +466,7 @@ def test_heatmap_headline_changeset_plural
     user = create(:user)
     create(:changeset, :user => user, :created_at => 4.months.ago.beginning_of_day, :num_changes => 12)
 
+    session_for(create(:user))
     get user_path(user)
 
     assert_response :success