Merge pull request #280 from lsa-mis/skylight-analyze-queries

Skylight analyze queries

app/controllers/rover_navigations_controller.rb

@@ -3,14 +3,14 @@ class RoverNavigationsController < ApplicationController
 
   def zones
     authorize :rover_navigation, :zones?
-    @zones = Zone.includes(:buildings).order(:name)
+    @zones = Zone.all.order(:name)
   end
 
   def buildings
     authorize :rover_navigation, :buildings?
 
     @zone = Zone.find(params[:zone_id])
-    @buildings = @zone.buildings.includes(:floors).order(:name)
+    @buildings = @zone.buildings.order(:name)
 
     if params[:search].present?
       @buildings = @buildings.where("name ILIKE :search OR address ILIKE :search", search: "%#{params[:search]}%")

app/controllers/static_pages_controller.rb

@@ -15,43 +15,44 @@ def welcome_rovers
 
   def dashboard
     authorize :static_page
-    @room_update_log = RoomUpdateLog.last
 
     @selected_date = params[:dashboard_date].present? ? Date.parse(params[:dashboard_date]) : Date.today
-
-    last_room_states = RoomState.all.order(updated_at: :desc).limit(5)
-    @last_checked_rooms  = []
-    @last_checked_rooms = last_room_states.map { |room_state| [Room.find(room_state.room_id), room_state.updated_at] }
-
     @zones = Zone.all.order(:name)
-
+    active_rooms = Room.active_in_zones
+
     @room_access_data = {
-      "Not accessed 3 times": rooms_not_accessed_for_number_of_times(3).count,
-      "Not accessed 5 times": rooms_not_accessed_for_number_of_times(5).count,
-      "Not accessed 7 times": rooms_not_accessed_for_number_of_times(7).count
+      "Not accessed 3 times": rooms_not_accessed_for_number_of_times(active_rooms, 3).count,
+      "Not accessed 5 times": rooms_not_accessed_for_number_of_times(active_rooms, 5).count,
+      "Not accessed 7 times": rooms_not_accessed_for_number_of_times(active_rooms, 7).count
     }
 
-    @rooms_not_checked_in_3_days = Room.active.where('DATE(last_time_checked) < ?', 3.days.ago.to_date)
-    @rooms_not_checked_4_to_7_days = Room.active.where('DATE(last_time_checked) >= ? AND DATE(last_time_checked) < ?', 7.days.ago.to_date, 3.days.ago.to_date)
-    @rooms_not_checked_7_plus_days = Room.active.where('DATE(last_time_checked) < ?', 7.days.ago.to_date)
-    @rooms_never_checked = Room.active.where(last_time_checked: nil)
+    @rooms_not_checked_in_3_days = active_rooms.where('DATE(last_time_checked) < ?', 3.days.ago.to_date)
+    @rooms_not_checked_4_to_7_days = active_rooms.where('DATE(last_time_checked) >= ? AND DATE(last_time_checked) < ?', 7.days.ago.to_date, 3.days.ago.to_date)
+    @rooms_not_checked_7_plus_days = active_rooms.where('DATE(last_time_checked) < ?', 7.days.ago.to_date)
+    @rooms_never_checked = active_rooms.where(last_time_checked: nil)
 
     @room_check_in_data = {
       "Not checked for 3 days" => @rooms_not_checked_in_3_days.count,
       "Not checked for 4 to 7 days" => @rooms_not_checked_4_to_7_days.count,
       "Not checked for over 7 days" => @rooms_not_checked_7_plus_days.count,
       "Never checked" => @rooms_never_checked.count
     }
+
+    last_room_states = RoomState.all.order(updated_at: :desc).limit(5)
+    @last_checked_rooms = last_room_states.map { |room_state| [Room.find(room_state.room_id), room_state.updated_at] }
+
+    @latest_room_tickets = RoomTicket.latest
+
+    @room_update_log = RoomUpdateLog.last
+    @room_update_log_status = @room_update_log.status
 
   end
 
   private
 
-  def rooms_not_accessed_for_number_of_times(number)
+  def rooms_not_accessed_for_number_of_times(active_rooms, number)
     result_rooms = []
-    rooms = Room.active.joins(floor: :building)
-      .where.not(buildings: { zone_id: nil })
-    rooms.each do |room|
+    active_rooms.each do |room|
       states = room.room_states.order('updated_at DESC').limit(number).pluck(:is_accessed)
       if states.length == number && (states.all? false)
         result_rooms << room

app/helpers/dashboard_helper.rb

@@ -26,19 +26,6 @@ def completion_percentage(checked, total)
     ((checked.to_f / total) * 100).round
   end
 
-  # getter for the number of latest tickets to be displayed on the dashboard, or makes it 5 by default
-  def recent_tickets_quantity
-    value = AppPreference.find_by(name: "tdx_tickets_quantity_on_dashboard")&.value
-    value.presence&.to_i || 5
-  end
-
-
-  def latest_room_tickets
-    RoomTicket.includes(room: { floor: :building })
-              .order(created_at: :desc)
-              .limit(recent_tickets_quantity)
-  end
-
   def rooms_checked_for_date(zone, date)
     date = Date.parse(date) if date.is_a? String 
     RoomState.joins(room: { floor: { building: :zone } } )
@@ -49,14 +36,4 @@ def rooms_checked_for_date(zone, date)
              .count
 
   end
-
-  def total_rooms(zone)
-    Room.active.joins(floor: { building: :zone })
-        .where(zones: { id: zone.id })
-        .count
-  end
-
-  def room_update_log_status(log_note)
-    log_note.split("|").first.strip
-  end
 end

app/models/room.rb

@@ -30,6 +30,7 @@ class Room < ApplicationRecord
   accepts_nested_attributes_for :specific_attributes
 
   scope :active, -> { where(archived: false).order(:room_number) }
+  scope :active_in_zones, -> { active.joins(floor: :building).where.not(buildings: { zone_id: nil }) }
   scope :archived, -> { where(archived: true).order(:room_number) }
 
   def full_name

app/models/room_ticket.rb

@@ -15,4 +15,8 @@ class RoomTicket < ApplicationRecord
   has_rich_text :description
 
   validates :description, :submitted_by, :tdx_email, presence: true
+
+  scope :latest, -> { all.order(created_at: :desc)
+    .limit(AppPreference.find_by(name: "tdx_tickets_quantity_on_dashboard")&.value.presence&.to_i || 5) }
+
 end

app/models/room_update_log.rb

@@ -9,4 +9,8 @@
 #  updated_at :datetime         not null
 #
 class RoomUpdateLog < ApplicationRecord
+
+  def status
+    self.note.split("|").first.strip
+  end
 end

app/models/zone.rb

@@ -12,4 +12,10 @@ class Zone < ApplicationRecord
   validates :name, presence: true
   has_many :buildings, -> { active }, class_name: 'Building'
 
+  def total_rooms
+    Room.active.joins(floor: { building: :zone })
+    .where(zones: { id: self.id })
+    .count 
+  end
+
 end

app/views/static_pages/_last_room_update_log.html.erb

@@ -8,16 +8,16 @@
       <div class="card-text mb-4">
         Status:
         <span
-          class="<%= room_update_log_status(last_room_update_log.note) == 'error' ? 'text-danger' : 'text-success' %>">
+          class="<%= @room_update_log_status == 'error' ? 'text-danger' : 'text-success' %>">
           <%= last_room_update_log.note.include?('success') ? 'SUCCESS' : 'ERROR' %>
         </span>
       </div>
 
       <div class="card-text mb-4">
         Note:
-        <% if room_update_log_status(last_room_update_log.note) == 'success' %>
+        <% if @room_update_log_status == 'success' %>
           Resources updated successfully for rooms.
-        <% elsif room_update_log_status(last_room_update_log.note) == 'success-partial' %>
+        <% elsif @room_update_log_status == 'success-partial' %>
           Resources updated successfully for rooms.
           <a class="text-primary" data-bs-toggle="collapse" href="#nonExistingRooms" role="button" aria-expanded="false" aria-controls="nonExistingRooms">
             These rooms
@@ -28,7 +28,7 @@
               <%= last_room_update_log.note.split(':').last.strip %>
             </div>
           </div>
-        <% elsif room_update_log_status(last_room_update_log.note) == 'error' %>
+        <% elsif @room_update_log_status == 'error' %>
           An error occurred while updating resources for rooms. Please report an issue.
         <% end %>
       </div>

app/views/static_pages/dashboard.html.erb

@@ -26,7 +26,7 @@
           </div>
           <div class="card-body">
             <div class="progress mb-3">
-              <% total = total_rooms(zone) %>
+              <% total = zone.total_rooms %>
               <% checked_for_date = rooms_checked_for_date(zone, @selected_date) %>
               <% percentage = completion_percentage(checked_for_date, total) %>
               <div class="progress-bar <%= room_check_progress_class(checked_for_date, total) %> text-white" role="progressbar" 
@@ -100,7 +100,7 @@
 
   <h2>Recent Room Issues</h2>
   <div class="row m-2">
-    <% latest_room_tickets.each do |ticket| %>
+    <% @latest_room_tickets.each do |ticket| %>
       <div class="mb-2">
         <div class="card">
           <div class="card-header">

app/views/zones/_zone.html.erb

@@ -4,7 +4,7 @@
   </div>
   <div class="card-body">
     <p><%= zone.buildings.count %> buildings</p>
-    <p><%= total_rooms(zone) %> rooms</p>
+    <p><%= zone.total_rooms %> rooms</p>
   </div>
   <div class="d-flex flex-row justify-content-between align-items-center mb-2 m-2">
     <%= link_to "Zone Details", zone_buildings_path(zone), class: "link_to" %>