Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into statistics_controller

app/serializers/collection_serializer.rb

@@ -28,7 +28,7 @@ class CollectionSerializer < ActiveModel::Serializer
     thumbs
   end
 
-  attributes :id, :name, :created_at, :updated_at, :description, :privacy, :score, :likes_count, :liked, :reviewed, :complained, :review_average, :thumbnail, :items_thumbnails
+  attributes :id, :name, :created_at, :updated_at, :description, :privacy, :score, :likes_count, :liked, :followed, :reviewed, :complained, :review_average, :thumbnail, :items_thumbnails
 
   belongs_to :owner
   has_many :tags

app/serializers/user_serializer.rb

 class UserSerializer < ActiveModel::Serializer
-  cache key: 'user', expires_in: 4.hours, except: [ :complained ]
+  cache key: 'user', expires_in: 4.hours, except: [ :complained, :followed ]
 
   def complained
     object.complained? current_user
   end
 
-  attributes :id, :email, :provider, :name, :description, :role_ids, :institution_ids, :avatar, :likes_count, :complained, :follows_count, :learning_objects_count, :collections_count, :created_at, :updated_at
+  def followed
+    object.followed? current_user
+  end
+
+  attributes :id, :email, :provider, :name, :description, :role_ids, :institution_ids, :avatar, :likes_count, :followed, :complained, :follows_count, :learning_objects_count, :collections_count, :created_at, :updated_at
 end

app/services/learning_object_publisher.rb

@@ -29,6 +29,7 @@ class LearningObjectPublisher
     return true if learning_object.published?
 
     learning_object.state = LearningObject.states[:published]
+    learning_object.published_at = Time.now
     ThumbnailGenerateWorker.perform_async learning_object.id, learning_object.link if learning_object.link?
     learning_object.save
   end