From 89e5a63627fc255416220e865b4a19f102c4ba23 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Mon, 5 Dec 2022 09:33:27 +0000
Subject: [PATCH] do not reset created_by and remove user_organisation_chosen?

---
 app/controllers/form_controller.rb |  2 +-
 app/models/lettings_log.rb         |  1 -
 app/models/log.rb                  | 18 +-----------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index 2036e619f..19d47f8e3 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -10,7 +10,7 @@ class FormController < ApplicationController
       responses_for_page = responses_for_page(@page)
       mandatory_questions_with_no_response = mandatory_questions_with_no_response(responses_for_page)
 
-      if mandatory_questions_with_no_response.empty? && (@log.user_organisation_chosen?(current_user) || current_user.support?) && @log.update(responses_for_page)
+      if mandatory_questions_with_no_response.empty? && @log.update(responses_for_page)
         session[:errors] = session[:fields] = nil
         redirect_to(successful_redirect_path)
       else
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 46d8b0759..14d0ead2c 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -570,7 +570,6 @@ private
     super
 
     reset_invalid_unresolved_log_fields!
-    reset_created_by
     reset_scheme
     reset_derived_questions
   end
diff --git a/app/models/log.rb b/app/models/log.rb
index 70669c793..e9479cf19 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -44,21 +44,11 @@ class Log < ApplicationRecord
   def managing_organisation_provider_type
     managing_organisation&.provider_type
   end
-
+  
   def collection_period_open?
     form.end_date > Time.zone.today
   end
   
-  def user_organisation_chosen?(user)
-    unless [user, managing_organisation, owning_organisation].any?(&:blank?) || user.organisation == managing_organisation || user.organisation == owning_organisation
-      errors.add :created_by, I18n.t("validations.setup.created_by.invalid")
-      errors.add :owning_organisation_id, I18n.t("validations.setup.owning_organisation.invalid")
-      errors.add :managing_organisation_id, I18n.t("validations.setup.managing_organisation.invalid")
-      return false
-    end
-    true
-  end
-
 private
 
   def update_status!
@@ -82,12 +72,6 @@ private
     subsection_statuses.all? { |status| not_started_statuses.include?(status) }
   end
 
-  def reset_created_by
-    return unless created_by && owning_organisation
-
-    self.created_by = nil if created_by.organisation != owning_organisation
-  end
-
   def reset_invalidated_dependent_fields!
     return unless form