[Data rearchitecture] sync with master

lib/importers/user_importer.rb

@@ -114,7 +114,7 @@ def self.get_global_id(username)
 
   def self.update_user_from_wiki(user, wiki)
     user_data = WikiApi.new(wiki).get_user_info(user.username)
-    return if user_data['missing']
+    return if user_data.nil? || user_data['missing']
     user.update!(username: user_data['name'],
                  registered_at: user_data['registration'],
                  global_id: user_data&.dig('centralids', 'CentralAuth'))

lib/wiki_api.rb

@@ -47,7 +47,7 @@ def get_user_info(username)
                    ususers: username,
                    usprop: 'centralids|registration' }
     user_data = mediawiki('query', user_query)
-    return unless user_data.data['users'].any?
+    return unless user_data&.data&.dig('users')&.any?
     user_data.data['users'][0]
   end
 

spec/lib/importers/user_importer_spec.rb

@@ -180,6 +180,16 @@
 
   describe '.update_user_from_wiki' do
     let(:course) { create(:course) }
+    let(:enwiki) { Wiki.get_or_create(language: 'en', project: 'wikipedia') }
+
+    context 'when get_user_info returns nil' do
+      it 'returns early without raising an error and does not update the user' do
+        user = create(:user, username: 'RageSoss')
+        allow_any_instance_of(WikiApi).to receive(:get_user_info).and_return(nil)
+        expect(user).not_to receive(:update!)
+        expect { described_class.update_user_from_wiki(user, enwiki) }.not_to raise_error
+      end
+    end
 
     it 'cleans up records when there are collisions' do
       VCR.use_cassette 'user/new_from_renamed_user' do
@@ -197,7 +207,6 @@
     it 'sets the registration date from English Wikipedia' do
       VCR.use_cassette 'user/enwiki_only_account' do
         user = create(:user, username: 'Brady2421')
-        enwiki = Wiki.get_or_create(language: 'en', project: 'wikipedia')
         described_class.update_user_from_wiki(user, enwiki)
         expect(user.registered_at).not_to be_nil
       end

spec/lib/wiki_api_spec.rb

@@ -169,6 +169,18 @@ class UnexpectedError < StandardError; end
     end
   end
 
+  describe '#get_user_info' do
+    let(:wiki) { Wiki.new(language: 'en', project: 'wikipedia') }
+
+    context 'when mediawiki query returns nil' do
+      it 'returns early without raising an error' do
+        allow_any_instance_of(described_class).to receive(:mediawiki).and_return(nil)
+        expect { described_class.new.get_user_info('Ragesoss') }.not_to raise_error
+        expect(described_class.new.get_user_info('Ragesoss')).to be_nil
+      end
+    end
+  end
+
   describe '#redirect?' do
     let(:wiki) { Wiki.new(language: 'en', project: 'wikipedia') }
     let(:subject) { described_class.new(wiki).redirect?(title) }