forest_liana 8.0.6 → 8.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ab34290d73cd66fa40aed2a7620e9638b93d3b4c9e569412f57cd073dda4925
-  data.tar.gz: 5eedc8328ac380dc232c46ddc1be500b8068faebdde6c6fdbfc1967a5c3ae6c5
+  metadata.gz: b395f8136045929ee6e5610993210a7afa2fba21e386be617a9eb3b91e233ab7
+  data.tar.gz: f645d1f802cfc90d3cb4bdc13d9f83519140f19cfab90d441f2a06b2a3f6c5c8
 SHA512:
-  metadata.gz: abdc878c4f8bca501c5dc7ecfdbea441e3ff497329661b050be832a794b7c72cf6012b48b8ab84cb8fc1b73fae5c9e5f9ead7c9e02d975a12588361e804d219d
-  data.tar.gz: 92efd8362593ea90c03897983d102cbc60720c4c49e8bf4645c2b8ed3e9fbe4348f172b25efd89dfc593aa18192dfe2494daca1a53a69fdfa027f82be0ce7c2e
+  metadata.gz: 9c59fad452dc8275df24891f8b8daf471de210c3511a51eb067a1aee8b933dd6fa85cdfd23145bd638d4ab34e33cd56befe0b307d8ef29dda53b27f522864c47
+  data.tar.gz: e689c424aca159aa99debbb0a34c3b0e43c0f4542a8c696a083f196f20c28bca220dc4fef82f13b976a40ed919c0cea7c84df4f12ac33f0bfa588fd4c53a847e

data/app/services/forest_liana/operator_date_interval_parser.rb

@@ -114,9 +114,10 @@ module ForestLiana
       else
         from = to_client_timezone(duration.send(period).ago
           .send("beginning_of_#{period_of_time}"))
-        to = to_client_timezone(1.send(period).ago
+        to = to_client_timezone(duration.send(period).ago
           .send("end_of_#{period_of_time}"))
       end
+
       "BETWEEN '#{from}' AND '#{to}'"
     end
 
@@ -151,9 +152,10 @@ module ForestLiana
       else
         from = to_client_timezone((duration * 2).send(period).ago
           .send("beginning_of_#{period_of_time}"))
-        to = to_client_timezone((1 + duration).send(period).ago
+        to = to_client_timezone((duration * 2).send(period).ago
           .send("end_of_#{period_of_time}"))
       end
+
       "BETWEEN '#{from}' AND '#{to}'"
     end
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "8.0.6"
+  VERSION = "8.0.7"
 end

data/spec/services/forest_liana/filters_parser_spec.rb

@@ -1,4 +1,6 @@
 module ForestLiana
+  include ActiveSupport::Testing::TimeHelpers
+
   describe FiltersParser do
     let(:timezone) { 'Europe/Paris' }
     let(:resource) { Tree }
@@ -488,5 +490,22 @@ module ForestLiana
 
       it { expect(filter_parser.apply_filters_on_previous_interval(date_condition_3).count).to eq 1 }
     end
+
+    describe 'parse_condition with time operator' do
+      let(:freeze_time) { Time.utc(2022, 5, 22, 0, 0, 0) }
+      before do
+        Timecop.freeze freeze_time
+      end
+
+      after do
+        Timecop.return
+      end
+
+      it 'parse_condition should return the correct query interval' do
+        res = filter_parser.parse_condition({ 'field' => 'created_at', 'operator' => 'previous_quarter', 'value' => nil })
+
+        expect(res[res.index('BETWEEN')..-1]).to eq "BETWEEN '2021-12-31 22:00:00 UTC' AND '2022-03-31 21:59:59 UTC'"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 8.0.6
+  version: 8.0.7
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails