Use a class method to consolidate timestamp conversion

4 files changed, 10 insertions, 6 deletions

diff --git a/lib/bitbucket_server/representation/activity.rb b/lib/bitbucket_server/representation/activity.rb
index 2e6082bea87..a594b0881f6 100644
--- a/lib/bitbucket_server/representation/activity.rb
+++ b/lib/bitbucket_server/representation/activity.rb
@@ -38,11 +38,11 @@ module BitbucketServer
       def merge_timestamp
         timestamp = raw.dig('commit', 'committerTimestamp')
 
-        Time.at(timestamp / 1000.0) if timestamp.is_a?(Integer)
+        self.class.convert_timestamp(timestamp)
       end
 
       def created_at
-        Time.at(created_date / 1000) if created_date.is_a?(Integer)
+        self.class.convert_timestamp(created_date)
       end
 
       private
diff --git a/lib/bitbucket_server/representation/base.rb b/lib/bitbucket_server/representation/base.rb
index 0f3f2b60f5a..a1961bae6ef 100644
--- a/lib/bitbucket_server/representation/base.rb
+++ b/lib/bitbucket_server/representation/base.rb
@@ -12,6 +12,10 @@ module BitbucketServer
       def self.decorate(entries)
         entries.map { |entry| new(entry)}
       end
+
+      def self.convert_timestamp(time_usec)
+        Time.at(time_usec / 1000) if time_usec.is_a?(Integer)
+      end
     end
   end
 end
diff --git a/lib/bitbucket_server/representation/comment.rb b/lib/bitbucket_server/representation/comment.rb
index 7a25ac8aed1..59c44589aae 100644
--- a/lib/bitbucket_server/representation/comment.rb
+++ b/lib/bitbucket_server/representation/comment.rb
@@ -40,11 +40,11 @@ module BitbucketServer
       end
 
       def created_at
-        Time.at(created_date / 1000) if created_date.is_a?(Integer)
+        self.class.convert_timestamp(created_date)
       end
 
       def updated_at
-        Time.at(updated_date / 1000) if updated_date.is_a?(Integer)
+        self.class.convert_timestamp(created_date)
       end
 
       # Bitbucket Server supports the ability to reply to any comment
diff --git a/lib/bitbucket_server/representation/pull_request.rb b/lib/bitbucket_server/representation/pull_request.rb
index 43f61683ddd..4bb00d22b0c 100644
--- a/lib/bitbucket_server/representation/pull_request.rb
+++ b/lib/bitbucket_server/representation/pull_request.rb
@@ -34,11 +34,11 @@ module BitbucketServer
       end
 
       def created_at
-        Time.at(created_date / 1000) if created_date.is_a?(Integer)
+        self.class.convert_timestamp(created_date)
       end
 
       def updated_at
-        Time.at(updated_date / 1000) if created_date.is_a?(Integer)
+        self.class.convert_timestamp(updated_date)
       end
 
       def title