Refactor user data handling in Schools::DFESignInAPI::OrganisationUse…

…rs and update view to use new attributes

- Update specs

app/controllers/schools/users_controller.rb

@@ -1,7 +1,7 @@
 module Schools
   class UsersController < BaseController
     def index
-      @users = DFESignInAPI::OrganisationUsers.new(current_user.sub, current_school.urn).users
+      @users = DFESignInAPI::OrganisationUsers.new(current_user.sub, current_school.urn).users_as_invite_objects
       @dfe_sign_in_manage_users_url =
         Rails.application.config.x.dfe_sign_in_manage_users_url.presence
     end

app/services/schools/dfe_sign_in_api/organisation_users.rb

@@ -14,6 +14,20 @@ def ukprn
 
       def users
         response&.fetch('users', nil)
+        # users_as_invite_objects
+      end
+
+      def users_as_invite_objects
+        return [] if users.blank?
+
+        users.map do |user_data|
+          Schools::DFESignInAPI::UserInvite.new(
+            email: user_data['email'],
+            firstname: user_data['firstName'],
+            lastname: user_data['lastName'],
+            organisation_id: current_school_urn
+          )
+        end
       end
 
     private

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

@@ -42,8 +42,8 @@
         <tbody class="govuk-table__body">
           <% @users.each do |user| %>
             <tr class="govuk-table__row">
-              <td class="govuk-table__cell"><%= "#{user['firstName']} #{user['lastName']}" %></td>
-              <td class="govuk-table__cell"><%= user['email'] %></td>
+              <td class="govuk-table__cell"><%= "#{user.firstname} #{user.lastname}" %></td>
+              <td class="govuk-table__cell"><%= user.email %></td>
             </tr>
           <% end %>