From 2762d20ca991ff1830a26425f4813946b80e24d0 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 24 Mar 2025 17:21:40 +0000
Subject: [PATCH] Move methods to controller

---
 app/controllers/organisations_controller.rb | 15 +++++++++++++--
 app/helpers/organisations_helper.rb         | 19 -------------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index 5fec5dc55..d2546dd28 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -91,7 +91,7 @@ class OrganisationsController < ApplicationController
     selected_rent_periods = rent_period_params[:rent_periods].compact_blank
     @organisation = Organisation.new(org_params)
     if @organisation.save
-      @organisation.update(group: helpers.assign_group_number(@organisation.id, org_params[:group_member_id])) if org_params[:group_member]
+      @organisation.update(group: assign_group_number(@organisation.id, org_params[:group_member_id])) if org_params[:group_member]
       OrganisationRentPeriod.transaction do
         selected_rent_periods.each { |period| OrganisationRentPeriod.create!(organisation: @organisation, rent_period: period) }
       end
@@ -129,7 +129,7 @@ class OrganisationsController < ApplicationController
   def update
     if (current_user.data_coordinator? && org_params[:active].nil?) || current_user.support?
       if org_params[:group_member] && org_params[:group_member_id]
-        @organisation.group = helpers.assign_group_number(@organisation.id, org_params[:group_member_id])
+        @organisation.group = assign_group_number(@organisation.id, org_params[:group_member_id])
       end
       if @organisation.update(org_params)
         case org_params[:active]
@@ -390,6 +390,17 @@ private
     end
   end
 
+  def assign_group_number(current_org_id, selected_org_id)
+    selected_org = Organisation.find_by(id: selected_org_id)
+    if selected_org&.group.present?
+      selected_org.group
+    else
+      next_group_number = next_available_group_number
+      selected_org.update!(group_member: true, group_member_id: current_org_id, group: next_group_number) if selected_org
+      next_group_number
+    end
+  end
+
   def next_available_group_number
     Organisation.maximum(:group).to_i + 1
   end
diff --git a/app/helpers/organisations_helper.rb b/app/helpers/organisations_helper.rb
index c1cc08420..cbd4b5646 100644
--- a/app/helpers/organisations_helper.rb
+++ b/app/helpers/organisations_helper.rb
@@ -94,10 +94,6 @@ module OrganisationsHelper
     " (GROUP#{org.oldest_group_member&.group})"
   end
 
-  def group_organisation_options_group(org)
-    org.oldest_group_member&.group || next_available_group_number
-  end
-
   def profit_status_options(provider_type = nil)
     null_option = [OpenStruct.new(id: "", name: "Select an option")]
     profit_statuses = Organisation::PROFIT_STATUS.map do |key, _value|
@@ -113,19 +109,4 @@ module OrganisationsHelper
 
     null_option + profit_statuses
   end
-
-  def assign_group_number(current_org_id, selected_org_id)
-    selected_org = Organisation.find_by(id: selected_org_id)
-    if selected_org&.group.present?
-      selected_org.group
-    else
-      next_group_number = next_available_group_number
-      selected_org.update!(group_member: true, group_member_id: current_org_id, group: next_group_number) if selected_org
-      next_group_number
-    end
-  end
-
-  def next_available_group_number
-    Organisation.maximum(:group).to_i + 1
-  end
 end