add combined flag+appeal listing for posts #262

app/controllers/post_events_controller.rb

@@ -0,0 +1,7 @@
+class PostEventsController < ApplicationController
+  before_filter :member_only
+
+  def index
+    @events = PostEvent.find_for_post(params[:post_id])
+  end
+end

app/models/post_event.rb

@@ -0,0 +1,44 @@
+class PostEvent
+  class Instance
+    attr_reader :creator_id, :reason, :is_resolved, :created_at, :type
+
+    def initialize(row)
+      @creator_id = row["creator_id"].to_i
+      @reason = row["reason"]
+      @is_resolved = (row["is_resolved"] == "t")
+      @created_at = row["created_at"].to_time
+      @type = row["type"]
+    end
+
+    def creator
+      User.find(creator_id)
+    end
+
+    def type_name
+      if appeal?
+        "appeal"
+      else
+        "flag"
+      end
+    end
+
+    def appeal?
+      type == "a"
+    end
+
+    def flag?
+      type == "f"
+    end
+  end
+
+  QUERY = <<-EOS
+    (SELECT post_flags.creator_id, post_flags.reason, post_flags.is_resolved, post_flags.created_at, 'f' as type FROM post_flags WHERE post_flags.post_id = ?)
+    UNION
+    (SELECT post_appeals.creator_id, post_appeals.reason, 't' AS is_resolved, post_appeals.created_at, 'a' as type FROM post_appeals WHERE post_appeals.post_id = ?)
+    ORDER BY created_at
+  EOS
+
+  def self.find_for_post(post_id)
+    ActiveRecord::Base.select_all_sql(QUERY, post_id, post_id).map {|x| Instance.new(x)}
+  end
+end

app/views/post_events/index.html.erb

@@ -0,0 +1,38 @@
+<div id="c-post-flags">
+  <div id="a-index">
+    <h1>Flags &amp; Appeals</h1>
+
+    <table width="100%" class="striped">
+      <thead>
+        <tr>
+          <th width="5%">Type</th>
+          <th width="10%">Creator</th>
+          <th>Reason</th>
+          <th width="5%">Resolved?</th>
+          <th width="15%">Date</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @events.each do |event| %>
+          <tr class="resolved-<%= event.is_resolved %>">
+            <td><%= event.type_name %></td>
+            <td><%= link_to_user event.creator %></td>
+            <td><%= format_text event.reason %></td>
+            <td>
+              <% if event.is_resolved %>
+                yes
+              <% else %>
+                no
+              <% end %>
+            </td>
+            <td><%= compact_time event.created_at %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<% content_for(:page_title) do %>
+  Events - <%= Danbooru.config.app_name %>
+<% end %>

app/views/posts/show.html.erb

@@ -26,8 +26,7 @@
         <ul>
           <li><%= fast_link_to "Tags", post_versions_path(:search => {:post_id => @post.id}) %></li>
           <li><%= fast_link_to "Notes", note_versions_path(:search => {:post_id => @post.id}) %></li>
-          <li><%= fast_link_to "Flags", post_flags_path(:search => {:post_id => @post.id}) %></li>
-          <li><%= fast_link_to "Appeals", post_appeals_path(:search => {:post_id => @post.id}) %></li>
+          <li><%= fast_link_to "Flags & Appeals", post_events_path(@post.id) %></li>
           <li><%= fast_link_to "Commentary", artist_commentary_versions_path(:search => {:post_id => @post.id}) %></li>
         </ul>
       </section>

config/routes.rb

@@ -183,6 +183,7 @@ Rails.application.routes.draw do
   end
   resources :pool_versions, :only => [:index]
   resources :posts do
+    resources :events, :only => [:index], :controller => "post_events"
     resources :votes, :controller => "post_votes", :only => [:create, :destroy]
     collection do
       get :home

test/functional/post_events_controller_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class PostEventsControllerTest < ActionController::TestCase
+  def setup
+    super
+
+    Timecop.travel(2.weeks.ago) do
+      CurrentUser.user = FactoryGirl.create(:user)
+      CurrentUser.ip_addr = "127.0.0.1"
+    end
+
+    @post = FactoryGirl.create(:post)
+    @post_flag = PostFlag.create(:post => @post, :reason => "aaa", :is_resolved => false)
+    @post_appeal = PostAppeal.create(:post => @post, :reason => "aaa")
+  end
+
+  def teardown
+    super
+    CurrentUser.user = nil
+    CurrentUser.ip_addr = nil
+  end
+
+  context "GET /posts/:post_id/events" do
+    should "render" do
+      get :index, {:post_id => @post.id}, {:user_id => CurrentUser.user.id}
+      assert_response :ok      
+    end
+  end
+end

test/unit/post_event_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class PostEventTest < ActiveSupport::TestCase
+  def setup
+    super
+
+    Timecop.travel(2.weeks.ago) do
+      CurrentUser.user = FactoryGirl.create(:user)
+      CurrentUser.ip_addr = "127.0.0.1"
+    end
+
+    @post = FactoryGirl.create(:post)
+    @post_flag = PostFlag.create(:post => @post, :reason => "aaa", :is_resolved => false)
+    @post_appeal = PostAppeal.create(:post => @post, :reason => "aaa")
+  end
+
+  def teardown
+    super
+    CurrentUser.user = nil
+    CurrentUser.ip_addr = nil
+  end
+
+  context "PostEvent.find_for_post" do
+    should "work" do
+      results = PostEvent.find_for_post(@post.id)
+      assert_equal(2, results.size)
+      assert(results[0].flag?)
+      assert(results[1].appeal?)
+    end
+  end
+end