Merge pull request #4072 from cancelei/4066-add-partner-users-name

4066  - Add Partner User's Name when setting up new users

app/controllers/partners_controller.rb

@@ -131,7 +131,8 @@ def invite
 
   def invite_partner_user
     partner = current_organization.partners.find(params[:partner])
-    UserInviteService.invite(email: params[:email],
+    UserInviteService.invite(name: params[:name],
+      email: params[:email],
       roles: [Role::PARTNER],
       resource: partner)
 

app/helpers/dashboard_helper.rb

@@ -41,7 +41,7 @@ def future_distributed
   end
 
   def recently_added_user_display_text(user)
-    (user.name == "Name Not Provided") ? user.email : user.name
+    (user.name.blank? || user.name == "Name Not Provided") ? user.email : user.name
   end
 
   private

app/services/user_invite_service.rb

@@ -26,7 +26,7 @@ def self.invite(email:, resource:, name: nil, roles: [], force: false)
     end
 
     User.invite!(email: email) do |user1|
-      user1.name = name if name # Does this get persisted somewhere up the line? - CLF 20230203
+      user1.name = name.presence || "Name Not Provided"
       add_roles(user1, resource: resource, roles: roles)
       user1.skip_invitation = user1.errors[:email].any?
     end

app/views/partners/show.html.erb

@@ -304,7 +304,11 @@
             <%= form_tag invite_partner_user_partner_path do %>
               <div class="input-group">
                 <span class="input-group-text" id="spn_env_fa_icon"><%= fa_icon "envelope" %></span>
-                <input type="email" name="email" class="form-control" placeholder="Email" aria-describedby="spn_env_fa_icon" autocomplete="on">
+                <input type="email" name="email" class="form-control" placeholder="Email" aria-describedby="spn_env_fa_icon" required autocomplete="off">
+              </div>
+              <div class="input-group mt-3">
+                <span class="input-group-text" id="spn_env_fa_icon"><%= fa_icon "user" %></span>
+                <input type="text" name="name" class="form-control" placeholder="Name" aria-describedby="name_icon" required autocomplete="off">
                 <%= hidden_field_tag :partner, @partner.id %><br>
               </div>
               <br>
@@ -331,7 +335,7 @@
             <%= form_tag partner_user_reset_password_users_path do %>
               <div class="input-group">
                 <span class="input-group-text" id="spn_env_fa_icon"><%= fa_icon "envelope" %></span>
-                <input type="email" name="email" class="form-control" placeholder="Email" aria-describedby="spn_env_fa_icon" autocomplete="on">
+                <input type="email" name="email" class="form-control" placeholder="Email" aria-describedby="spn_env_fa_icon" autocomplete="off">
                 <%= hidden_field_tag :partner_id, @partner.id %><br>
               </div>
               <br>

spec/requests/partners_requests_spec.rb

@@ -285,9 +285,10 @@
   end
 
   describe "POST #invite_partner_user" do
-    subject { -> { post invite_partner_user_partner_path(default_params.merge(id: partner.id, partner: partner.id, email: email)) } }
+    subject { -> { post invite_partner_user_partner_path(default_params.merge(id: partner.id, partner: partner.id, email: email, name: name)) } }
     let(:partner) { create(:partner, organization: @organization) }
     let(:email) { Faker::Internet.email }
+    let(:name) { Faker::Name.unique.name }
 
     context 'when the invite successfully' do
       before do
@@ -297,6 +298,7 @@
         subject.call
         expect(UserInviteService).to have_received(:invite).with(
           email: email,
+          name: name,
           roles: [Role::PARTNER],
           resource: partner
         )

spec/services/user_invite_service_spec.rb

@@ -50,5 +50,52 @@
       expect(result).to have_role(Role::ORG_ADMIN, organization)
       expect(result).not_to have_role(Role::PARTNER, :any)
     end
+
+    it "should create the user without name with role" do
+      expect {
+        @result = UserInviteService.invite(
+          email: "email2@email.com",
+          roles: [Role::PARTNER],
+          resource: @partner
+        )
+      }.to change { ActionMailer::Base.deliveries.count }.by(1)
+
+      user = User.find_by(email: "email2@email.com")
+      expect(user.name).to eq("Name Not Provided")
+      expect(user.email).to eq("email2@email.com")
+      expect(user).to have_role(Role::PARTNER, @partner)
+    end
+  end
+
+  it "should invite a user with the partner role" do
+    expect {
+      @result = UserInviteService.invite(
+        name: "Partner User",
+        email: "partner@example.com",
+        roles: [Role::PARTNER],
+        resource: @partner
+      )
+    }.to change { ActionMailer::Base.deliveries.count }.by(1)
+
+    user = User.find_by(email: "partner@example.com")
+    expect(user.name).to eq("Partner User")
+    expect(user).not_to be_nil
+    expect(user).to have_role(Role::PARTNER, @partner)
+  end
+
+  it "should create the user without a name with default role" do
+    result = nil
+    expect {
+      result = described_class.invite(
+        name: nil,
+        email: "email2@example.com",
+        roles: [Role::ORG_USER],
+        resource: organization
+      )
+    }.to change(ActionMailer::Base.deliveries, :count).by(1)
+
+    expect(result.reload.name).to eq("Name Not Provided")
+    expect(result.email).to eq("email2@example.com")
+    expect(result.has_role?(:org_user, organization)).to be true
   end
 end