Slightly more efficient

Charcoal-SE · Nov 6, 2019 · 40cd2ef · 40cd2ef
1 parent d3841a8
commit 40cd2ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/controllers/status_controller.rb b/app/controllers/status_controller.rb
@@ -8,7 +8,9 @@ class StatusController < ApplicationController
   before_action :verify_admin, only: [:kill]
 
   def index
-    @statuses = SmokeDetector.includes(:statistics).order(Arel.sql('last_ping DESC')).all
+    @statuses = SmokeDetector.order(Arel.sql('last_ping DESC')).all
+    @scans = Statistic.where('created_at >= ?', 24.hours.ago).select(Arel.sql('smoke_detector_id, SUM(posts_scanned) as scans'))
+                      .group(:smoke_detector_id)
   end
 
   def status_update

diff --git a/app/views/status/index.html.erb b/app/views/status/index.html.erb
@@ -2,11 +2,11 @@
 
 <br />
 
-<table class='table'>
+<table class="table">
   <tr>
     <th>Name</th>
     <th>Scans Today</th>
-    <th style='width:14em;'>Last Ping</th>
+    <th style="width:14em;">Last Ping</th>
     <th colspan="2">
   </tr>
 
@@ -23,7 +23,7 @@
         <% end %>
       </td>
       <td class="activity-cell">
-        <%= sd.statistics.where('created_at >= ?', 24.hours.ago).sum(:posts_scanned) %>
+        <%= @scans.select { |id, scans| id == sd.id }.try(:[], 0) || '(unavailable)' %>
       </td>
       <td class="status-<%= sd.status_color %> ping-cell" data-livestamp="<%= sd.last_ping.to_i %>" title="<%= sd.last_ping.to_s %>">
         <%= time_ago_in_words(sd.last_ping, include_seconds: true)%> ago