add include_revisions param to content_followed_in_period (publiclab#…

…5907)

* testing tests

* Update comment_test.rb

* add include_revisions param to content_followed_in_period

Fixes publiclab#4732

app/models/user.rb

@@ -242,19 +242,22 @@ def questions
     Node.questions.where(status: 1, uid: id)
   end
 
-  def content_followed_in_period(start_time, end_time, node_type = 'note')
+  def content_followed_in_period(start_time, end_time, node_type = 'note', include_revisions = false)
     tagnames = TagSelection.where(following: true, user_id: uid)
     node_ids = []
     tagnames.each do |tagname|
       node_ids += NodeTag.where(tid: tagname.tid).collect(&:nid)
     end
 
+    range = "(created >= #{start_time.to_i} AND created <= #{end_time.to_i})"
+    range += " OR (timestamp >= #{start_time.to_i}  AND timestamp <= #{end_time.to_i})" if include_revisions
+
     Node.where(nid: node_ids)
     .includes(:revision, :tag)
     .references(:node_revision)
     .where('node.status = 1')
     .where(type: node_type)
-    .where("(created >= #{start_time.to_i} AND created <= #{end_time.to_i}) OR (timestamp >= #{start_time.to_i}  AND timestamp <= #{end_time.to_i})")
+    .where(range)
     .order('node_revisions.timestamp DESC')
     .distinct
   end