feat: scrub before tr to fix invalid byte error

3 years ago · ec6e396dfb
4 changed files with 4 additions and 4 deletions
--- a/app/services/bulk_upload/lettings/year2022/csv_parser.rb
+++ b/app/services/bulk_upload/lettings/year2022/csv_parser.rb
@ -92,8 +92,8 @@ private

    @normalised_string = File.read(path, encoding: "bom|utf-8")
    @normalised_string.gsub!("\r\n", "\n")
-    @normalised_string.gsub!("\r", "\n")
    @normalised_string.scrub!("")
+    @normalised_string.tr!("\r", "\n")

    @normalised_string
  end
--- a/app/services/bulk_upload/lettings/year2023/csv_parser.rb
+++ b/app/services/bulk_upload/lettings/year2023/csv_parser.rb
@ -97,8 +97,8 @@ private

    @normalised_string = File.read(path, encoding: "bom|utf-8")
    @normalised_string.gsub!("\r\n", "\n")
-    @normalised_string.gsub!("\r", "\n")
    @normalised_string.scrub!("")
+    @normalised_string.tr!("\r", "\n")

    @normalised_string
  end
--- a/app/services/bulk_upload/sales/year2022/csv_parser.rb
+++ b/app/services/bulk_upload/sales/year2022/csv_parser.rb
@ -66,8 +66,8 @@ private

    @normalised_string = File.read(path, encoding: "bom|utf-8")
    @normalised_string.gsub!("\r\n", "\n")
-    @normalised_string.gsub!("\r", "\n")
    @normalised_string.scrub!("")
+    @normalised_string.tr!("\r", "\n")

    @normalised_string
  end
--- a/app/services/bulk_upload/sales/year2023/csv_parser.rb
+++ b/app/services/bulk_upload/sales/year2023/csv_parser.rb
@ -92,8 +92,8 @@ private

    @normalised_string = File.read(path, encoding: "bom|utf-8")
    @normalised_string.gsub!("\r\n", "\n")
-    @normalised_string.gsub!("\r", "\n")
    @normalised_string.scrub!("")
+    @normalised_string.tr("\r", "\n")

    @normalised_string
  end