refactored updater and updated specs

5 files changed, 9 insertions, 27 deletions

diff --git a/lib/gitlab/cycle_analytics/author_updater.rb b/lib/gitlab/cycle_analytics/author_updater.rb
deleted file mode 100644
index 87d26701d3a..00000000000
--- a/lib/gitlab/cycle_analytics/author_updater.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Gitlab
-  module CycleAnalytics
-    class AuthorUpdater < Updater
-      def self.update!(event_result)
-        new(event_result, User, :author).update!
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/cycle_analytics/base_event.rb b/lib/gitlab/cycle_analytics/base_event.rb
index cedc73142fa..486139b1687 100644
--- a/lib/gitlab/cycle_analytics/base_event.rb
+++ b/lib/gitlab/cycle_analytics/base_event.rb
@@ -30,7 +30,7 @@ module Gitlab
       def update_author!
         return unless event_result.any? && event_result.first['author_id']
 
-        AuthorUpdater.update!(event_result)
+        Updater.update!(event_result, from: 'author_id', to: 'author', klass: User)
       end
 
       def event_result
diff --git a/lib/gitlab/cycle_analytics/build_updater.rb b/lib/gitlab/cycle_analytics/build_updater.rb
deleted file mode 100644
index c1190d9e7a9..00000000000
--- a/lib/gitlab/cycle_analytics/build_updater.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Gitlab
-  module CycleAnalytics
-    class BuildUpdater < Updater
-      def self.update!(event_result)
-        new(event_result, ::Ci::Build, :build, 'id').update!
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/cycle_analytics/staging_event.rb b/lib/gitlab/cycle_analytics/staging_event.rb
index 6c42b1a3a60..a1f30b716f6 100644
--- a/lib/gitlab/cycle_analytics/staging_event.rb
+++ b/lib/gitlab/cycle_analytics/staging_event.rb
@@ -12,7 +12,7 @@ module Gitlab
       end
 
       def fetch
-        BuildUpdater.update!(event_result)
+        Updater.update!(event_result, from: 'id', to: 'build', klass: ::Ci::Build)
 
         super
       end
diff --git a/lib/gitlab/cycle_analytics/updater.rb b/lib/gitlab/cycle_analytics/updater.rb
index 38cbfa03030..953268ebd46 100644
--- a/lib/gitlab/cycle_analytics/updater.rb
+++ b/lib/gitlab/cycle_analytics/updater.rb
@@ -5,25 +5,25 @@ module Gitlab
         new(*args).update!
       end
 
-      def initialize(event_result, update_klass, update_key, column = nil)
+      def initialize(event_result, from:, to:, klass:)
         @event_result = event_result
-        @update_klass = update_klass
-        @update_key = update_key.to_s
-        @column = column || "#{@update_key}_id"
+        @klass = klass
+        @from = from
+        @to = to
       end
 
       def update!
         @event_result.each do |event|
-          event[@update_key] = items[event.delete(@column).to_i].first
+          event[@to] = items[event.delete(@from).to_i].first
         end
       end
 
       def result_ids
-        @event_result.map { |event| event[@column] }
+        @event_result.map { |event| event[@from] }
       end
 
       def items
-        @items ||= @update_klass.find(result_ids).group_by { |item| item['id'] }
+        @items ||= @klass.find(result_ids).group_by { |item| item['id'] }
       end
     end
   end