Read affiliation from user on school user page (pupilfirst#1678)

- Fallback to organisation name when user affiliation is empty.

app/presenters/schools/users/show_presenter.rb

@@ -35,8 +35,8 @@ def courses_authored
             .order(name: :asc)
       end
 
-      def organisation_names
-        @organisation_names ||= user.organisation&.name
+      def affiliation
+        @affiliation ||= user.affiliation || user.organisation&.name
       end
 
       def current_standing

app/views/schools/users/show.html.erb

@@ -40,12 +40,12 @@
               </div>
             </div>
           <% end %>
-          <% if @presenter.organisation_names.present? %>
+          <% if @presenter.affiliation.present? %>
             <div class="flex items-center gap-3">
               <p class="text-xl text-gray-600"><i class="if i-school-light if-fw" ></i></p>
               <div>
                 <p class="text-sm text-gray-500"><%= t("schools.users.show.affiliation") %></p>
-                <p class="text-sm font-bold"><%= @presenter.organisation_names %></p>
+                <p class="text-sm font-bold"><%= @presenter.affiliation %></p>
               </div>
             </div>
           <% end %>

spec/system/school/users/users_show_spec.rb

@@ -17,6 +17,7 @@
            discord_user_id: Faker::Number.number(digits: 10).to_s,
            organisation: organisation
   end
+  let(:user_affiliated) { create :user, affiliation: Faker::Company.name }
 
   let(:course_1) { create :course, school: school }
   let(:course_2) { create :course, school: school }
@@ -48,6 +49,13 @@
     expect(page).to have_text("The page you were looking for doesn't exist!")
   end
 
+  scenario "user with affiliation filled" do
+    sign_in_user school_admin.user, referrer: school_user_path(user_affiliated)
+
+    expect(page).not_to have_text(organisation.name)
+    expect(page).to have_text(user_affiliated.affiliation)
+  end
+
   scenario "admin access user of same school" do
     sign_in_user school_admin.user, referrer: school_user_path(user)