Added new spam_flag to Accounts, replacing is_flagged_as_spam

• Added:
- new spam_flag to Accounts, replacing is_flagged_as_spam
- null/0: no spam, 1: spam, 2: safe from spam

• Updated:
- Comment, Status to reflect changes

• Todo:
- Fully remove is_flagged_as_spam
- Update SortingQueryBuilder

app/models/account.rb

@@ -49,6 +49,7 @@
 #  is_donor                :boolean          default(FALSE), not null
 #  is_investor             :boolean          default(FALSE), not null
 #  is_flagged_as_spam      :boolean          default(FALSE), not null
+#  spam_flag               :integer
 #
 
 class Account < ApplicationRecord
@@ -68,6 +69,12 @@ class Account < ApplicationRecord
   include AccountCounters
   include DomainNormalizable
 
+  SPAM_FLAG_CLASS_MAP = {
+    none: 0,
+    spam: 1,
+    safe: 2,
+  }.freeze
+
   validates :username, presence: true
 
   # Remote user validations
@@ -81,6 +88,7 @@ class Account < ApplicationRecord
   validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
   validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
   validates :fields, length: { maximum: 6 }, if: -> { local? && will_save_change_to_fields? }
+  validates :spam_flag, inclusion: { in: SPAM_FLAG_CLASS_MAP.values }
 
   scope :remote, -> { where.not(domain: nil) }
   scope :local, -> { where(domain: nil) }
@@ -123,6 +131,10 @@ class Account < ApplicationRecord
     domain.nil?
   end
 
+  def is_spam?
+    spam_flag == SPAM_FLAG_CLASS_MAP[:spam]
+  end
+
   def moved?
     moved_to_account_id.present?
   end

app/models/account_filter.rb

@@ -59,7 +59,7 @@ class AccountFilter
     when "sign_up_date_gte"
       Account.where("created_at >= ?", value)
     when "spam"
-      Account.where(is_flagged_as_spam: true)
+      Account.where(spam_flag: Account::SPAM_FLAG_CLASS_MAP[:spam])
     when "is_pro"
       Account.where(is_pro: true)
     when "is_investor"