Resolves #5153: Filter by user should show email if no name (#5156)

* feat: add method preferred_name

* feat: add predferred_name to view

* feat: add tests for preferred_name method in user model

* fix: correct indentation for let statements in user_spec

* Add user filter dropdown tests for preferred names in adjustments index

* Remove redundant test for current user's preferred name in user filter dropdown

Author: rrg1459

app/models/user.rb

@@ -95,6 +95,10 @@ def display_name
     name.presence || "Name Not Provided"
   end
 
+  def preferred_name
+    name.presence || email
+  end
+
   def formatted_email
     email.present? ? "#{name} <#{email}>" : ""
   end

app/views/adjustments/index.html.erb

@@ -37,7 +37,7 @@
 
                 </div>
                 <div class="form-group col-lg-4 col-md-4 col-sm-6 col-xs-12">
-                   <%= filter_select(scope: :by_user, collection: @users, key: :id, value: :name, selected: @selected_user) %>
+                  <%= filter_select(scope: :by_user, collection: @users, key: :id, value: :preferred_name, selected: @selected_user) %>
                 </div>
                 <div class="form-group col-lg-4 col-md-4 col-sm-6 col-xs-12">
                   <%= label_tag "Date Range" %>

spec/models/user_spec.rb

@@ -64,6 +64,35 @@
     end
   end
 
+  describe '#preferred_name' do
+    let(:user) { create(:user, name: name, email: email) }
+    let(:email) { '[email protected]' }
+
+    context 'when name is present' do
+      let(:name) { 'John Smith' }
+
+      it 'returns the name' do
+        expect(user.preferred_name).to eq('John Smith')
+      end
+    end
+
+    context 'when name is nil' do
+      let(:name) { nil }
+
+      it 'returns the email' do
+        expect(user.preferred_name).to eq('[email protected]')
+      end
+    end
+
+    context 'when name is an empty string' do
+      let(:name) { '' }
+
+      it 'returns the email' do
+        expect(user.preferred_name).to eq('[email protected]')
+      end
+    end
+  end
+
   describe "Scopes >" do
     describe "->alphabetized" do
       let!(:z_name_user) { create(:user, name: 'Zachary') }

spec/requests/adjustments_requests_spec.rb

@@ -68,6 +68,19 @@
             end
           end
         end
+
+        context 'dropdown for user filter' do
+          let!(:another_user) { create(:user, organization: organization, name: "Alice Smith", email: "[email protected]") }
+          let!(:user_without_name) { create(:user, organization: organization, name: nil, email: "[email protected]") }
+
+          before { get adjustments_path } # Make the request once for this context
+
+          it "displays the preferred name of users in the dropdown" do
+            expect(response.body).to include("<option value=\"#{another_user.id}\">#{another_user.preferred_name}</option>")
+            expect(response.body).to include("<option value=\"#{user_without_name.id}\">#{user_without_name.preferred_name}</option>")
+            expect(response.body).to include("<option value=\"#{user.id}\">#{user.preferred_name}</option>")
+          end
+        end
       end
 
       context "csv" do