From 89df93ba8e1bc90ae75850f4efbd0e76567f6855 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 1 Aug 2023 16:25:17 +0100 Subject: [PATCH] Put duplicate sets count behind a feature flag --- app/controllers/lettings_logs_controller.rb | 2 +- app/controllers/organisations_controller.rb | 4 ++-- app/controllers/sales_logs_controller.rb | 2 +- app/helpers/duplicate_logs_helper.rb | 2 +- app/services/feature_toggle.rb | 4 ++++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index bc1508225..bedebd31c 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -22,7 +22,7 @@ class LettingsLogsController < LogsController @total_count = all_logs.size @unresolved_count = all_logs.unresolved.created_by(current_user).count @filter_type = "lettings_logs" - @duplicate_sets_count = current_user.support? ? 0 : duplicate_sets_count(current_user, nil) + @duplicate_sets_count = FeatureToggle.duplicate_summary_enabled? && !current_user.support? ? duplicate_sets_count(current_user, nil) : 0 render "logs/index" end diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb index 6f6d39e1d..d94b7460b 100644 --- a/app/controllers/organisations_controller.rb +++ b/app/controllers/organisations_controller.rb @@ -104,7 +104,7 @@ class OrganisationsController < ApplicationController @total_count = organisation_logs.size @log_type = :lettings @filter_type = "lettings_logs" - @duplicate_sets_count = duplicate_sets_count(current_user, @organisation) + @duplicate_sets_count = FeatureToggle.duplicate_summary_enabled? ? duplicate_sets_count(current_user, @organisation) : 0 render "logs", layout: "application" end @@ -134,7 +134,7 @@ class OrganisationsController < ApplicationController @total_count = organisation_logs.size @log_type = :sales @filter_type = "sales_logs" - @duplicate_sets_count = duplicate_sets_count(current_user, @organisation) + @duplicate_sets_count = FeatureToggle.duplicate_summary_enabled? ? duplicate_sets_count(current_user, @organisation) : 0 render "logs", layout: "application" end diff --git a/app/controllers/sales_logs_controller.rb b/app/controllers/sales_logs_controller.rb index 532b5e1bf..8800e825e 100644 --- a/app/controllers/sales_logs_controller.rb +++ b/app/controllers/sales_logs_controller.rb @@ -24,7 +24,7 @@ class SalesLogsController < LogsController @searched = search_term.presence @total_count = all_logs.size @filter_type = "sales_logs" - @duplicate_sets_count = current_user.support? ? 0 : duplicate_sets_count(current_user, nil) + @duplicate_sets_count = FeatureToggle.duplicate_summary_enabled? && !current_user.support? ? duplicate_sets_count(current_user, nil) : 0 render "logs/index" end diff --git a/app/helpers/duplicate_logs_helper.rb b/app/helpers/duplicate_logs_helper.rb index 1e8c987e5..a3dd73a49 100644 --- a/app/helpers/duplicate_logs_helper.rb +++ b/app/helpers/duplicate_logs_helper.rb @@ -27,7 +27,7 @@ module DuplicateLogsHelper first_remaining_duplicate_id = all_duplicates.map(&:id).reject { |id| id == log.id }.first send("#{log.model_name.param_key}_#{page_id}_path", log, referrer: "duplicate_logs", first_remaining_duplicate_id:, original_log_id:) end - + def duplicates_for_user(user) { lettings: user.duplicate_lettings_logs_sets, diff --git a/app/services/feature_toggle.rb b/app/services/feature_toggle.rb index d7df829ad..0f5e03a79 100644 --- a/app/services/feature_toggle.rb +++ b/app/services/feature_toggle.rb @@ -33,4 +33,8 @@ class FeatureToggle def self.deduplication_flow_enabled? !Rails.env.production? && !Rails.env.staging? end + + def self.duplicate_summary_enabled? + !Rails.env.production? + end end