fix: merge wide_intervals only if week indexes are the same with diff…

…erent dates length
Publidata · Nov 14, 2024 · 6d4731c · 6d4731c
1 parent 4c57003
commit 6d4731c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/opening_hours_converter/opening_hours_rule.rb b/lib/opening_hours_converter/opening_hours_rule.rb
@@ -283,6 +283,7 @@ def same_time?(o)
       end
     end
 
+
     def same_date?(o)
       if o.nil? || o.date.length != @date.length
         false
@@ -295,12 +296,23 @@ def same_date?(o)
     end
 
     def mergeable?(o)
-      if o.nil? || o.date.length != @date.length
+      return true if o.nil?
+
+      if o.date.length != @date.length
+        if @date.any? { |date| date.wide_interval.type == "week" }
+          indexes = (@date + o.date).map do |date|
+            date.wide_interval.indexes
+          end.uniq
+
+          return false if indexes.length > 1
+        end
+
         true
       else
         @date.each_with_index do |d, i|
           return false if (d.wide_interval.start&.dig(:year) != o.date[i].wide_interval.start&.dig(:year)) && d.wide_interval.type != o.date[i].wide_interval.type || (d.wide_interval.type == "week" && o.date[i].wide_interval.type == "week" && d.wide_interval.indexes != o.date[i].wide_interval.indexes)
         end
+
         true
       end
     end

diff --git a/spec/automaticaly_generated_no_combo_parser_spec.rb b/spec/automaticaly_generated_no_combo_parser_spec.rb
@@ -3319,4 +3319,7 @@
   it '2024 Week 3, 6, 9, 12-44/2, 47, 50 Mo; 2025 Week 1, 4, 7, 10, 13-43/2, 46, 49, 52 Mo' do
     expect(OpeningHoursConverter::OpeningHoursBuilder.new.build(OpeningHoursConverter::OpeningHoursParser.new.parse('2024 Week 3, 6, 9, 12-44/2, 47, 50 Mo; 2025 Week 1, 4, 7, 10, 13-43/2, 46, 49, 52 Mo'))).to eql('2024 week 3,6,9,12-44/2,47,50 Mo 00:00-23:59; 2025 week 1,4,7,10,13-43/2,46,49,52 Mo 00:00-23:59')
   end
+  it '2024 Week 1-52/2 Tu; 2025 Week 1-52/2 Tu; 2026 Week 1 Tu' do
+    expect(OpeningHoursConverter::OpeningHoursBuilder.new.build(OpeningHoursConverter::OpeningHoursParser.new.parse('2024 Week 1-52/2 Tu; 2025 Week 1-52/2 Tu; 2026 Week 1 Tu'))).to eql('2024-2025 week 1-52/2 Tu 00:00-23:59; 2026 week 1 Tu 00:00-23:59')
+  end
 end