From be41fa0cd406e84edc82985850461eafc1549b09 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:59:42 +0100
Subject: [PATCH] Return support definitions before user definitions

---
 app/services/csv/lettings_log_csv_service.rb | 4 +++-
 app/services/csv/sales_log_csv_service.rb    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/services/csv/lettings_log_csv_service.rb b/app/services/csv/lettings_log_csv_service.rb
index d6a036c8b..91fddb72d 100644
--- 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
diff --git a/app/services/csv/sales_log_csv_service.rb b/app/services/csv/sales_log_csv_service.rb
index f470cb4f2..a37bc74f3 100644
--- 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