find comment flags and move testing forward

api/flags.rb

@@ -13,4 +13,3 @@ end
 put "#{APIPREFIX}/comments/:comment_id/abuse_unflags" do |thread_id|
   un_flag_as_abuse comment
 end
-

lib/helpers.rb

@@ -46,7 +46,14 @@ helpers do
   
   def un_flag_as_abuse(obj)
     raise ArgumentError, "User id is required" unless user
+    if params["moderator"]
+      obj.historical_abuse_flaggers += obj.abuse_flaggers
+      obj.historical_abuse_flaggers = obj.historical_abuse_flaggers.uniq
+      obj.abuse_flaggers.clear
+    else
       obj.abuse_flaggers.delete user.id
+    end
+    
     obj.save
     obj.reload.to_hash.to_json
   end
@@ -107,13 +114,25 @@ helpers do
   end
 
   def handle_threads_query(comment_threads)
-    if params[:flagged]
-      #get flagged threads and threads containing flagged responses
-      comment_threads = comment_threads.where(:course_id=>params[:course_id]).where(:abuse_flaggers)    
     
-    else
+      
     if params[:course_id]
       comment_threads = comment_threads.where(:course_id=>params[:course_id])
+      
+      if params[:flagged]
+        #get flagged threads and threads containing flagged responses
+        comment_ids = Comment.where(:course_id=>params[:course_id]).
+            where(:abuse_flaggers.ne => [],:abuse_flaggers.exists => true).
+            collect{|c| c.comment_thread_id}.uniq
+          
+        thread_ids = comment_threads.where(:abuse_flaggers.ne => [],:abuse_flaggers.exists => true).
+            collect{|c| c.id}
+          
+        comment_ids += thread_ids
+        
+        comment_threads = comment_threads.where(:id.in => comment_ids)
+        
+      end
     end
     if CommentService.config[:cache_enabled]
       query_params = params.slice(*%w[course_id commentable_id sort_key sort_order page per_page user_id])
@@ -170,7 +189,6 @@ helpers do
       }.to_json
     end
   end
-  end
 
   def author_contents_only(contents, author_id)
     contents.map do |content|

models/content.rb

@@ -4,6 +4,7 @@ class Content
   
   field :visible, type: Boolean, default: true
   field :abuse_flaggers, type: Array, default: []
+  field :historical_abuse_flaggers, type: Array, default: [] #preserve abuse flaggers after a moderator unflags
   
   def author_with_anonymity(attr=nil, attr_when_anonymous=nil)
     if not attr

spec/api/abuse_spec.rb

@@ -8,6 +8,14 @@ def create_thread_flag(thread_id, user_id)
   create_flag("/api/v1/threads/" + thread_id + "/abuse_flags", user_id)
 end
 
+def remove_thread_flag(thread_id, user_id)
+  remove_flag("/api/v1/threads/" + thread_id + "/abuse_unflags", user_id)
+end
+
+def remove_comment_flag(thread_id, user_id)
+  remove_flag("/api/v1/threads/" + comment_id + "/abuse_unflags", user_id)
+end
+
 def create_flag(put_command, user_id)
    if user_id.nil?
     put put_command
@@ -45,7 +53,7 @@ describe "app" do
       #end
     end
     describe "flag a thread as abusive" do
-      it "create or update the abuse_flags on the thread" do
+      it "create or update the abuse_flags on the comment" do
         comment = Comment.first
         thread = comment.comment_thread
         prev_abuse_flaggers = thread.abuse_flaggers
@@ -70,5 +78,32 @@ describe "app" do
       #  Comment.first.comment_thread.to_hash
       #end
     end
+    describe "unflag a comment as abusive" do
+      it "removes the user from the existing abuse_flaggers" do
+        comment = Comment.first
+        thread = comment.comment_thread
+        prev_abuse_flaggers = thread.abuse_flaggers
+        create_thread_flag("#{thread.id}", User.first.id)
+        prev_abuse_flaggers.should include User.first.id 
+        remove_thread_flag("#{thread.id}", User.first.id)
+
+        comment = Comment.find(comment.id)
+        comment.comment_thread.abuse_flaggers.length.should == prev_abuse_flaggers.length + 1
+        prev_abuse_flaggers.should_not include? User.first.id
+      end
+      it "returns 400 when the thread does not exist" do
+        remove_thread_flag("does_not_exist", User.first.id)
+        last_response.status.should == 400
+      end
+      it "returns 400 when user_id is not provided" do
+        remove_thread_flag("#{Comment.first.comment_thread.id}", nil)
+        last_response.status.should == 400
+      end
+      #Would like to test the output of to_hash, but not sure how to deal with a Moped::BSON::Document object
+      #it "has a correct hash" do
+      #  create_thread_flag("#{Comment.first.comment_thread.id}", User.first.id)
+      #  Comment.first.comment_thread.to_hash
+      #end
+    end
   end
 end