Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream

app/models/terms_of_service.rb

@@ -6,6 +6,7 @@
 #
 #  id                   :bigint(8)        not null, primary key
 #  changelog            :text             default(""), not null
+#  effective_date       :date
 #  notification_sent_at :datetime
 #  published_at         :datetime
 #  text                 :text             default(""), not null
@@ -13,17 +14,27 @@
 #  updated_at           :datetime         not null
 #
 class TermsOfService < ApplicationRecord
-  scope :published, -> { where.not(published_at: nil).order(published_at: :desc) }
-  scope :live, -> { published.limit(1) }
+  scope :published, -> { where.not(published_at: nil).order(Arel.sql('coalesce(effective_date, published_at) DESC')) }
+  scope :live, -> { published.where('effective_date IS NULL OR effective_date < now()').limit(1) }
   scope :draft, -> { where(published_at: nil).order(id: :desc).limit(1) }
 
   validates :text, presence: true
-  validates :changelog, presence: true, if: -> { published? }
+  validates :changelog, :effective_date, presence: true, if: -> { published? }
+
+  validate :effective_date_cannot_be_in_the_past
 
   def published?
     published_at.present?
   end
 
+  def effective?
+    published? && effective_date&.past?
+  end
+
+  def succeeded_by
+    TermsOfService.published.where(effective_date: (effective_date..)).where.not(id: id).first
+  end
+
   def notification_sent?
     notification_sent_at.present?
   end
@@ -31,4 +42,14 @@ class TermsOfService < ApplicationRecord
   def scope_for_notification
     User.confirmed.joins(:account).merge(Account.without_suspended).where(created_at: (..published_at))
   end
+
+  private
+
+  def effective_date_cannot_be_in_the_past
+    return if effective_date.blank?
+
+    min_date = TermsOfService.live.pick(:effective_date) || Time.zone.today
+
+    errors.add(:effective_date, :too_soon, date: min_date) if effective_date < min_date
+  end
 end