Add Draftable concern

This adds a new concern to encapsulate the logic around models which
have an active field, and two states of either draft or active.

Author: thomasleese

app/models/campaign.rb

@@ -24,6 +24,7 @@
 #  fk_rails_...  (team_id => teams.id)
 #
 class Campaign < ApplicationRecord
+  include Draftable
   include WizardStepConcern
 
   self.inheritance_column = nil
@@ -44,8 +45,6 @@ class Campaign < ApplicationRecord
 
   enum :type, { flu: "flu", hpv: "hpv" }, validate: { allow_nil: true }
 
-  scope :active, -> { where(active: true) }
-
   normalizes :name, with: ->(name) { name&.strip }
 
   on_wizard_step :details do

app/models/concerns/draftable.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Draftable
+  extend ActiveSupport::Concern
+
+  included do
+    scope :active, -> { where(active: true) }
+    scope :draft, -> { where(active: false) }
+  end
+
+  def draft?
+    !active
+  end
+end

app/models/patient_session.rb

@@ -24,6 +24,8 @@
 #
 
 class PatientSession < ApplicationRecord
+  include Draftable
+
   audited
   has_associated_audits
 
@@ -50,12 +52,6 @@ class PatientSession < ApplicationRecord
            through: :patient,
            class_name: "Consent"
 
-  scope :active, -> { where(active: true) }
-
-  def draft?
-    !active
-  end
-
   def vaccination_record
     # HACK: in future, it will be possible to have multiple vaccination records for a patient session
     vaccination_records.recorded.last

app/models/session.rb

@@ -27,7 +27,9 @@
 #  fk_rails_...  (imported_from_id => immunisation_imports.id)
 #
 class Session < ApplicationRecord
+  include Draftable
   include WizardStepConcern
+
   audited
 
   DEFAULT_DAYS_FOR_REMINDER = 2
@@ -46,20 +48,14 @@ class Session < ApplicationRecord
 
   enum :time_of_day, %w[morning afternoon all_day]
 
-  scope :active, -> { where(active: true) }
-  scope :draft, -> { where(active: false) }
   scope :past, -> { where(date: ..Time.zone.yesterday) }
   scope :in_progress, -> { where(date: Time.zone.today) }
   scope :future, -> { where(date: Time.zone.tomorrow..) }
 
   after_initialize :set_timeline_attributes
   after_validation :set_timeline_timestamps
 
-  validates :time_of_day,
-            inclusion: {
-              in: time_of_days.keys
-            },
-            unless: -> { draft? }
+  validates :time_of_day, inclusion: { in: time_of_days.keys }, unless: :draft?
 
   on_wizard_step :location, exact: true do
     validates :location_id, presence: true
@@ -98,10 +94,6 @@ class Session < ApplicationRecord
               if: -> { close_consent_on == "custom" }
   end
 
-  def draft?
-    !active
-  end
-
   def health_questions
     campaign.vaccines.first.health_questions
   end

spec/factories/patient_sessions.rb

@@ -33,7 +33,7 @@
     patient { association :patient, session:, **patient_attributes }
     created_by { association :user }
 
-    active { session.active? }
+    active { session.active }
 
     trait :active do
       active { true }