From dd1caf5bd1c5f36b943bfa59f39e126d4adc1b0e Mon Sep 17 00:00:00 2001 From: Arthur Campbell Date: Thu, 29 Jun 2023 14:30:55 +0100 Subject: [PATCH] upadte csv export services to retrieve creation method values direct from the log, remove methods previously used from the log model --- app/models/log.rb | 8 -------- app/services/csv/lettings_log_csv_service.rb | 4 ++-- app/services/csv/sales_log_csv_service.rb | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/models/log.rb b/app/models/log.rb index c019237e8..a25c19d21 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -178,14 +178,6 @@ class Log < ApplicationRecord end end - def creation_method_code - bulk_uploaded? ? 2 : 1 - end - - def creation_method_label - bulk_uploaded? ? "bulk upload" : "single log" - end - def bulk_uploaded? bulk_upload_id.present? end diff --git a/app/services/csv/lettings_log_csv_service.rb b/app/services/csv/lettings_log_csv_service.rb index a8e57d667..a4daf6d1a 100644 --- a/app/services/csv/lettings_log_csv_service.rb +++ b/app/services/csv/lettings_log_csv_service.rb @@ -108,8 +108,8 @@ module Csv codes: %i[scheme id_to_display], }, creation_method: { - labels: %i[creation_method_label], - codes: %i[creation_method_code], + labels: %i[creation_method], + codes: %i[creation_method_before_type_cast], }, is_dpo: { labels: %i[created_by is_dpo?], diff --git a/app/services/csv/sales_log_csv_service.rb b/app/services/csv/sales_log_csv_service.rb index dc1425e36..895b544cf 100644 --- a/app/services/csv/sales_log_csv_service.rb +++ b/app/services/csv/sales_log_csv_service.rb @@ -43,8 +43,8 @@ module Csv codes: %i[owning_organisation name], }, creation_method: { - labels: %i[creation_method_label], - codes: %i[creation_method_code], + labels: %i[creation_method], + codes: %i[creation_method_before_type_cast], }, }.freeze