Teams - user updates and deletion

app/jobs/user_deletion_job.rb

@@ -18,12 +18,10 @@ class UserDeletionJob < ApplicationJob
   )
 
   def perform(user, cloud_service_config, **options)
-    # If the user doesn't have any cloud or billing IDs we can just delete it
+    # If the user doesn't have a cloud ID we can just delete it
     # without involving the middleware.
-    if user.cloud_user_id.nil? && user.project_id.nil? && user.billing_acct_id.nil?
-      user.destroy!
-      return
-    end
+    return user.destroy! if user.cloud_user_id.nil?
+
     runner = Runner.new(
       user: user,
       cloud_service_config: cloud_service_config,
@@ -70,9 +68,7 @@ def body
           project_id: @cloud_service_config.admin_project_id,
         },
         user_info: {
-          billing_acct_id: @user.billing_acct_id,
           cloud_user_id: @user.cloud_user_id,
-          project_id: @user.project_id,
         }
       }
     end

app/jobs/user_update_job.rb

@@ -6,10 +6,9 @@ class UserUpdateJob < ApplicationJob
   retry_on ::Faraday::Error, wait: :polynomially_longer, attempts: RETRY_ATTEMPTS
 
   def perform(user, changes, cloud_service_config, **options)
-    # If the user doesn't have any cloud or billing IDs there is no need to involve the middleware.
-    if user.cloud_user_id.nil? && user.billing_acct_id.nil?
-      return
-    end
+    # If the user doesn't have a cloud ID there is no need to involve the middleware.
+    return if user.cloud_user_id.nil?
+
     runner = Runner.new(
       user: user,
       changes: changes,
@@ -58,7 +57,6 @@ def body
           project_id: @cloud_service_config.admin_project_id,
         },
         user_info: {
-          billing_acct_id: @user.billing_acct_id,
           cloud_user_id: @user.cloud_user_id,
           new_data: {}.tap do |h|
             h[:email] = @user.email if @changes[:email]

app/presenters/user_presenter.rb

@@ -17,8 +17,7 @@ def status
   end
 
   def delete_confirmation_message
-    "Are you sure you want to delete user #{o.name} (#{o.login})?" \
-      " This will delete all of their racks and devices."
+    "Are you sure you want to delete user #{o.name} (#{o.login})?"
   end
 
   def team_role_list

spec/jobs/user_deletion_job_spec.rb

@@ -31,11 +31,9 @@
       })
     end
 
-    it "contains the user's cloud env and billing ids" do
+    it "contains the user's cloud env id" do
       expect(subject[:user_info]).to be_a Hash
       expect(subject[:user_info][:cloud_user_id]).to eq user.cloud_user_id
-      expect(subject[:user_info][:project_id]).to eq user.project_id
-      expect(subject[:user_info][:billing_acct_id]).to eq user.billing_acct_id
     end
   end
 

spec/jobs/user_update_job_spec.rb

@@ -32,10 +32,9 @@
       })
     end
 
-    it "contains the user's cloud env and billing ids" do
+    it "contains the user's cloud env id" do
       expect(subject[:user_info]).to be_a Hash
       expect(subject[:user_info][:cloud_user_id]).to eq user.cloud_user_id
-      expect(subject[:user_info][:billing_acct_id]).to eq user.billing_acct_id
     end
 
     [

spec/system/users/edit_user_spec.rb

@@ -13,7 +13,7 @@
   end
 
   describe "form elements" do
-    context "when user does not have cloud and biling IDs" do
+    context "when user does not have a cloud ID" do
       let(:user) { create(:user) }
 
       it "contains expected fields" do
@@ -22,51 +22,33 @@
         expect(form).to have_field("Name", with: user.name)
         expect(form).to have_field("Cloud User ID")
         expect(form.find_field("Cloud User ID").text).to be_blank
-        expect(form.find_field("Project ID").text).to be_blank
-        expect(form.find_field("Billing Account ID").text).to be_blank
       end
 
-      it "contains the expected hints" do
+      it "contains the expected hint" do
         visit edit_user_path(user)
         form = find("form[id='edit_user_#{user.id}']")
-        hints = [
-          { label: "Cloud User ID", hint_text: /cloud user ID will be updated automatically/ },
-          { label: "Project ID", hint_text: /project ID will be updated automatically/ },
-          { label: "Billing Account ID", hint_text: /billing account ID will be updated automatically/ },
-        ]
-        hints.each do |hint|
-          field = form.find_field(hint[:label])
-          expect(field).to have_sibling(".hint")
-          expect(field.sibling(".hint")).to have_text(hint[:hint_text])
-        end
+        field = form.find_field("Cloud User ID")
+        expect(field).to have_sibling(".hint")
+        expect(field.sibling(".hint")).to have_text(/cloud user ID will be updated automatically/)
       end
     end
 
-    context "when user has cloud and biling IDs" do
+    context "when user has a cloud ID" do
       let(:user) { create(:user, :with_openstack_account) }
 
       it "contains expected fields" do
         visit edit_user_path(user)
         form = find("form[id='edit_user_#{user.id}']")
         expect(form).to have_field("Name", with: user.name)
         expect(form).to have_field("Cloud User ID", with: user.cloud_user_id)
-        expect(form).to have_field("Project ID", with: user.project_id)
-        expect(form).to have_field("Billing Account ID", with: user.billing_acct_id)
       end
 
-      it "contains the expected hints" do
+      it "contains the expected hint" do
         visit edit_user_path(user)
         form = find("form[id='edit_user_#{user.id}']")
-        hints = [
-          { label: "Cloud User ID", hint_text: /Changing the user's cloud user ID/ },
-          { label: "Project ID", hint_text: /Changing the user's project ID/ },
-          { label: "Billing Account ID", hint_text: /Changing the user's billing account ID/ },
-        ]
-        hints.each do |hint|
-          field = form.find_field(hint[:label])
-          expect(field).to have_sibling(".hint")
-          expect(field.sibling(".hint")).to have_text(hint[:hint_text])
-        end
+        field = form.find_field("Cloud User ID")
+        expect(field).to have_sibling(".hint")
+        expect(field.sibling(".hint")).to have_text(/Changing the user's cloud user ID/)
       end
     end
   end
@@ -77,39 +59,34 @@
     context "with valid values" do
       it "updates the expected fields" do
         expect(user.cloud_user_id).to be_nil
-        expect(user.project_id).to be_nil
-        expect(user.billing_acct_id).to be_nil
 
         visit edit_user_path(user)
         form = find("form[id='edit_user_#{user.id}']")
         form.fill_in "Cloud User ID", with: "my new cloud user id"
-        form.fill_in "Project ID", with: "my new project id"
         form.click_on "Update User"
 
         expect(page).to have_text "Successfully updated user"
         visit edit_user_path(user)
         form = find("form[id='edit_user_#{user.id}']")
         expect(form).to have_field("Cloud User ID", with: "my new cloud user id")
-        expect(form).to have_field("Project ID", with: "my new project id")
-        expect(form).to have_field("Billing Account ID", with: "")
       end
     end
 
     context "with invalid values" do
       it "displays the errors and keeps the user's input" do
-        expect(user.project_id).to be_nil
+        expect(user.cloud_user_id).to be_nil
 
         visit edit_user_path(user)
         form = find("form[id='edit_user_#{user.id}']")
         form.fill_in "Name", with: ""
-        form.fill_in "Project ID", with: "my new project id"
+        form.fill_in "Cloud User ID", with: "my new project id"
         form.click_on "Update User"
 
         expect(page).to have_text "Unable to update user"
         form = find("form[id='edit_user_#{user.id}']")
         expect(form).to have_field("Name", with: "")
         expect(form.find_field("Name")).to have_sibling(".error", text: "can't be blank")
-        expect(form).to have_field("Project ID", with: "my new project id")
+        expect(form).to have_field("Cloud User ID", with: "my new project id")
       end
     end
   end