More clean up with GeoNodeStatus

ee/app/models/geo_node_status.rb

@@ -159,7 +159,7 @@ class GeoNodeStatus < ActiveRecord::Base
   def storage_shards_match?
     return unless Gitlab::Geo.primary?
 
-    shards_match?(storage_shards.as_json, current_shards.as_json)
+    shards_match?(current_shards, primary_shards)
   end
 
   def [](key)
@@ -169,7 +169,15 @@ class GeoNodeStatus < ActiveRecord::Base
   private
 
   def current_shards
-    StorageShardSerializer.new.represent(StorageShard.all)
+    serialize_storage_shards(storage_shards)
+  end
+
+  def primary_shards
+    serialize_storage_shards(StorageShard.all)
+  end
+
+  def serialize_storage_shards(shards)
+    StorageShardSerializer.new.represent(shards).as_json
   end
 
   def shards_match?(first, second)

spec/ee/spec/models/geo_node_status_spec.rb

@@ -425,22 +425,22 @@ describe GeoNodeStatus, :geo do
 
     it 'returns false if the storage shards do not match' do
       status = create(:geo_node_status)
-      status.storage_shards.first['name'] = 'broken-shard'
-      data = status.as_json
+      data = GeoNodeStatusSerializer.new.represent(status).as_json
+      data['storage_shards'].first['name'] = 'broken-shard'
 
       result = GeoNodeStatus.from_json(data)
 
-      expect(status.storage_shards_match?).to be false
+      expect(result.storage_shards_match?).to be false
     end
 
     it 'returns true if the storage shards match in different order' do
       status = create(:geo_node_status)
 
       status.storage_shards.shuffle!
-      data = status.as_json
+      data = GeoNodeStatusSerializer.new.represent(status).as_json
       result = GeoNodeStatus.from_json(data)
 
-      expect(status.storage_shards_match?).to be true
+      expect(result.storage_shards_match?).to be true
     end
   end
 end

spec/factories/geo_node_statuses.rb

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :geo_node_status do
     sequence(:id)
     geo_node
-    storage_shards { StorageShardSerializer.new.represent(StorageShard.all) }
+    storage_shards { StorageShard.all }
 
     trait :healthy do
       health nil