gouv-calendar-compilator 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 719614f1e5fe0516488dc08ffec1858e799d846142414f8f646530eacb289014
-  data.tar.gz: a6bdee0f7bf814f57798b06d24f21cdf287ffff9e614f58b20fd6646b8321e09
+  metadata.gz: 7c1b039734ff757775f636a2c51a770693989af6b681ace240a11b902e9a13c0
+  data.tar.gz: e0e374e47fef2515d86adfc4388150fba03cb012d9d0bf00f80501f2c2c67cc8
 SHA512:
-  metadata.gz: 27825a82df74477ac8761be1f588af5ecd4ea8dbbab452642816bb10a61650f322e7d2dbe0facb9ee95f829628ff8e66bcfde5281f05a9c88144caef8cd5a9fc
-  data.tar.gz: 066332f68d70708fe297bade2d8e4e4da1f7402facc7e44473d9f2604d439f55468a01727bd71ce40457b24a759a8c3be63a294992906aa72bcb82c54a1ae405
+  metadata.gz: 0a9b85b4249d1b2a5414d112aff6a7b5daebec944cd42e154727b61b31a1b607c4c8a55e7c20b9117452623a309d3c0cfcfd35ffa6f34610970f5d29b3a7bca5
+  data.tar.gz: a233828c6292b4ed30e7fbd0b90ac4ff594d85813ebb689469081c24d65a288ce9677c2713506181b206339135963d6120a20727681768bc90e350fbb29d9f5d

data/lib/gouv_calendar_compilator/data_compilators/france/national_days_off_data_compilator.rb

@@ -82,17 +82,10 @@ module GouvCalendarCompilator
             included_in_vacation = true
             splitted_vacation = ndo_split_holidays_period_insert_day_off(calendar[zone_name][index], day_off_date)
 
-            # replacing current holiday with the first part of the splitted one
-            # except if day off is first day of holiday (then deleting the first part of the splitted vacation)
-            if calendar[zone_name][index][:start] == day_off_date.to_s
-              calendar[zone_name].delete(calendar[zone_name][index])
-            else
-              calendar[zone_name][index] = splitted_vacation[0]
-            end
-            # inserting national day off
-            calendar[zone_name] << splitted_vacation[1]
-            # inserting other part of the splitted vacation
-            calendar[zone_name] << splitted_vacation[2]
+            keeped_periods = determines_what_to_keep(splitted_vacation, calendar[zone_name][index], day_off_date)
+            # remove the current vacation before adding the correct parts of the splitted_vacation
+            calendar[zone_name].delete(calendar[zone_name][index])
+            calendar[zone_name].push(*keeped_periods)
           end
 
           # if day off not in the middle of a vacation period, simply insert it inside the dataset
@@ -106,6 +99,31 @@ module GouvCalendarCompilator
         end
         calendar
       end
+
+      # Determines what parts of the splitted vacation to keep to replace current vacation
+      #
+      # - if vacation is 1 day and day off is the first and the last day of it, then keep only the day_off
+      # - if day off is first day of holiday, then do not keep the first part of the splitted vacation
+      # - if day off is last day of holiday, then do not keep the last part of the splitted vacation
+      def determines_what_to_keep(splitted_vacation, period, day_off_date)
+        # inserting national day off
+        elements_to_add = [splitted_vacation[1]]
+        return elements_to_add if period[:start] == day_off_date.to_s && period[:end] == (day_off_date + 1).to_s
+
+        if period[:start] == day_off_date.to_s
+          # inserting last part of the splitted vacation
+          elements_to_add << splitted_vacation[2]
+        elsif period[:end] == (day_off_date + 1).to_s
+          # inserting first part of the splitted vacation
+          elements_to_add << splitted_vacation[0]
+        else
+          # inserting first & last part of the splitted vacation
+          elements_to_add << splitted_vacation[0]
+          elements_to_add << splitted_vacation[2]
+        end
+
+        elements_to_add
+      end
     end
   end
 end

data/lib/gouv_calendar_compilator/data_compilators/france/school_holidays_data_compilator.rb

@@ -74,13 +74,22 @@ module GouvCalendarCompilator
         approximate_start_date.to_date.to_s
       end
 
-      # Trims dataset to desired time era
+      # Trims dataset to desired time era and remove possibly wrong data.
+      #
+      # Example of bad data:
+      # "end_date"=>"2023-07-08T00:00:00+02:00", "start_date"=>"2023-07-08T00:00:00+02:00",
+      # "zones"=>"Zone C", "description"=>"Debut des Vacances d'ete"
+      #
+      # Almost "OK" data but not needed here, and that should appear as a national day off somewhere else.
+      # "end_date"=>"2020-03-19T00:00:00+01:00", "start_date"=>"2020-03-19T00:00:00+01:00",
+      # "zones"=>"Guadeloupe", "description"=>"Mi-careme"
       def sh_trim_not_necessary_data(raw_sh_dataset)
         date_range = ::GouvCalendarCompilator::DATETIME_START...::GouvCalendarCompilator::DATETIME_END
         filtered_data =
           raw_sh_dataset.select do |record|
             date_range.include?(::Date.parse(record['fields']['start_date'])) &&
-              (record['fields']['end_date'] ? date_range.include?(::Date.parse(record['fields']['end_date'])) : true)
+              (record['fields']['end_date'] ? date_range.include?(::Date.parse(record['fields']['end_date'])) : true) &&
+              record['fields']['start_date'] != record['fields']['end_date']
           end
         filtered_data.uniq do |record|
           [

data/lib/version.rb

@@ -6,6 +6,6 @@
 # frozen_string_literal: true
 
 module GouvCalendarCompilator
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
   public_constant :VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gouv-calendar-compilator
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Valentin ALBERT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct