From 27e02b3a5fb99b07969fead3febaf2544e41432b Mon Sep 17 00:00:00 2001
From: Phil Lee <asmega@users.noreply.github.com>
Date: Thu, 15 Dec 2022 10:58:03 +0000
Subject: [PATCH] improve namespacing of classes

---
 app/components/bulk_upload_error_row_component.rb             | 4 ++--
 .../{lettings_validator.rb => lettings/validator.rb}          | 2 +-
 .../bulk_upload/{sales_validator.rb => sales/validator.rb}    | 2 +-
 .../validator_spec.rb}                                        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename app/services/bulk_upload/{lettings_validator.rb => lettings/validator.rb} (99%)
 rename app/services/bulk_upload/{sales_validator.rb => sales/validator.rb} (99%)
 rename spec/services/bulk_upload/{lettings_validator_spec.rb => lettings/validator_spec.rb} (93%)

diff --git a/app/components/bulk_upload_error_row_component.rb b/app/components/bulk_upload_error_row_component.rb
index 817b80dee..d50bb5388 100644
--- a/app/components/bulk_upload_error_row_component.rb
+++ b/app/components/bulk_upload_error_row_component.rb
@@ -22,9 +22,9 @@ class BulkUploadErrorRowComponent < ViewComponent::Base
   def question_for_field(field)
     case bulk_upload.log_type
     when "lettings"
-      BulkUpload::LettingsValidator.question_for_field(field.to_sym)
+      BulkUpload::Lettings::Validator.question_for_field(field.to_sym)
     when "sales"
-      BulkUpload::SalesValidator.question_for_field(field.to_sym)
+      BulkUpload::Sales::Validator.question_for_field(field.to_sym)
     else
       "Unknown question"
     end
diff --git a/app/services/bulk_upload/lettings_validator.rb b/app/services/bulk_upload/lettings/validator.rb
similarity index 99%
rename from app/services/bulk_upload/lettings_validator.rb
rename to app/services/bulk_upload/lettings/validator.rb
index 7b1e64d66..db19e784a 100644
--- a/app/services/bulk_upload/lettings_validator.rb
+++ b/app/services/bulk_upload/lettings/validator.rb
@@ -1,6 +1,6 @@
 require "csv"
 
-class BulkUpload::LettingsValidator
+class BulkUpload::Lettings::Validator
   include ActiveModel::Validations
 
   QUESTIONS = {
diff --git a/app/services/bulk_upload/sales_validator.rb b/app/services/bulk_upload/sales/validator.rb
similarity index 99%
rename from app/services/bulk_upload/sales_validator.rb
rename to app/services/bulk_upload/sales/validator.rb
index 9e6e95fa7..f2855bc7c 100644
--- a/app/services/bulk_upload/sales_validator.rb
+++ b/app/services/bulk_upload/sales/validator.rb
@@ -1,4 +1,4 @@
-class BulkUpload::SalesValidator
+class BulkUpload::Sales::Validator
   QUESTIONS = {
     field_1: "What is the purchaser code?",
     field_2: "What is the day of the sale completion date? - DD",
diff --git a/spec/services/bulk_upload/lettings_validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb
similarity index 93%
rename from spec/services/bulk_upload/lettings_validator_spec.rb
rename to spec/services/bulk_upload/lettings/validator_spec.rb
index e86ec9c99..4c3a27eb0 100644
--- a/spec/services/bulk_upload/lettings_validator_spec.rb
+++ b/spec/services/bulk_upload/lettings/validator_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe BulkUpload::LettingsValidator do
+RSpec.describe BulkUpload::Lettings::Validator do
   subject(:validator) { described_class.new(bulk_upload:, path:) }
 
   let(:bulk_upload) { create(:bulk_upload) }