From 1985019fef27138d97cbb3343a5e1a9f7064e74c Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 12 Jul 2023 10:23:24 +0100 Subject: [PATCH] refactor: simplification --- app/helpers/filters_helper.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index d48208a9b..937475675 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -47,21 +47,25 @@ module FiltersHelper end def filters_applied_text(filter_type) - applied_filters = JSON.parse(session[session_name_for(filter_type)]) - applied_filters_count = filters_count(applied_filters) - applied_filters_count.zero? ? "No filters applied" : "#{pluralize(applied_filters_count, 'filter')} applied" + applied_filters_count(filter_type).zero? ? "No filters applied" : "#{pluralize(applied_filters_count(filter_type), 'filter')} applied" end def reset_filters_link(filter_type) - applied_filters = JSON.parse(session[session_name_for(filter_type)]) - applied_filters_count = filters_count(applied_filters) - if applied_filters_count.positive? + if applied_filters_count(filter_type).positive? govuk_link_to "Clear", clear_filters_path(filter_type:) end end private + def applied_filters_count(filter_type) + filters_count(applied_filters(filter_type)) + end + + def applied_filters(filter_type) + JSON.parse(session[session_name_for(filter_type)]) + end + def session_name_for(filter_type) "#{filter_type}_filters" end