Refs #4615 Refacto compliance control models and add origin_code to ComplianceControl model

22 files changed, 18 insertions, 122 deletions

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 763a42029..9c3083695 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -4,11 +4,15 @@ class ComplianceControl < ActiveRecord::Base
   has_one :compliance_control_block, dependent: :destroy
   accepts_nested_attributes_for :compliance_control_block
 
+  @@default_criticity = :warning
+  @@default_code = ""
+
   enumerize :criticity, in: %i(info warning error), scope: true, default: :info
 
   validates :criticity, presence: true
   validates :name, presence: true
   validates :code, presence: true
+  validates :origin_code, presence: true
   validates :compliance_control_set, presence: true
 
   def self.policy_class
@@ -23,8 +27,16 @@ class ComplianceControl < ActiveRecord::Base
     end
     super
   end
+
+  before_validation(on: :create) do
+    self.name = self.class.name
+    self.code = @@default_code
+    self.origin_code = @@default_code
+    self.criticity = @@default_criticity
+  end
+
 end
 
 # Ensure STI subclasses are loaded
 # http://guides.rubyonrails.org/autoloading_and_reloading_constants.html#autoloading-and-sti
-require_dependency 'generic_attribute_min_max'
+require_dependency 'generic_attribute_control/min_max'
diff --git a/app/models/journey_pattern_control/duplicates.rb b/app/models/journey_pattern_control/duplicates.rb
index 78ca07e90..d3908cfc0 100644
--- a/app/models/journey_pattern_control/duplicates.rb
+++ b/app/models/journey_pattern_control/duplicates.rb
@@ -3,11 +3,5 @@ module JourneyPatternControl
 
     @@default_criticity = :warning
     @@default_code = "3-JourneyPattern-1"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/journey_pattern_control/vehicle_journey.rb b/app/models/journey_pattern_control/vehicle_journey.rb
index a90c16138..d7151f147 100644
--- a/app/models/journey_pattern_control/vehicle_journey.rb
+++ b/app/models/journey_pattern_control/vehicle_journey.rb
@@ -3,11 +3,5 @@ module JourneyPatternControl
 
     @@default_criticity = :warning
     @@default_code = "3-JourneyPattern-2"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
\ No newline at end of file
diff --git a/app/models/line_control/route.rb b/app/models/line_control/route.rb
index 8ac13a080..21c5eca06 100644
--- a/app/models/line_control/route.rb
+++ b/app/models/line_control/route.rb
@@ -3,11 +3,5 @@ module LineControl
 
     @@default_criticity = :warning
     @@default_code = "3-Line-1"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
\ No newline at end of file
diff --git a/app/models/route_control/duplicates.rb b/app/models/route_control/duplicates.rb
index 379d7cf98..fb9c34e0a 100644
--- a/app/models/route_control/duplicates.rb
+++ b/app/models/route_control/duplicates.rb
@@ -3,11 +3,5 @@ module RouteControl
 
     @@default_criticity = :warning
     @@default_code = "3-Route-4"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/route_control/journey_pattern.rb b/app/models/route_control/journey_pattern.rb
index 0559fac42..08f603d8f 100644
--- a/app/models/route_control/journey_pattern.rb
+++ b/app/models/route_control/journey_pattern.rb
@@ -3,11 +3,5 @@ module RouteControl
 
     @@default_criticity = :warning
     @@default_code = "3-Route-3"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
\ No newline at end of file
diff --git a/app/models/route_control/minimum_length.rb b/app/models/route_control/minimum_length.rb
index 14bc7064f..f42b88748 100644
--- a/app/models/route_control/minimum_length.rb
+++ b/app/models/route_control/minimum_length.rb
@@ -3,11 +3,5 @@ module RouteControl
 
     @@default_criticity = :error
     @@default_code = "3-Route-6"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/route_control/omnibus_journey_pattern.rb b/app/models/route_control/omnibus_journey_pattern.rb
index 2f09ff735..3b9f6d06f 100644
--- a/app/models/route_control/omnibus_journey_pattern.rb
+++ b/app/models/route_control/omnibus_journey_pattern.rb
@@ -3,11 +3,5 @@ module RouteControl
 
     @@default_criticity = :warning
     @@default_code = "3-Route-9"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/route_control/opposite_route.rb b/app/models/route_control/opposite_route.rb
index d5f2bc59e..e91b081e2 100644
--- a/app/models/route_control/opposite_route.rb
+++ b/app/models/route_control/opposite_route.rb
@@ -3,12 +3,5 @@ module RouteControl
 
     @@default_criticity = :error
     @@default_code = "3-Route-2"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
-
   end
 end
diff --git a/app/models/route_control/opposite_route_terminus.rb b/app/models/route_control/opposite_route_terminus.rb
index e72229ca3..fd62b7684 100644
--- a/app/models/route_control/opposite_route_terminus.rb
+++ b/app/models/route_control/opposite_route_terminus.rb
@@ -3,11 +3,5 @@ module RouteControl
 
     @@default_criticity = :warning
     @@default_code = "3-Route-5"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
\ No newline at end of file
diff --git a/app/models/route_control/speed.rb b/app/models/route_control/speed.rb
index fb07b5c87..0a2b6ac76 100644
--- a/app/models/route_control/speed.rb
+++ b/app/models/route_control/speed.rb
@@ -5,11 +5,5 @@ module VehicleJourneyControl
 
     @@default_criticity = :warning
     @@default_code = "3-VehicleJourney-2"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/route_control/stop_points_in_journey_pattern.rb b/app/models/route_control/stop_points_in_journey_pattern.rb
index 195257a4a..dced6c005 100644
--- a/app/models/route_control/stop_points_in_journey_pattern.rb
+++ b/app/models/route_control/stop_points_in_journey_pattern.rb
@@ -3,11 +3,5 @@ module RouteControl
 
     @@default_criticity = :error
     @@default_code = "3-Route-6"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/route_control/time_table.rb b/app/models/route_control/time_table.rb
index 911807ba9..5d0f21b40 100644
--- a/app/models/route_control/time_table.rb
+++ b/app/models/route_control/time_table.rb
@@ -3,11 +3,5 @@ module VehicleJourneyControl
 
     @@default_criticity = :error
     @@default_code = "3-VehicleJourney-4"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/route_control/unactivated_stop_points.rb b/app/models/route_control/unactivated_stop_points.rb
index 8ab680490..dee846cbb 100644
--- a/app/models/route_control/unactivated_stop_points.rb
+++ b/app/models/route_control/unactivated_stop_points.rb
@@ -3,11 +3,5 @@ module RouteControl
 
     @@default_criticity = :warning
     @@default_code = "3-Route-10"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/route_control/vehicle_journey_at_stops.rb b/app/models/route_control/vehicle_journey_at_stops.rb
index 02a43fb10..149282fe6 100644
--- a/app/models/route_control/vehicle_journey_at_stops.rb
+++ b/app/models/route_control/vehicle_journey_at_stops.rb
@@ -3,11 +3,5 @@ module VehicleJourneyControl
 
     @@default_criticity = :error
     @@default_code = "3-VehicleJourney-5"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/route_control/zdl_stop_area.rb b/app/models/route_control/zdl_stop_area.rb
index 4561c9b2e..088a1d2f2 100644
--- a/app/models/route_control/zdl_stop_area.rb
+++ b/app/models/route_control/zdl_stop_area.rb
@@ -3,11 +3,5 @@ module RouteControl
 
     @@default_criticity = :warning
     @@default_code = "3-Route-1"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/routing_constaint_zone_control/maximum_length.rb b/app/models/routing_constaint_zone_control/maximum_length.rb
index fd63ffeda..4d289de63 100644
--- a/app/models/routing_constaint_zone_control/maximum_length.rb
+++ b/app/models/routing_constaint_zone_control/maximum_length.rb
@@ -3,11 +3,5 @@ module RoutingConstaintZoneControl
 
     @@default_criticity = :warning
     @@default_code = "3-ITL-2"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
\ No newline at end of file
diff --git a/app/models/routing_constaint_zone_control/minimum_length.rb b/app/models/routing_constaint_zone_control/minimum_length.rb
index c17bbc834..28f0791a7 100644
--- a/app/models/routing_constaint_zone_control/minimum_length.rb
+++ b/app/models/routing_constaint_zone_control/minimum_length.rb
@@ -3,11 +3,5 @@ module RoutingConstaintZoneControl
 
     @@default_criticity = :warning
     @@default_code = "3-ITL-3"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
\ No newline at end of file
diff --git a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb b/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
index 92a1d1a58..fe5381a34 100644
--- a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
+++ b/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
@@ -3,11 +3,5 @@ module RoutingConstaintZoneControl
 
     @@default_criticity = :warning
     @@default_code = "3-ITL-1"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/vechicle_journey_control/delta.rb b/app/models/vechicle_journey_control/delta.rb
index d4e1e6eca..d77eff48a 100644
--- a/app/models/vechicle_journey_control/delta.rb
+++ b/app/models/vechicle_journey_control/delta.rb
@@ -5,11 +5,5 @@ module VehicleJourneyControl
 
     @@default_criticity = :warning
     @@default_code = "3-VehicleJourney-3"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/app/models/vechicle_journey_control/waiting_time.rb b/app/models/vechicle_journey_control/waiting_time.rb
index a7e90b6ac..cbffa5526 100644
--- a/app/models/vechicle_journey_control/waiting_time.rb
+++ b/app/models/vechicle_journey_control/waiting_time.rb
@@ -3,11 +3,5 @@ module VehicleJourneyControl
 
     @@default_criticity = :warning
     @@default_code = "3-VehicleJourney-1"
-
-    after_initialize do
-      self.name = self.class.name
-      self.code = @@default_code
-      self.criticity = @@default_criticity
-    end
   end
 end
diff --git a/db/migrate/20170927095022_add_origin_code_to_compliance_controls.rb b/db/migrate/20170927095022_add_origin_code_to_compliance_controls.rb
new file mode 100644
index 000000000..36f109b91
--- /dev/null
+++ b/db/migrate/20170927095022_add_origin_code_to_compliance_controls.rb
@@ -0,0 +1,5 @@
+class AddOriginCodeToComplianceControls < ActiveRecord::Migration
+  def change
+    add_column :compliance_controls, :origin_code, :string
+  end
+end