Merge pull request #2694 from govuk-forms/remove-code-to-add-forms-to-default-group

Remove DefaultGroupService

Author: stephencdaly

app/controllers/account/names_controller.rb

@@ -13,7 +13,6 @@ def update
       @name_input = NameInput.new(account_name_input_params(current_user))
 
       if @name_input.submit
-        DefaultGroupService.new.create_user_default_trial_group!(current_user)
         redirect_to next_path
       else
         render :edit, status: :unprocessable_content

app/controllers/account/organisations_controller.rb

@@ -13,7 +13,6 @@ def update
       @organisation_input = OrganisationInput.new(account_organisation_input_params(current_user))
 
       if @organisation_input.submit
-        DefaultGroupService.new.create_user_default_trial_group!(current_user)
         redirect_to next_path
       else
         render :edit, status: :unprocessable_content

app/services/default_group_service.rb

@@ -1,13 +1,4 @@
 namespace :groups do
-  desc "Create default trial group for user who has forms not in a group"
-  task :create_user_default_trial_group, %i[user_id] => :environment do |_, args|
-    usage_message = "usage: rake create_user_default_trial_group[<user_id>]".freeze
-    abort usage_message if args[:user_id].blank?
-
-    user = User.find(args[:user_id])
-    DefaultGroupService.new.create_user_default_trial_group!(user)
-  end
-
   desc "Move all groups in one organisation to another"
   task :move_all_groups_between_organisations, %i[source_organisation_id target_organisation_id] => :environment do |_, args|
     task_name = "groups:move_all_groups_between_organisations"

lib/tasks/groups.rake

@@ -3,7 +3,6 @@
 feature "Add account organisation to user without organisation", type: :feature do
   let(:user) { create :user, :with_no_org, name: nil, terms_agreed_at: nil }
   let!(:organisation) { create :organisation }
-  let(:form_name) { "a form I created when I didn't have an organisation" }
 
   before do
     OmniAuth.config.test_mode = true
@@ -13,8 +12,6 @@
     )
 
     allow(Settings).to receive(:auth_provider).and_return("auth0")
-
-    create(:form, creator_id: user.id, name: form_name, created_at: "2024-10-08T07:31:15.762Z")
   end
 
   after do
@@ -33,8 +30,6 @@
     then_i_should_be_redirected_to_the_account_terms_of_use_page
     and_i_agree_to_the_terms_of_use
     then_i_should_be_redirected_to_my_original_destination
-    and_i_open_my_default_group
-    and_i_can_open_my_form
   end
 
 private
@@ -77,13 +72,4 @@ def and_i_fill_in_my_name
   def then_i_should_be_redirected_to_my_original_destination
     expect(page).to have_current_path(groups_path)
   end
-
-  def and_i_open_my_default_group
-    click_link("John Doe’s trial group")
-  end
-
-  def and_i_can_open_my_form
-    click_link("a form I created when I didn't have an organisation")
-    expect(page.find("h1")).to have_text "a form I created when I didn't have an organisation"
-  end
 end

spec/features/account/complete_user_account_spec.rb

@@ -33,13 +33,11 @@
   describe "PUT #update" do
     context "with valid params" do
       let(:valid_params) { { account_name_input: { name: "John Doe" } } }
-      let(:default_group_service) { instance_spy(DefaultGroupService) }
 
       before do
         # rubocop:disable RSpec/AnyInstance
         allow_any_instance_of(AfterSignInPathHelper).to receive(:after_sign_in_next_path).and_return("/next-path")
         # rubocop:enable RSpec/AnyInstance
-        allow(DefaultGroupService).to receive(:new).and_return(default_group_service)
       end
 
       it "updates the user's name" do
@@ -51,11 +49,6 @@
         put account_name_path, params: valid_params
         expect(response).to redirect_to("/next-path")
       end
-
-      it "calls create_user_default_trial_group!" do
-        put account_name_path, params: valid_params
-        expect(default_group_service).to have_received(:create_user_default_trial_group!)
-      end
     end
 
     context "with invalid params" do

spec/requests/account/names_controller_spec.rb

@@ -34,13 +34,11 @@
     context "with valid parameters" do
       let(:organisation) { create(:organisation) }
       let(:valid_params) { { account_organisation_input: { organisation_id: organisation.id } } }
-      let(:default_group_service) { instance_spy(DefaultGroupService) }
 
       before do
         # rubocop:disable RSpec/AnyInstance
         allow_any_instance_of(AfterSignInPathHelper).to receive(:after_sign_in_next_path).and_return("/next-path")
         # rubocop:enable RSpec/AnyInstance
-        allow(DefaultGroupService).to receive(:new).and_return(default_group_service)
       end
 
       it "updates the user's organisation" do
@@ -52,11 +50,6 @@
         put account_organisation_path, params: valid_params
         expect(response).to redirect_to("/next-path")
       end
-
-      it "calls create_user_default_trial_group!" do
-        put account_organisation_path, params: valid_params
-        expect(default_group_service).to have_received(:create_user_default_trial_group!)
-      end
     end
 
     context "with invalid parameters" do