From 6f9483bbaf63c2e1980f89190a24bb4055385547 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Thu, 6 Mar 2025 09:55:08 +0000
Subject: [PATCH] Fix bug on existing orgs when group remains unchanged

---
 app/controllers/organisations_controller.rb | 4 +++-
 app/models/organisation.rb                  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index d2154a824..05130dc5a 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -128,7 +128,9 @@ class OrganisationsController < ApplicationController
 
   def update
     if (current_user.data_coordinator? && org_params[:active].nil?) || current_user.support?
-      @organisation.group = org_params[:group_member] ? helpers.assign_group_number(@organisation.id, org_params[:group_member_id]) : nil
+      if org_params[:group_member] && org_params[:group_member_id]
+        @organisation.group = helpers.assign_group_number(@organisation.id, org_params[:group_member_id])
+      end
       if @organisation.update(org_params)
         case org_params[:active]
         when "false"
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 9acea5138..090557025 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -230,6 +230,8 @@ class Organisation < ApplicationRecord
 private
 
   def validate_profit_status
+    return if profit_status.nil?
+
     if provider_type == "LA" && profit_status != "local_authority"
       errors.add(:profit_status, I18n.t("validations.organisation.profit_status.must_be_LA"))
     end