Fix temporary adding of organisations

Previously
`User.temporarily_add_organisations_until_the_profile_app_is_updated`
did not mutate the `hash` argument and the callsites ignored the return
value and so the organisations were never added. This wasn't causing any
spec failures, because all the relevant stubbing was using users from
`spec/fixtures/users.json` all of which already had a value for the
"organisations" key set.

However, the real servers for `UserInfoApiClient.from_userinfo` &
`HydraPublicApiClient.from_token` currently do *not* return a value for
the "organisations" key. Indeed that's _why_ the
`User.temporarily_add_organisations_until_the_profile_app_is_updated`
method exists in the first place.

I've added examples for `UserInfoApiClient.from_userinfo` &
`HydraPublicApiClient.from_token` which make use of a new user in
`spec/fixtures/users.json` which has no value for the "organisations"
key set. These examples failed until I changed the implementation of
`User.temporarily_add_organisations_until_the_profile_app_is_updated` to
mutate the `hash` argument.

I think there might be an argument to remove the value for the
"organisations" key for all users in `spec/fixtures/users.json`, but
this will do for now.

Author: floehopper

app/models/user.rb

@@ -114,6 +114,6 @@ def self.temporarily_add_organisations_until_the_profile_app_is_updated(hash)
     return hash if hash.key?('organisations')
 
     # Use the same organisation ID as the one from users.json for now.
-    hash.merge('organisations' => { '12345678-1234-1234-1234-123456789abc' => hash['roles'] })
+    hash.merge!('organisations' => { '12345678-1234-1234-1234-123456789abc' => hash['roles'] })
   end
 end

spec/fixtures/users.json

@@ -62,6 +62,24 @@
       "organisations": {
         "12345678-1234-1234-1234-123456789abc": "school-student"
       }
+    },
+    {
+      "id": "33333333-3333-3333-3333-333333333333",
+      "email": null,
+      "username": "student456",
+      "parentalEmail": null,
+      "name": "Student Without Organisations",
+      "nickname": "SWO",
+      "country": "United Kingdom",
+      "country_code": "GB",
+      "postcode": null,
+      "dateOfBirth": null,
+      "verifiedAt": "2024-01-01T12:00:00.000Z",
+      "createdAt": "2024-01-01T12:00:00.000Z",
+      "updatedAt": "2024-01-01T12:00:00.000Z",
+      "discardedAt": null,
+      "lastLoggedInAt": "2024-01-01T12:00:00.000Z",
+      "roles": "school-student"
     }
   ]
 }

spec/models/user_spec.rb

@@ -50,11 +50,56 @@
     end
   end
 
+  describe '.from_userinfo' do
+    subject(:users) { described_class.from_userinfo(ids:) }
+
+    let(:ids) { ['00000000-0000-0000-0000-000000000000'] }
+    let(:user) { users.first }
+
+    before do
+      stub_user_info_api
+    end
+
+    it 'returns an Array' do
+      expect(users).to be_an Array
+    end
+
+    it 'returns an array of instances of the described class' do
+      expect(user).to be_a described_class
+    end
+
+    it 'returns a user with the correct ID' do
+      expect(user.id).to eq '00000000-0000-0000-0000-000000000000'
+    end
+
+    it 'returns a user with the correct name' do
+      expect(user.name).to eq 'School Owner'
+    end
+
+    it 'returns a user with the correct email' do
+      expect(user.email).to eq '[email protected]'
+    end
+
+    it 'returns a user with the correct organisations' do
+      expect(user.organisations).to eq(organisation_id => 'school-owner')
+    end
+
+    context 'when no organisations are returned' do
+      let(:ids) { ['33333333-3333-3333-3333-333333333333'] } # student without organisations
+
+      it 'returns a user with the correct organisations' do
+        expect(user.organisations).to eq(organisation_id => 'school-student')
+      end
+    end
+  end
+
   describe '.from_token' do
     subject(:user) { described_class.from_token(token: UserProfileMock::TOKEN) }
 
+    let(:user_index) { 0 }
+
     before do
-      stub_hydra_public_api
+      stub_hydra_public_api(user_index:)
     end
 
     it 'returns an instance of the described class' do
@@ -77,6 +122,14 @@
       expect(user.organisations).to eq(organisation_id => 'school-owner')
     end
 
+    context 'when no organisations are returned' do
+      let(:user_index) { 3 } # student without organisations
+
+      it 'returns a user with the correct organisations' do
+        expect(user.organisations).to eq(organisation_id => 'school-student')
+      end
+    end
+
     context 'when BYPASS_AUTH is true' do
       around do |example|
         ClimateControl.modify(BYPASS_AUTH: 'true') do