From 6e118537897cf12b448f57be8b65b6cb64c139fb Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Fri, 20 Oct 2023 13:12:07 +0100
Subject: [PATCH] feat: use helper methods for view

---
 app/helpers/filters_helper.rb        | 12 ++++++++++++
 app/views/logs/_log_filters.html.erb |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index 8ea0093b6..345b7f45c 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -116,6 +116,18 @@ module FiltersHelper
     user.support? || org.stock_owners.count > 1 || (org.holds_own_stock? && org.stock_owners.count.positive?)
   end
 
+  def show_needstype_filter?
+    [1,2].all?{ |needstype| current_user.lettings_logs.where(needstype:).count.positive? } && request.path.include?("/lettings-logs")
+  end
+
+  def show_owning_org_filter?
+    (current_user.support? || current_user.organisation.stock_owners.count > 1) && request.path == "/lettings-logs"
+  end
+
+  def show_managing_org_filter?
+    (current_user.support? || current_user.organisation.managing_agents.count > 1) && request.path == "/lettings-logs"
+  end
+
 private
 
   def applied_filters_count(filter_type)
diff --git a/app/views/logs/_log_filters.html.erb b/app/views/logs/_log_filters.html.erb
index 7feadf14b..b03d79318 100644
--- a/app/views/logs/_log_filters.html.erb
+++ b/app/views/logs/_log_filters.html.erb
@@ -42,7 +42,7 @@
                        category: "status",
                      } %>
 
-          <% if request.path.include?("/lettings-logs") %>
+          <% if show_needstype_filter? %>
             <%= render partial: "filters/checkbox_filter",
                        locals: {
                          f:,
@@ -73,7 +73,7 @@
                        category: "assigned_to",
                      } %>
 
-         <% if (current_user.support? || current_user.organisation.stock_owners.count > 1) && request.path == "/lettings-logs" %>
+         <% if show_owning_org_filter? %>
           <%= render partial: "filters/radio_filter", locals: {
             f:,
             options: {
@@ -93,7 +93,7 @@
           } %>
         <% end %>
 
-        <% if (current_user.support? || current_user.organisation.managing_agents.count > 1) && request.path == "/lettings-logs" %>
+        <% if show_managing_org_filter? %>
           <%= render partial: "filters/radio_filter", locals: {
             f:,
             options: {