From 1b1c234e37edcc20e31fc0923aff06b615194631 Mon Sep 17 00:00:00 2001
From: Kat <katrina@madetech.com>
Date: Tue, 17 May 2022 09:36:35 +0100
Subject: [PATCH] remove completed status from exports

---
 app/services/exports/case_log_export_service.rb       |  8 ++++----
 spec/services/exports/case_log_export_service_spec.rb | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/services/exports/case_log_export_service.rb b/app/services/exports/case_log_export_service.rb
index b7f236b51..f857ab6f5 100644
--- a/app/services/exports/case_log_export_service.rb
+++ b/app/services/exports/case_log_export_service.rb
@@ -54,11 +54,11 @@ module Exports
     def retrieve_case_logs(current_time)
       recent_export = LogsExport.order("started_at").last
       if recent_export
-        params = { from: recent_export.started_at, to: current_time, status: CaseLog.statuses[:completed] }
-        CaseLog.where("updated_at >= :from and updated_at <= :to and status = :status", params)
+        params = { from: recent_export.started_at, to: current_time }
+        CaseLog.where("updated_at >= :from and updated_at <= :to", params)
       else
-        params = { to: current_time, status: CaseLog.statuses[:completed] }
-        CaseLog.where("updated_at <= :to and status = :status", params)
+        params = { to: current_time }
+        CaseLog.where("updated_at <= :to", params)
       end
     end
 
diff --git a/spec/services/exports/case_log_export_service_spec.rb b/spec/services/exports/case_log_export_service_spec.rb
index a4f9a9374..4e0a9dbc9 100644
--- a/spec/services/exports/case_log_export_service_spec.rb
+++ b/spec/services/exports/case_log_export_service_spec.rb
@@ -46,7 +46,8 @@ RSpec.describe Exports::CaseLogExportService do
     end
 
     context "and case logs are available for export" do
-      let!(:time_now) { Time.now }
+      let!(:time_now) { Time.zone.now }
+
       before do
         Timecop.freeze(time_now)
         case_log
@@ -81,15 +82,15 @@ RSpec.describe Exports::CaseLogExportService do
         start_time = Time.zone.local(2022, 4, 13, 2, 2, 2)
         export = LogsExport.new(started_at: start_time, daily_run_number: 1)
         export.save!
-        params = { from: start_time, to: time_now, status: CaseLog.statuses[:completed] }
-        expect(CaseLog).to receive(:where).with("updated_at >= :from and updated_at <= :to and status = :status", params).and_return([])
+        params = { from: start_time, to: time_now }
+        expect(CaseLog).to receive(:where).with("updated_at >= :from and updated_at <= :to", params).and_return([])
         export_service.export_case_logs
       end
 
       context "when this is the first export" do
         it "gets the logs for the timeframe up until the current time" do
-          params = { to: time_now, status: CaseLog.statuses[:completed] }
-          expect(CaseLog).to receive(:where).with("updated_at <= :to and status = :status", params).and_return([])
+          params = { to: time_now }
+          expect(CaseLog).to receive(:where).with("updated_at <= :to", params).and_return([])
           export_service.export_case_logs
         end
       end