fix issue events and related spec - now using generic serializer for a hash

2 files changed, 8 insertions, 3 deletions

diff --git a/app/serializers/analytics_generic_entity.rb b/app/serializers/analytics_generic_entity.rb
index e8cad86030e..8c8a40cd90b 100644
--- a/app/serializers/analytics_generic_entity.rb
+++ b/app/serializers/analytics_generic_entity.rb
@@ -5,14 +5,13 @@ class AnalyticsGenericEntity < Grape::Entity
 
   expose :title
   expose :iid
-  expose :started_at, as: :date
   expose :author, using: UserEntity
 
   expose :total_time do |object|
     distance_of_time_in_words(object[:total_time].to_f)
   end
 
-  expose(:date) do |object|
+  expose(:created_at) do |object|
     interval_in_words(object[:created_at])
   end
 
@@ -22,7 +21,7 @@ class AnalyticsGenericEntity < Grape::Entity
 
   private
 
-  def url_to(route, id = nil)
+  def url_to(route, id)
     public_send("#{route}_url", request.project.namespace, request.project, id)
   end
 
diff --git a/app/serializers/analytics_generic_serializer.rb b/app/serializers/analytics_generic_serializer.rb
index 2347b56a1d6..9000e25a91d 100644
--- a/app/serializers/analytics_generic_serializer.rb
+++ b/app/serializers/analytics_generic_serializer.rb
@@ -1,3 +1,9 @@
 class AnalyticsGenericSerializer < BaseSerializer
   entity AnalyticsGenericEntity
+
+  def represent(resource, opts = {})
+    resource.symbolize_keys!
+
+    super(resource, opts)
+  end
 end