Preload acknowledge and reciprocate messages per activity

JonathanPorta · Nov 9, 2014 · 4063b09 · 4063b09
1 parent 7bb92f7
commit 4063b09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/decorators/activity_decorator.rb b/app/decorators/activity_decorator.rb
@@ -21,6 +21,14 @@ def activity_message
     end
   end
 
+  def reciprocate_message
+    unacknowledged_message_for_sender
+  end
+
+  def acknowledge_message
+    acknowledged_message_for_recipient
+  end
+
   private
 
   def acknowledged_message_for_sender

diff --git a/app/views/activities/index.json.jbuilder b/app/views/activities/index.json.jbuilder
@@ -1,6 +1,6 @@
 json.array!(@activities) do |activity|
   activity = activity.decorate
-  json.extract! activity, :id, :type, :activity_message
+  json.extract! activity, :id, :type, :activity_message, :reciprocate_message, :acknowledge_message
   json.message do
     # Sadly, this step is needed because extract doesn't find the at_in_words methods from the decorator.
     json.extract! activity.message, :id, :verb, :sender, :recipient, :acknowledged_at, :acknowledged_at_in_words, :created_at, :created_at_in_words