Merge branch 'review-new-framework-defaults' into develop

app/controllers/comment_controller.rb

@@ -54,7 +54,6 @@ def new
       flash[:notice] = _("Thank you for making an annotation!")
 
       if params[:subscribe_to_request]
-        @track_thing = TrackThing.create_track_for_request(@info_request)
         @existing_track = TrackThing.find_existing(@user, @track_thing)
         if @user && @info_request.user == @user
           # don't subscribe to own request!

app/models/alaveteli_pro/draft_info_request_batch.rb

@@ -25,8 +25,6 @@ class AlaveteliPro::DraftInfoRequestBatch < ApplicationRecord
     end
   }, inverse_of: :draft_info_request_batches
 
-  validates_presence_of :user
-
   after_initialize :set_default_body
 
   strip_attributes only: %i[embargo_duration]

app/models/alaveteli_pro/embargo.rb

@@ -22,7 +22,6 @@ class Embargo < ApplicationRecord
             inverse_of: :embargoes,
             through: :info_request
 
-    validates_presence_of :info_request
     validates_presence_of :publish_at
     validates_inclusion_of :embargo_duration,
                            in: ->(e) { e.allowed_durations },

app/models/alaveteli_pro/embargo_extension.rb

@@ -14,7 +14,6 @@ module AlaveteliPro
   class EmbargoExtension < ApplicationRecord
     belongs_to :embargo,
                inverse_of: :embargo_extensions
-    validates_presence_of :embargo
     validates_presence_of :extension_duration
     validates_inclusion_of :extension_duration,
                            in: lambda { |_e| AlaveteliPro::Embargo.new.allowed_durations }

app/models/alaveteli_pro/request_summary.rb

@@ -19,13 +19,13 @@
 class AlaveteliPro::RequestSummary < ApplicationRecord
   belongs_to :summarisable, polymorphic: true
   belongs_to :user,
-             inverse_of: :request_summaries
+             inverse_of: :request_summaries,
+             optional: true
   has_and_belongs_to_many :request_summary_categories,
                           class_name: "AlaveteliPro::RequestSummaryCategory",
                           inverse_of: :request_summaries
 
-  validates_presence_of :summarisable,
-                        :request_created_at,
+  validates_presence_of :request_created_at,
                         :request_updated_at
   validates_uniqueness_of :summarisable_id, scope: :summarisable_type
 

app/models/announcement.rb

@@ -74,7 +74,7 @@ class Announcement < ApplicationRecord
     end
   }
 
-  validates :content, :user,
+  validates :content,
             presence: true
   validates :visibility,
             presence: true,

app/models/announcement_dismissal.rb

@@ -15,6 +15,4 @@ class AnnouncementDismissal < ApplicationRecord
              inverse_of: :dismissals
   belongs_to :user,
              inverse_of: :announcement_dismissals
-
-  validates :announcement, :user, presence: true
 end

app/models/category.rb

@@ -21,15 +21,17 @@ class Category < ApplicationRecord
   has_many :parent_relationships,
            class_name: 'CategoryRelationship',
            foreign_key: 'child_id',
-           dependent: :destroy
+           dependent: :destroy,
+           validate: false
   has_many :parents,
            through: :parent_relationships,
            source: :parent
 
   has_many :child_relationships,
            class_name: 'CategoryRelationship',
            foreign_key: 'parent_id',
-           dependent: :destroy
+           dependent: :destroy,
+           validate: false
   has_many :children,
            through: :child_relationships,
            source: :child,

app/models/censor_rule.rb

@@ -32,11 +32,14 @@ class CensorRule < ApplicationRecord
   ].freeze
 
   belongs_to :info_request,
-             inverse_of: :censor_rules
+             inverse_of: :censor_rules,
+             optional: true
   belongs_to :user,
-             inverse_of: :censor_rules
+             inverse_of: :censor_rules,
+             optional: true
   belongs_to :public_body,
-             inverse_of: :censor_rules
+             inverse_of: :censor_rules,
+             optional: true
 
   validate :require_valid_regexp, if: proc { |rule| rule.regexp? == true }
 

app/models/citation.rb

@@ -27,10 +27,9 @@ class Citation < ApplicationRecord
   belongs_to :user, inverse_of: :citations
   belongs_to :citable, polymorphic: true
 
-  belongs_to :info_request, via: :citable
-  belongs_to :info_request_batch, via: :citable
+  belongs_to :info_request, via: :citable, optional: true
+  belongs_to :info_request_batch, via: :citable, optional: true
 
-  validates :user, :citable, presence: true
   validates :citable_type, inclusion: { in: %w(InfoRequest InfoRequestBatch) }
   validates :source_url, length: { maximum: 255,
                                    message: _('Source URL is too long') },

app/models/comment.rb

@@ -41,16 +41,17 @@ class Comment < ApplicationRecord
 
   belongs_to :user,
              inverse_of: :comments,
-             counter_cache: true
+             counter_cache: true,
+             optional: true # has to be optional for controller action to work
 
   belongs_to :info_request,
-             inverse_of: :comments
+             inverse_of: :comments,
+             optional: true
 
   has_many :info_request_events, # in practice only ever has one
            inverse_of: :comment,
            dependent: :destroy
 
-  # validates_presence_of :user # breaks during construction of new ones :(
   validate :check_body_has_content,
            :check_body_uses_mixed_capitals
 

app/models/dataset/key.rb

@@ -18,7 +18,7 @@
 # resource
 #
 class Dataset::Key < ApplicationRecord
-  belongs_to :key_set, foreign_key: 'dataset_key_set_id'
+  belongs_to :key_set, foreign_key: 'dataset_key_set_id', optional: true
   has_many :values, foreign_key: 'dataset_key_id', inverse_of: :key
 
   default_scope -> { order(:order) }

app/models/dataset/key_set.rb

@@ -26,6 +26,5 @@ class Dataset::KeySet < ApplicationRecord
     InfoRequestBatch
   ].freeze
 
-  validates :resource, presence: true
   validates :resource_type, inclusion: { in: RESOURCE_TYPES }
 end

app/models/dataset/value_set.rb

@@ -15,7 +15,7 @@
 # A dataset collection of values
 #
 class Dataset::ValueSet < ApplicationRecord
-  belongs_to :resource, polymorphic: true
+  belongs_to :resource, polymorphic: true, optional: true
   belongs_to :key_set, foreign_key: 'dataset_key_set_id'
   has_many :values, foreign_key: 'dataset_value_set_id', inverse_of: :value_set
 
@@ -27,7 +27,6 @@ class Dataset::ValueSet < ApplicationRecord
     FoiAttachment
   ].freeze
 
-  validates :key_set, :values, presence: true
   validates :resource_type, inclusion: { in: RESOURCE_TYPES }, if: :resource
   validates_associated :values
   validate :check_at_least_one_value_is_present

app/models/draft_info_request.rb

@@ -17,11 +17,9 @@ class DraftInfoRequest < ApplicationRecord
   include AlaveteliPro::RequestSummaries
   include InfoRequest::DraftTitleValidation
 
-  validates_presence_of :user
-
   belongs_to :user,
              inverse_of: :draft_info_requests
-  belongs_to :public_body, inverse_of: :draft_info_requests
+  belongs_to :public_body, inverse_of: :draft_info_requests, optional: true
 
   strip_attributes
 

app/models/foi_attachment.rb

@@ -35,7 +35,7 @@ class FoiAttachment < ApplicationRecord
 
   MissingAttachment = Class.new(StandardError)
 
-  belongs_to :incoming_message, inverse_of: :foi_attachments
+  belongs_to :incoming_message, inverse_of: :foi_attachments, optional: true
   has_one :info_request, through: :incoming_message, source: :info_request
   has_one :raw_email, through: :incoming_message, source: :raw_email
 

app/models/incoming_message.rb

@@ -49,10 +49,6 @@ class IncomingMessage < ApplicationRecord
              inverse_of: :incoming_messages,
              counter_cache: true
 
-  validates_presence_of :info_request
-
-  validates_presence_of :raw_email
-
   has_many :outgoing_message_followups,
            inverse_of: :incoming_message_followup,
            foreign_key: 'incoming_message_followup_id',

app/models/info_request.rb

@@ -67,15 +67,18 @@ def self.admin_title
 
   belongs_to :user,
              inverse_of: :info_requests,
-             counter_cache: true
+             counter_cache: true,
+             optional: true
 
   validate :must_be_internal_or_external
 
   belongs_to :public_body,
              inverse_of: :info_requests,
-             counter_cache: true
+             counter_cache: true,
+             validate: false
   belongs_to :info_request_batch,
-             inverse_of: :info_requests
+             inverse_of: :info_requests,
+             optional: true
 
   validates_presence_of :public_body, message: N_("Please select an authority")
 

app/models/info_request_batch.rb

@@ -38,7 +38,6 @@ class InfoRequestBatch < ApplicationRecord
 
   attr_accessor :ignore_existing_batch
 
-  validates_presence_of :user
   validates_presence_of :body
   validates_absence_of :existing_batch,
                        unless: -> { ignore_existing_batch },

app/models/info_request_event.rb

@@ -61,14 +61,15 @@ class InfoRequestEvent < ApplicationRecord
   belongs_to :info_request,
              inverse_of: :info_request_events
 
-  validates_presence_of :info_request
-
   belongs_to :outgoing_message,
-             inverse_of: :info_request_events
+             inverse_of: :info_request_events,
+             optional: true
   belongs_to :incoming_message,
-             inverse_of: :info_request_events
+             inverse_of: :info_request_events,
+             optional: true
   belongs_to :comment,
-             inverse_of: :info_request_events
+             inverse_of: :info_request_events,
+             optional: true
 
   has_one :request_classification,
           inverse_of: :info_request_event

app/models/mail_server_log.rb

@@ -24,9 +24,11 @@ class MailServerLog < ApplicationRecord
   serialize :delivery_status, DeliveryStatusSerializer
 
   belongs_to :info_request,
-             inverse_of: :mail_server_logs
+             inverse_of: :mail_server_logs,
+             optional: true
   belongs_to :mail_server_log_done,
-             inverse_of: :mail_server_logs
+             inverse_of: :mail_server_logs,
+             optional: true
 
   before_create :calculate_delivery_status
 

app/models/note.rb

@@ -35,7 +35,7 @@ class Note < ApplicationRecord
                default: Note.default_style,
                suffix: true
 
-  belongs_to :notable, polymorphic: true
+  belongs_to :notable, polymorphic: true, optional: true
 
   validates :body, presence: true, if: ->(n) { n.original_style? }
   validates :rich_body, presence: true, unless: ->(n) { n.original_style? }

app/models/notification.rb

@@ -24,7 +24,7 @@ class Notification < ApplicationRecord
   DAILY = :daily
   enum frequency: [ INSTANTLY, DAILY ]
 
-  validates_presence_of :info_request_event, :user, :frequency, :send_after
+  validates_presence_of :frequency, :send_after
 
   before_validation :calculate_send_after
 

app/models/outgoing_message.rb

@@ -42,7 +42,6 @@ class OutgoingMessage < ApplicationRecord
   attr_accessor :default_letter
 
   before_validation :cache_from_name
-  validates_presence_of :info_request
   validates_presence_of :from_name, unless: -> (m) { !m.info_request&.user }
   validates_inclusion_of :status, in: STATUS_TYPES
   validates_inclusion_of :message_type, in: MESSAGE_TYPES
@@ -56,7 +55,8 @@ class OutgoingMessage < ApplicationRecord
   belongs_to :incoming_message_followup,
              inverse_of: :outgoing_message_followups,
              foreign_key: 'incoming_message_followup_id',
-             class_name: 'IncomingMessage'
+             class_name: 'IncomingMessage',
+             optional: true
 
   has_one :user,
           inverse_of: :outgoing_messages,

app/models/post_redirect.rb

@@ -34,7 +34,8 @@ class PostRedirect < ApplicationRecord
 
   # Optional, does a login confirm before redirect for use in email links.
   belongs_to :user,
-             inverse_of: :post_redirects
+             inverse_of: :post_redirects,
+             optional: true
 
   validates :circumstance, inclusion: CIRCUMSTANCES
 

app/models/profile_photo.rb

@@ -27,7 +27,8 @@ class ProfilePhoto < ApplicationRecord
   MAX_DRAFT = 500 # keep even pre-cropped images reasonably small
 
   belongs_to :user,
-             inverse_of: :profile_photo
+             inverse_of: :profile_photo,
+             optional: true
 
   validate :data_and_draft_checks
 

app/models/project/membership.rb

@@ -19,6 +19,4 @@ class Project::Membership < ApplicationRecord
   belongs_to :project
   belongs_to :user
   belongs_to :role
-
-  validates :project, :user, :role, presence: true
 end

app/models/project/resource.rb

@@ -18,6 +18,4 @@
 class Project::Resource < ApplicationRecord
   belongs_to :project
   belongs_to :resource, polymorphic: true
-
-  validates :project, :resource, presence: true
 end

app/models/project/submission.rb

@@ -21,7 +21,7 @@ class Project::Submission < ApplicationRecord
   belongs_to :project
   belongs_to :user
   belongs_to :info_request
-  belongs_to :resource, polymorphic: true
+  belongs_to :resource, polymorphic: true, optional: true
 
   scope :classification, -> { where(resource_type: 'InfoRequestEvent') }
   scope :extraction, -> { where(resource_type: 'Dataset::ValueSet') }
@@ -31,7 +31,6 @@ class Project::Submission < ApplicationRecord
     Dataset::ValueSet
   ].freeze
 
-  validates :project, :user, :info_request, :resource, presence: true
   validates :resource_type, inclusion: { in: RESOURCE_TYPES }
   validates_associated :resource
 end

app/models/public_body_category_link.rb

@@ -18,9 +18,6 @@ class PublicBodyCategoryLink < ApplicationRecord
   belongs_to :public_body_heading,
              inverse_of: :public_body_category_links
 
-  validates_presence_of :public_body_category
-  validates_presence_of :public_body_heading
-
   validates :category_display_order, numericality: {
     only_integer: true, message: 'Display order must be a number'
   }

app/models/public_body_change_request.rb

@@ -20,9 +20,11 @@
 class PublicBodyChangeRequest < ApplicationRecord
   belongs_to :user,
              inverse_of: :public_body_change_requests,
-             counter_cache: true
+             counter_cache: true,
+             optional: true
   belongs_to :public_body,
-             inverse_of: :public_body_change_requests
+             inverse_of: :public_body_change_requests,
+             optional: true
 
   validates_presence_of :public_body_name,
                         message: N_("Please enter the name of the authority"),

app/models/role.rb

@@ -19,7 +19,8 @@ class Role < ApplicationRecord
                           inverse_of: :roles
 
   belongs_to :resource,
-             polymorphic: true
+             polymorphic: true,
+             optional: true
 
   validates :resource_type,
             inclusion: { in: Rolify.resource_types },