Browse Source

feat: add old spec work from CLDC-1788 to avoid future conflicts, typo fix

pull/1342/head
natdeanlewissoftwire 3 years ago
parent
commit
6db0b2be52
  1. 4
      app/models/forms/bulk_upload_lettings/prepare_your_file.rb
  2. 4
      app/models/forms/bulk_upload_sales/prepare_your_file.rb
  3. 2
      app/models/location.rb
  4. 2
      app/models/organisation.rb
  5. 2
      app/models/scheme.rb
  6. 8
      app/services/bulk_upload/lettings/row_parser.rb
  7. BIN
      public/files/bulk-upload-lettings-specification-2022-23.xlsx
  8. BIN
      public/files/bulk-upload-sales-specification-2022-23.xlsx

4
app/models/forms/bulk_upload_lettings/prepare_your_file.rb

@ -33,6 +33,10 @@ module Forms
"/files/bulk-upload-lettings-template-v1.xlsx" "/files/bulk-upload-lettings-template-v1.xlsx"
end end
def specification_path
"/files/bulk-upload-lettings-specification-2022-23.xlsx"
end
def year_combo def year_combo
"#{year}/#{year + 1 - 2000}" "#{year}/#{year + 1 - 2000}"
end end

4
app/models/forms/bulk_upload_sales/prepare_your_file.rb

@ -31,6 +31,10 @@ module Forms
"/files/bulk-upload-sales-template-v1.xlsx" "/files/bulk-upload-sales-template-v1.xlsx"
end end
def specification_path
"/files/bulk-upload-sales-specification-2022-23.xlsx"
end
def year_combo def year_combo
"#{year}/#{year + 1 - 2000}" "#{year}/#{year + 1 - 2000}"
end end

2
app/models/location.rb

@ -366,7 +366,7 @@ class Location < ApplicationRecord
enum type_of_unit: TYPE_OF_UNIT enum type_of_unit: TYPE_OF_UNIT
def self.find_by_id_on_mulitple_fields(id) def self.find_by_id_on_multiple_fields(id)
return if id.nil? return if id.nil?
where(id:).or(where(old_visible_id: id)).first where(id:).or(where(old_visible_id: id)).first

2
app/models/organisation.rb

@ -48,7 +48,7 @@ class Organisation < ApplicationRecord
validates :name, presence: { message: I18n.t("validations.organisation.name_missing") } validates :name, presence: { message: I18n.t("validations.organisation.name_missing") }
validates :provider_type, presence: { message: I18n.t("validations.organisation.provider_type_missing") } validates :provider_type, presence: { message: I18n.t("validations.organisation.provider_type_missing") }
def self.find_by_id_on_mulitple_fields(id) def self.find_by_id_on_multiple_fields(id)
return if id.nil? return if id.nil?
if id.start_with?("ORG") if id.start_with?("ORG")

2
app/models/scheme.rb

@ -110,7 +110,7 @@ class Scheme < ApplicationRecord
enum arrangement_type: ARRANGEMENT_TYPE, _suffix: true enum arrangement_type: ARRANGEMENT_TYPE, _suffix: true
def self.find_by_id_on_mulitple_fields(id) def self.find_by_id_on_multiple_fields(id)
return if id.nil? return if id.nil?
if id.start_with?("S") if id.start_with?("S")

8
app/services/bulk_upload/lettings/row_parser.rb

@ -217,7 +217,7 @@ private
def location def location
return if scheme.nil? return if scheme.nil?
@location ||= scheme.locations.find_by_id_on_mulitple_fields(field_5) @location ||= scheme.locations.find_by_id_on_multiple_fields(field_5)
end end
def validate_location_exists def validate_location_exists
@ -584,7 +584,7 @@ private
end end
def owning_organisation def owning_organisation
Organisation.find_by_id_on_mulitple_fields(field_111) Organisation.find_by_id_on_multiple_fields(field_111)
end end
def owning_organisation_id def owning_organisation_id
@ -592,7 +592,7 @@ private
end end
def managing_organisation def managing_organisation
Organisation.find_by_id_on_mulitple_fields(field_113) Organisation.find_by_id_on_multiple_fields(field_113)
end end
def managing_organisation_id def managing_organisation_id
@ -991,6 +991,6 @@ private
end end
def scheme def scheme
@scheme ||= Scheme.find_by_id_on_mulitple_fields(field_4) @scheme ||= Scheme.find_by_id_on_multiple_fields(field_4)
end end
end end

BIN
public/files/bulk-upload-lettings-specification-2022-23.xlsx

Binary file not shown.

BIN
public/files/bulk-upload-sales-specification-2022-23.xlsx

Binary file not shown.
Loading…
Cancel
Save