Merge pull request #1307 from DaanVanVugt/bugfix/new_year_grace_period_ingestors

calculate 2 week grace period from end instead of start

Author: fbacall

lib/ingestors/taxila/dcc_ingestor.rb

@@ -41,7 +41,7 @@ def process_dcc(url)
             event.start = Time.zone.parse(start_str[0])
             event.end = Time.zone.parse(start_str[1])
           end
-          if event.start < Time.zone.now - 2.weeks
+          if event.end < Time.zone.now - 2.weeks
             event.start = event.start.change(year: Time.now.year + 1)
             event.end = event.end.change(year: Time.now.year + 1)
           end

lib/ingestors/taxila/lcrdm_ingestor.rb

@@ -45,7 +45,7 @@ def process_lcrdm(url)
           elsif [2, 3].include?(split_time_str[1].split(' ').length)
             event.end = Time.zone.parse(split_time_str[1])
           end
-          if event.start < Time.zone.now - 2.weeks
+          if event.end < Time.zone.now - 2.weeks
             event.start = event.start.change(year: Time.now.year + 1)
             event.end = event.end.change(year: Time.now.year + 1)
           end

lib/ingestors/taxila/oscd_ingestor.rb

@@ -71,7 +71,7 @@ def oscd_fix_time(date_str)
 
             event_start = Time.zone.parse([el1, el2].join(' '))
             event_end = Time.zone.parse([el1, el2].join(' '))
-            if event_start < (Time.zone.now - 2.weeks)
+            if event_end < (Time.zone.now - 2.weeks)
               event_start = event_start.change(year: event_start.year + 1)
               event_end = event_end.change(year: event_start.year + 1)
             end

lib/ingestors/taxila/rdnl_ingestor.rb

@@ -44,7 +44,7 @@ def process_rdnl(url)
           end
           event.start = event.start.change(year: event.end.year) if event.start < event.end - 1.year
           event.start = event.start.change(year: event.end.year - 1) if event.start > event.end
-          if event.start < Time.zone.now - 2.weeks
+          if event.end < Time.zone.now - 2.weeks
             event.start = event.start.change(year: Time.now.year + 1)
             event.end = event.end.change(year: Time.now.year + 1)
           end

test/unit/ingestors/taxila/rdnl_ingestor_test.rb

@@ -27,7 +27,7 @@ class RDNLIngestorTest < ActiveSupport::TestCase
     refute Event.where(title: new_title, url: new_url).any?
 
     # run task
-    assert_difference 'Event.count', 2 do
+    assert_difference 'Event.count', 3 do
       freeze_time(2026) do
         VCR.use_cassette('ingestors/rdnl') do
           ingestor.read(source.url)
@@ -36,9 +36,9 @@ class RDNLIngestorTest < ActiveSupport::TestCase
       end
     end
 
-    assert_equal 2, ingestor.events.count
+    assert_equal 3, ingestor.events.count
     assert ingestor.materials.empty?
-    assert_equal 2, ingestor.stats[:events][:added]
+    assert_equal 3, ingestor.stats[:events][:added]
     assert_equal 0, ingestor.stats[:events][:updated]
     assert_equal 0, ingestor.stats[:events][:rejected]