Change wording for clean up + add exclusive dates for between clean up

1 files changed, 5 insertions, 5 deletions

diff --git a/app/models/clean_up.rb b/app/models/clean_up.rb
index cbcde72f5..75fedc732 100644
--- a/app/models/clean_up.rb
+++ b/app/models/clean_up.rb
@@ -6,8 +6,8 @@ class CleanUp < ActiveRecord::Base
 
   enumerize :date_type, in: %i(between before after)
 
-  validates :begin_date, presence: true
-  validates :date_type, presence: true
+  validates_presence_of :begin_date, message: :presence
+  validates_presence_of :date_type, message: :presence
   after_commit :perform_cleanup, :on => :create
 
   def perform_cleanup
@@ -30,7 +30,7 @@ class CleanUp < ActiveRecord::Base
   end
 
   def destroy_time_tables_between
-    time_tables = Chouette::TimeTable.where('end_date <= ? AND start_date >= ?', self.end_date, self.begin_date)
+    time_tables = Chouette::TimeTable.where('end_date < ? AND start_date > ?', self.end_date, self.begin_date)
     self.destroy_time_tables(time_tables)
   end
 
@@ -53,7 +53,7 @@ class CleanUp < ActiveRecord::Base
   end
 
   def destroy_time_tables_dates_between
-    Chouette::TimeTableDate.in_dates.where('date >= ? AND date <= ?', self.begin_date, self.end_date).destroy_all
+    Chouette::TimeTableDate.in_dates.where('date > ? AND date < ?', self.begin_date, self.end_date).destroy_all
   end
 
   def destroy_time_tables_periods_before
@@ -65,7 +65,7 @@ class CleanUp < ActiveRecord::Base
   end
 
   def destroy_time_tables_periods_between
-    Chouette::TimeTablePeriod.where('period_start >= ? AND period_end <= ?', self.begin_date, self.end_date).destroy_all
+    Chouette::TimeTablePeriod.where('period_start > ? AND period_end < ?', self.begin_date, self.end_date).destroy_all
   end
 
   def overlapping_periods