BB importer: Refactoring user importing logic[ci skip]

5 files changed, 4 insertions, 12 deletions

diff --git a/lib/bitbucket/representation/base.rb b/lib/bitbucket/representation/base.rb
index fd622d333da..94adaacc9b5 100644
--- a/lib/bitbucket/representation/base.rb
+++ b/lib/bitbucket/representation/base.rb
@@ -5,10 +5,6 @@ module Bitbucket
         @raw = raw
       end
 
-      def user_representation(raw)
-        User.new(raw)
-      end
-
       def self.decorate(entries)
         entries.map { |entry| new(entry)}
       end
diff --git a/lib/bitbucket/representation/comment.rb b/lib/bitbucket/representation/comment.rb
index bc40f891cd3..3c75e9368fa 100644
--- a/lib/bitbucket/representation/comment.rb
+++ b/lib/bitbucket/representation/comment.rb
@@ -2,7 +2,7 @@ module Bitbucket
   module Representation
     class Comment < Representation::Base
       def author
-        user_representation(user)
+        user['username']
       end
 
       def note
diff --git a/lib/bitbucket/representation/issue.rb b/lib/bitbucket/representation/issue.rb
index 90adfa3331a..ffe8a65d839 100644
--- a/lib/bitbucket/representation/issue.rb
+++ b/lib/bitbucket/representation/issue.rb
@@ -12,7 +12,7 @@ module Bitbucket
       end
 
       def author
-        user_representation(raw.fetch('reporter', {}))
+        raw.dig('reporter', 'username')
       end
 
       def description
diff --git a/lib/bitbucket/representation/pull_request.rb b/lib/bitbucket/representation/pull_request.rb
index 96992003d24..e37c9a62c0e 100644
--- a/lib/bitbucket/representation/pull_request.rb
+++ b/lib/bitbucket/representation/pull_request.rb
@@ -2,7 +2,7 @@ module Bitbucket
   module Representation
     class PullRequest < Representation::Base
       def author
-        user_representation(raw.fetch('author', {}))
+        raw.dig('author', 'username')
       end
 
       def description
diff --git a/lib/bitbucket/representation/user.rb b/lib/bitbucket/representation/user.rb
index 6025a9f0653..ba6b7667b49 100644
--- a/lib/bitbucket/representation/user.rb
+++ b/lib/bitbucket/representation/user.rb
@@ -2,11 +2,7 @@ module Bitbucket
   module Representation
     class User < Representation::Base
       def username
-        raw['username'] || 'Anonymous'
-      end
-
-      def uuid
-        raw['uuid']
+        raw['username']
       end
     end
   end