Refactor Upload methods

Shorten names that are already unambiguous.

ee/app/finders/geo/attachment_registry_finder.rb

@@ -47,7 +47,7 @@ module Geo
     # rubocop: disable CodeReuse/ActiveRecord
     def find_unsynced(batch_size:, except_file_ids: [])
       attachments
-        .missing_file_registry
+        .missing_registry
         .id_not_in(except_file_ids)
         .limit(batch_size)
     end
@@ -56,7 +56,7 @@ module Geo
     # rubocop: disable CodeReuse/ActiveRecord
     def find_migrated_local(batch_size:, except_file_ids: [])
       all_attachments
-        .inner_join_file_registry
+        .inner_join_registry
         .with_files_stored_remotely
         .id_not_in(except_file_ids)
         .limit(batch_size)
@@ -95,7 +95,7 @@ module Geo
     end
 
     def registries_for_attachments
-      attachments.inner_join_file_registry
+      attachments.inner_join_registry
     end
   end
 end

ee/app/models/geo/fdw/upload.rb

@@ -15,17 +15,17 @@ module Geo
 
       class << self
         def for_model(model)
-          inner_join_file_registry
+          inner_join_registry
             .where(model_id: model.id, model_type: model.class.name)
         end
 
-        def inner_join_file_registry
+        def inner_join_registry
           joins(:registry)
         end
 
-        def missing_file_registry
-          left_outer_join_file_registry
-            .where(file_registry_table[:id].eq(nil))
+        def missing_registry
+          left_outer_join_registry
+            .where(registry_table[:id].eq(nil))
         end
 
         # Searches for a list of uploads based on the query given in `query`.
@@ -40,15 +40,15 @@ module Geo
 
         private
 
-        def file_registry_table
+        def registry_table
           Geo::UploadRegistry.arel_table
         end
 
-        def left_outer_join_file_registry
+        def left_outer_join_registry
           join_statement =
             arel_table
-              .join(file_registry_table, Arel::Nodes::OuterJoin)
-              .on(arel_table[:id].eq(file_registry_table[:file_id]))
+              .join(registry_table, Arel::Nodes::OuterJoin)
+              .on(arel_table[:id].eq(registry_table[:file_id]))
 
           joins(join_statement.join_sources)
         end

ee/lib/gitlab/geo/fdw/upload_registry_query_builder.rb

@@ -17,8 +17,8 @@ module Gitlab
             query
               .joins(fdw_inner_join_uploads)
               .where(
-                fdw_upload_table[:model_id].eq(model.id)
-                  .and(fdw_upload_table[:model_type].eq(model.class.name))
+                fdw_table[:model_id].eq(model.id)
+                  .and(fdw_table[:model_type].eq(model.class.name))
               )
           )
         end
@@ -27,21 +27,21 @@ module Gitlab
         private
 
         def base
-          ::Geo::UploadRegistry.select(file_registry_table[Arel.star])
+          ::Geo::UploadRegistry.select(registry_table[Arel.star])
         end
 
-        def file_registry_table
+        def registry_table
           ::Geo::UploadRegistry.arel_table
         end
 
-        def fdw_upload_table
+        def fdw_table
           ::Geo::Fdw::Upload.arel_table
         end
 
         def fdw_inner_join_uploads
-          file_registry_table
-            .join(fdw_upload_table, Arel::Nodes::InnerJoin)
-            .on(file_registry_table[:file_id].eq(fdw_upload_table[:id]))
+          registry_table
+            .join(fdw_table, Arel::Nodes::InnerJoin)
+            .on(registry_table[:file_id].eq(fdw_table[:id]))
             .join_sources
         end
       end