Merge branch 'master' into 5024-prevent-duplicate-referentials-from-being-created-during-parallel-db-transactions--rb201711271659

1 files changed, 32 insertions, 1 deletions

diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index cc7170728..4f1359ff8 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -9,7 +9,7 @@ module Chouette
     include ObjectidSupport
 
     extend Enumerize
-    enumerize :area_type, in: %i(zdep zder zdlp zdlr lda)
+    enumerize :area_type, in: Chouette::AreaType::ALL
 
     with_options dependent: :destroy do |assoc|
       assoc.has_many :stop_points
@@ -39,11 +39,21 @@ module Chouette
     validates_format_of :coordinates, :with => %r{\A *-?(0?[0-9](\.[0-9]*)?|[0-8][0-9](\.[0-9]*)?|90(\.[0]*)?) *\, *-?(0?[0-9]?[0-9](\.[0-9]*)?|1[0-7][0-9](\.[0-9]*)?|180(\.[0]*)?) *\Z}, :allow_nil => true, :allow_blank => true
     validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
 
+    validates_numericality_of :waiting_time, greater_than_or_equal_to: 0, only_integer: true, if: :waiting_time
+    validate :parent_area_type_must_be_greater
+
     def self.nullable_attributes
       [:registration_number, :street_name, :country_code, :fare_code,
       :nearest_topic_name, :comment, :long_lat_type, :zip_code, :city_name, :url, :time_zone]
     end
 
+    def parent_area_type_must_be_greater
+      return unless self.parent
+      if Chouette::AreaType.find(self.area_type) >= Chouette::AreaType.find(self.parent.area_type)
+        errors.add(:parent_id, I18n.t('stop_areas.errors.parent_area_type', area_type: self.parent.area_type))
+      end
+    end
+
     after_update :clean_invalid_access_links
     before_save :coordinates_to_lat_lng
 
@@ -72,6 +82,10 @@ module Chouette
       end
     end
 
+    def full_name
+      "#{name} #{zip_code} #{city_name} - #{user_objectid}"
+    end
+
     def user_objectid
       if objectid =~ /^.*:([0-9A-Za-z_-]+):STIF$/
         $1
@@ -196,10 +210,12 @@ module Chouette
       GeoRuby::SimpleFeatures::Envelope.from_coordinates coordinates
     end
 
+    # DEPRECATED use StopArea#area_type
     def stop_area_type
       area_type ? area_type : " "
     end
 
+    # DEPRECATED use StopArea#area_type
     def stop_area_type=(stop_area_type)
       self.area_type = (stop_area_type ? stop_area_type.camelcase : nil)
     end
@@ -324,5 +340,20 @@ module Chouette
       end
     end
 
+    def activated?
+      deleted_at.nil?
+    end
+
+    def deactivated?
+      !activated?
+    end
+
+    def activate!
+      update_attribute :deleted_at, nil
+    end
+
+    def deactivate!
+      update_attribute :deleted_at, Time.now
+    end
   end
 end