refactor: move safe navigator and add shared org_params to log

app/controllers/lettings_logs_controller.rb

@@ -102,11 +102,9 @@ class LettingsLogsController < LogsController
   end
 
   def org_params
-    {
+    super.merge(
-      "owning_organisation_id" => current_user.organisation.id,
+      { "managing_organisation_id" => current_user.organisation.id },
-      "managing_organisation_id" => current_user.organisation.id,
+    )
-      "created_by_id" => current_user.id,
-    }
   end
 
 private

app/controllers/logs_controller.rb

@@ -63,7 +63,6 @@ private
     owning_organisation_id = current_user.organisation.holds_own_stock? ? current_user.organisation.id : nil
     {
       "owning_organisation_id" => owning_organisation_id,
-      "managing_organisation_id" => current_user.organisation.id,
       "created_by_id" => current_user.id,
     }
   end

app/controllers/sales_logs_controller.rb

@@ -43,11 +43,4 @@ class SalesLogsController < LogsController
   def permitted_log_params
     params.require(:sales_log).permit(SalesLog.editable_fields)
   end
-
-  def org_params
-    {
-      "owning_organisation_id" => current_user.organisation.id,
-      "created_by_id" => current_user.id,
-    }
-  end
 end

app/services/filter_service.rb

@@ -18,7 +18,7 @@ class FilterService
     end
     logs = logs.order(created_at: :desc)
     if user.support?
-      if logs&.first.lettings?
+      if logs.first&.lettings?
         logs.all.includes(:owning_organisation, :managing_organisation)
       else
         logs.all.includes(:owning_organisation)