flags/appeals: replace is_resolved flag with statuses.

Replace references to the `is_resolved` field with the `status` field.
Post flags were marked as resolved when a post was approved (but not
when the post was deleted because it went unapproved). The status field
supercedes the resolved field.

app/models/post.rb

@@ -303,7 +303,7 @@ class Post < ApplicationRecord
     end
 
     def flag!(reason, is_deletion: false)
-      flag = flags.create(reason: reason, is_resolved: false, is_deletion: is_deletion, creator: CurrentUser.user)
+      flag = flags.create(reason: reason, is_deletion: is_deletion, creator: CurrentUser.user)
 
       if flag.errors.any?
         raise PostFlag::Error.new(flag.errors.full_messages.join("; "))
@@ -1201,8 +1201,6 @@ class Post < ApplicationRecord
     def with_flag_stats
       relation = left_outer_joins(:flags).group(:id).select("posts.*")
       relation = relation.select("COUNT(post_flags.id) AS flag_count")
-      relation = relation.select("COUNT(post_flags.id) FILTER (WHERE post_flags.is_resolved = TRUE)  AS resolved_flag_count")
-      relation = relation.select("COUNT(post_flags.id) FILTER (WHERE post_flags.is_resolved = FALSE) AS unresolved_flag_count")
       relation
     end
 

app/models/post_appeal.rb

@@ -17,8 +17,6 @@ class PostAppeal < ApplicationRecord
     rejected: 2
   }
 
-  scope :resolved, -> { where(post: Post.undeleted.unflagged) }
-  scope :unresolved, -> { where(post: Post.deleted.or(Post.flagged)) }
   scope :recent, -> { where("post_appeals.created_at >= ?", 1.day.ago) }
   scope :expired, -> { pending.where("post_appeals.created_at <= ?", 3.days.ago) }
 
@@ -28,23 +26,12 @@ class PostAppeal < ApplicationRecord
       q = q.search_attributes(params, :creator, :post, :reason, :status)
       q = q.text_attribute_matches(:reason, params[:reason_matches])
 
-      q = q.resolved if params[:is_resolved].to_s.truthy?
-      q = q.unresolved if params[:is_resolved].to_s.falsy?
-
       q.apply_default_order(params)
     end
   end
 
   extend SearchMethods
 
-  def resolved?
-    post.present? && !post.is_deleted? && !post.is_flagged?
-  end
-
-  def is_resolved
-    resolved?
-  end
-
   def validate_creator_is_not_limited
     if appeal_count_for_creator >= MAX_APPEALS_PER_DAY
       errors[:creator] << "can appeal at most #{MAX_APPEALS_PER_DAY} post a day"

app/models/post_event.rb

@@ -30,10 +30,6 @@ class PostEvent
     event.try(:reason) || ""
   end
 
-  def is_resolved
-    event.try(:is_resolved) || false
-  end
-
   def creator_id
     event.try(:creator_id) || event.try(:user_id)
   end
@@ -42,6 +38,18 @@ class PostEvent
     event.try(:creator) || event.try(:user)
   end
 
+  def status
+    if event.is_a?(PostApproval)
+      "approved"
+    elsif (event.is_a?(PostAppeal) && event.succeeded?) || (event.is_a?(PostFlag) && event.rejected?)
+      "approved"
+    elsif (event.is_a?(PostAppeal) && event.rejected?) || (event.is_a?(PostFlag) && event.succeeded?)
+      "deleted"
+    else
+      "pending"
+    end
+  end
+
   def is_creator_visible?(user = CurrentUser.user)
     case event
     when PostAppeal, PostApproval
@@ -57,7 +65,7 @@ class PostEvent
       "creator_id": nil,
       "created_at": nil,
       "reason": nil,
-      "is_resolved": nil,
+      "status": nil,
       "type": nil
     }
   end

app/models/post_flag.rb

@@ -26,8 +26,6 @@ class PostFlag < ApplicationRecord
   scope :by_users, -> { where.not(creator: User.system) }
   scope :by_system, -> { where(creator: User.system) }
   scope :in_cooldown, -> { by_users.where("created_at >= ?", COOLDOWN_PERIOD.ago) }
-  scope :resolved, -> { where(is_resolved: true) }
-  scope :unresolved, -> { where(is_resolved: false) }
   scope :recent, -> { where("post_flags.created_at >= ?", 1.day.ago) }
   scope :expired, -> { pending.where("post_flags.created_at <= ?", 3.days.ago) }
 
@@ -62,7 +60,7 @@ class PostFlag < ApplicationRecord
     def search(params)
       q = super
 
-      q = q.search_attributes(params, :post, :is_resolved, :reason, :status)
+      q = q.search_attributes(params, :post, :reason, :status)
       q = q.text_attribute_matches(:reason, params[:reason_matches])
 
       if params[:creator_id].present?