Fix We MUST add compliance controls STI subclasses in Apartment initializer

2 files changed, 7 insertions, 3 deletions

diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index 1cb98b7de..5721c00f4 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -5,9 +5,11 @@ class ComplianceControlBlock < ActiveRecord::Base
   belongs_to :compliance_control_set
   has_many :compliance_controls, dependent: :destroy
 
-  hstore_accessor :condition_attributes, 
-    transport_mode: :string, 
+  hstore_accessor :condition_attributes,
+    transport_mode: :string,
     transport_submode: :string
 
-  validates_presence_of :transport_mode
+  validates :transport_mode, presence: true
+  validates :compliance_control_set, presence: true
+
 end
diff --git a/app/models/compliance_control_set.rb b/app/models/compliance_control_set.rb
index 1ab0fd6d2..deb46f5a1 100644
--- a/app/models/compliance_control_set.rb
+++ b/app/models/compliance_control_set.rb
@@ -4,6 +4,8 @@ class ComplianceControlSet < ActiveRecord::Base
   has_many :compliance_controls, dependent: :destroy
 
   validates :name, presence: true
+  validates :organisation, presence: true
+
   scope :where_updated_at_between, ->(period_range) do
     where('updated_at BETWEEN :begin AND :end', begin: period_range.begin, end: period_range.end)
   end