Browse Source

improve namespacing of classes

pull/1091/head
Phil Lee 3 years ago
parent
commit
27e02b3a5f
  1. 4
      app/components/bulk_upload_error_row_component.rb
  2. 2
      app/services/bulk_upload/lettings/validator.rb
  3. 2
      app/services/bulk_upload/sales/validator.rb
  4. 2
      spec/services/bulk_upload/lettings/validator_spec.rb

4
app/components/bulk_upload_error_row_component.rb

@ -22,9 +22,9 @@ class BulkUploadErrorRowComponent < ViewComponent::Base
def question_for_field(field) def question_for_field(field)
case bulk_upload.log_type case bulk_upload.log_type
when "lettings" when "lettings"
BulkUpload::LettingsValidator.question_for_field(field.to_sym) BulkUpload::Lettings::Validator.question_for_field(field.to_sym)
when "sales" when "sales"
BulkUpload::SalesValidator.question_for_field(field.to_sym) BulkUpload::Sales::Validator.question_for_field(field.to_sym)
else else
"Unknown question" "Unknown question"
end end

2
app/services/bulk_upload/lettings_validator.rb → app/services/bulk_upload/lettings/validator.rb

@ -1,6 +1,6 @@
require "csv" require "csv"
class BulkUpload::LettingsValidator class BulkUpload::Lettings::Validator
include ActiveModel::Validations include ActiveModel::Validations
QUESTIONS = { QUESTIONS = {

2
app/services/bulk_upload/sales_validator.rb → app/services/bulk_upload/sales/validator.rb

@ -1,4 +1,4 @@
class BulkUpload::SalesValidator class BulkUpload::Sales::Validator
QUESTIONS = { QUESTIONS = {
field_1: "What is the purchaser code?", field_1: "What is the purchaser code?",
field_2: "What is the day of the sale completion date? - DD", field_2: "What is the day of the sale completion date? - DD",

2
spec/services/bulk_upload/lettings_validator_spec.rb → spec/services/bulk_upload/lettings/validator_spec.rb

@ -1,6 +1,6 @@
require "rails_helper" require "rails_helper"
RSpec.describe BulkUpload::LettingsValidator do RSpec.describe BulkUpload::Lettings::Validator do
subject(:validator) { described_class.new(bulk_upload:, path:) } subject(:validator) { described_class.new(bulk_upload:, path:) }
let(:bulk_upload) { create(:bulk_upload) } let(:bulk_upload) { create(:bulk_upload) }
Loading…
Cancel
Save