Return support definitions before user definitions

2 years ago · be41fa0cd4
2 changed files with 6 additions and 2 deletions
--- a/app/services/csv/lettings_log_csv_service.rb
+++ b/app/services/csv/lettings_log_csv_service.rb
@ -280,7 +280,9 @@ module Csv
        record = nil
        year = @year
        while year >= 2021 && record.nil?
-          record = records.find { |r| r.log_type == "lettings" && r.year == year }
+          record = records.find do |r|
+            r.year == year && (!@user.support? || r.user_type == "support" || r.user_type == "user")
+          end
          year -= 1
        end
        record || records.first
--- a/app/services/csv/sales_log_csv_service.rb
+++ b/app/services/csv/sales_log_csv_service.rb
@ -184,7 +184,9 @@ module Csv
        record = nil
        year = @year
        while year >= 2022 && record.nil?
-          record = records.find { |r| r.log_type == "sales" && r.year == year }
+          record = records.find do |r|
+            r.year == year && (!@user.support? || r.user_type == "support" || r.user_type == "user")
+          end
          year -= 1
        end
        record || records.first