Refactor: Use 'full_name' attribute for user full names instead of st… (

rubyforgood#761) * Refactor: Use 'full_name' attribute for user full names instead of string concatenation * Fix broken tests & linters
jaxonavena · May 30, 2024 · 4762c1a · 4762c1a
1 parent 5eb4869
commit 4762c1a
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 16 deletions.
diff --git a/app/helpers/avatar_helper.rb b/app/helpers/avatar_helper.rb
@@ -4,7 +4,7 @@ def render_avatar_partial(xl = false)
 
     render partial_name do |partial|
       partial.alt "#{current_user.first_name.first.upcase} Avatar"
-      partial.initials "#{current_user.first_name.first}#{current_user.last_name.first}".upcase
+      partial.initials current_user.name_initials.to_s
 
       if current_user.avatar.attached?
         partial.avatar do

diff --git a/app/models/adopter_application.rb b/app/models/adopter_application.rb
@@ -71,7 +71,7 @@ def self.retire_applications(pet_id:)
   end
 
   def applicant_name
-    "#{adopter_foster_account.user.last_name}, #{adopter_foster_account.user.first_name}"
+    adopter_foster_account.user.full_name.to_s
   end
 
   def withdraw

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -100,4 +100,8 @@ def full_name(format = :default)
       raise ArgumentError, "Unsupported format: #{format}"
     end
   end
+
+  def name_initials
+    full_name.split.map { |part| part[0] }.join.upcase
+  end
 end
diff --git a/app/views/layouts/adopter_foster_dashboard.html.erb b/app/views/layouts/adopter_foster_dashboard.html.erb
@@ -21,7 +21,7 @@
                       <%= render_avatar_partial(xl: true) %>
                     </div>
                     <div class="lh-1">
-                      <h2 class="mb-0"><%= "#{current_user.first_name} #{current_user.last_name}" %></h2>
+                      <h2 class="mb-0"><%= "#{current_user.full_name}" %></h2>
                     </div>
                   </div>
                   <div>

diff --git a/app/views/layouts/dashboard.html.erb b/app/views/layouts/dashboard.html.erb
@@ -29,7 +29,7 @@
                       <div class="d-flex">
                         <%= render_avatar_partial %>
                         <div class="ms-3 lh-1">
-                          <h5 class="mb-1"><%= "#{current_user.first_name} #{current_user.last_name}" %></h5>
+                          <h5 class="mb-1"><%= "#{current_user.full_name}" %></h5>
                           <p class="mb-0 text-muted"><%= current_user.email %></p>
                         </div>
                       </div>

diff --git a/app/views/organizations/staff/adoption_application_reviews/edit.html.erb b/app/views/organizations/staff/adoption_application_reviews/edit.html.erb
@@ -1,7 +1,6 @@
 <%= render "components/dashboard/page" do |p| %>
   <% p.header_title do %>
-    <%= @application.adopter_foster_account.user.first_name %>
-    <%= @application.adopter_foster_account.user.last_name %>'s application for
+    <%= @application.adopter_foster_account.user.full_name %>'s application for
     <%= @application.pet.name %>
   <% end %>
 

diff --git a/app/views/organizations/staff/fosterers/index.html.erb b/app/views/organizations/staff/fosterers/index.html.erb
@@ -44,7 +44,7 @@
                             <span class="status bg-success"></span>
                           </a>
                         </div>
-                        <h4 class="mb-0"><%= "#{fosterer.user.first_name} #{fosterer.user.last_name}" %></h4>
+                        <h4 class="mb-0"><%= "#{fosterer.user.full_name}" %></h4>
                       </div>
                       <div class="d-flex justify-content-between border-bottom py-2">
                         <span>Joined</span>
@@ -84,7 +84,7 @@
                               <span class="status bg-success"></span>
                             </a>
                           </div>
-                          <h5 class="mb-0"><%= "#{fosterer.user.first_name} #{fosterer.user.last_name}" %></h5>
+                          <h5 class="mb-0"><%= "#{fosterer.user.full_name}" %></h5>
                         </div>
                       </td>
                       <td>

diff --git a/app/views/organizations/staff/profile_reviews/show.html.erb b/app/views/organizations/staff/profile_reviews/show.html.erb
@@ -5,7 +5,7 @@
     <!--page heading-->
     <div class="text-center mb-5">
       <h1 class="section-heading text-uppercase underline">
-        <%= @adopter_foster_profile.adopter_foster_account.user.first_name %> <%= @adopter_foster_profile.adopter_foster_account.user.last_name %>'s Profile
+        <%= @adopter_foster_profile.adopter_foster_account.user.full_name %>'s Profile
       </h1>
     </div>
 

diff --git a/app/views/organizations/staff/staff/index.html.erb b/app/views/organizations/staff/staff/index.html.erb
@@ -44,7 +44,7 @@
                             <span class="status bg-success"></span>
                           </a>
                         </div>
-                        <h4 class="mb-0"><%= "#{staff.user.first_name} #{staff.user.last_name}" %></h4>
+                        <h4 class="mb-0"><%= "#{staff.user.full_name}" %></h4>
                       </div>
                       <div class="d-flex justify-content-between border-bottom py-2 mt-4">
                         <span>Role</span>
@@ -94,7 +94,7 @@
                               <span class="status bg-success"></span>
                             </a>
                           </div>
-                          <h5 class="mb-0"><%= "#{staff.user.first_name} #{staff.user.last_name}" %></h5>
+                          <h5 class="mb-0"><%= "#{staff.user.full_name}" %></h5>
                         </div>
                       </td>
                       <td>

diff --git a/app/views/sign_up_mailer/admin_notification_new_staff.html.erb b/app/views/sign_up_mailer/admin_notification_new_staff.html.erb
@@ -8,8 +8,7 @@
 
     <p>
       Name:
-      <%= @user.first_name %>
-      <%= @user.last_name %>      
+      <%= @user.full_name %>
     </p>
 
     <p>

diff --git a/app/views/sign_up_mailer/admin_notification_new_staff.text.erb b/app/views/sign_up_mailer/admin_notification_new_staff.text.erb
@@ -1,7 +1,7 @@
 New Staff Sign Up
 ===============================================
 
-Name: <%= "#{@user.first_name} #{@user.last_name}"  %>    
+Name: <%= "#{@user.full_name}"  %>    
 Email: <%= @user.email %>    
 user_id: <%= @user.id %>    
 

diff --git a/test/controllers/organizations/staff/adoption_application_reviews_controller_test.rb b/test/controllers/organizations/staff/adoption_application_reviews_controller_test.rb
@@ -114,7 +114,7 @@ class Organizations::Staff::AdoptionApplicationReviewsControllerTest < ActionDis
       should "return applications for a specific applicant name" do
         get staff_adoption_application_reviews_url, params: {q: {adopter_applications_applicant_name_i_cont: "Attenborough"}}
         assert_response :success
-        assert_select "a.link-underline.link-underline-opacity-0", text: "Attenborough, David"
+        assert_select "a.link-underline.link-underline-opacity-0", text: "David Attenborough"
         refute_match "Goodall, Jane", @response.body
       end
     end

diff --git a/test/integration/adoption_application_reviews_test.rb b/test/integration/adoption_application_reviews_test.rb
@@ -78,7 +78,7 @@ class AdoptionApplicationReviewsTest < ActionDispatch::IntegrationTest
   def verify_application_elements(application)
     assert_select "tr[id='adopter_application_#{application.id}']" do
       adopter = application.adopter_foster_account.user
-      assert_select "a", text: "#{adopter.last_name}, #{adopter.first_name}"
+      assert_select "a", text: "#{adopter.first_name} #{adopter.last_name}"
       assert_select "button", text: application.status.titleize
     end
   end