From 66e39732bbbec03868a8f761ed7b9794930e6ed5 Mon Sep 17 00:00:00 2001
From: Sam Seed <sam.seed@softwire.com>
Date: Wed, 8 Feb 2023 11:30:00 +0000
Subject: [PATCH] feat: undo work in validator(_spec)

---
 .../bulk_upload/lettings/validator.rb         | 13 +-----------
 .../bulk_upload/lettings/validator_spec.rb    | 21 -------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/app/services/bulk_upload/lettings/validator.rb b/app/services/bulk_upload/lettings/validator.rb
index e76f973aa..6f37c0f3a 100644
--- a/app/services/bulk_upload/lettings/validator.rb
+++ b/app/services/bulk_upload/lettings/validator.rb
@@ -174,9 +174,8 @@ class BulkUpload::Lettings::Validator
   end
 
   def create_logs?
-    # return false if any_setup_sections_incomplete?
+    return false if any_setup_sections_incomplete?
     return false if over_column_error_threshold?
-    return false if duplicate_log_already_exists?
 
     row_parsers.all? { |row_parser| row_parser.log.valid? }
   end
@@ -204,16 +203,6 @@ private
     end
   end
 
-  def duplicate_log_already_exists?
-    fields = ["lettype", "beds"]
-
-    fields.all? do |field|
-      count = row_parsers.count { |row_parser| LettingsLog.where("#{field}": row_parser.attributes[field]).present? }
-
-      count > 0
-    end
-  end
-
   def csv_parser
     @csv_parser ||= BulkUpload::Lettings::CsvParser.new(path:)
   end
diff --git a/spec/services/bulk_upload/lettings/validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb
index 19deb5731..263c83163 100644
--- a/spec/services/bulk_upload/lettings/validator_spec.rb
+++ b/spec/services/bulk_upload/lettings/validator_spec.rb
@@ -255,26 +255,5 @@ RSpec.describe BulkUpload::Lettings::Validator do
         end
       end
     end
-
-    context "when the file contains a log which already exists in the db" do
-      let(:log_1) { create(:lettings_log, :completed, lettype: 7, beds: 3, created_by: user) } # DB
-      let(:log_2) { build(:lettings_log, :completed, lettype: 7, beds: 3, created_by: user) } # Bulk upload
-
-      before do
-        file.write(BulkUpload::LogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0).to_csv_row)
-        file.close
-      end
-
-      it "prevents log creation if there is a duplicate log" do
-        validator.call
-        expect(validator).not_to be_create_logs
-      end
-
-      it "allows log creation if there are no duplicate logs" do
-        log_1.update!(beds: 2)
-        validator.call
-        expect(validator).to be_create_logs
-      end
-    end
   end
 end