renalware-core 2.0.34 → 2.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9f1d61c7f654e5dd89e867056ea4e272b89749a6713977cb6d7e46d09661e3e
-  data.tar.gz: c58ace6f98d24326bae07fff01d57f8fc6cf2e1058d278c6986d526d65a89463
+  metadata.gz: a779b18871bd5f31fe4baa1fc6a868aac2861668a743389e5815729922f1fca3
+  data.tar.gz: ada4dd9150fdfb89dd42dc995516895c133393bd4974c0bbd7981e04bc33d60e
 SHA512:
-  metadata.gz: 145c983783938cd21ed54a380620e51ef7bf7a2c9cc9b4f5d622c1afda2df505ccbac665a5e8b24682dd7bb3b2f6f5b82da52ec4a29e4cb2c21994a26acf440c
-  data.tar.gz: 3d15d1971d32dadfb74b35b387dbc9969f29facec45a33732bcdfa4453fb007a18d61affaaa7a03e624f049f8dcefec70cc101b6dae48f12dd1dfda5dbdf3eee
+  metadata.gz: 1fb542eadec8a2362be78fa93f34d9a399c04aeb9337106edcc69934d00a679a999dea68e5464a5768c41d4ebba119cbb5216dc0e6e752d879e0e83d01f2a1b5
+  data.tar.gz: e91844cdde10cb7044a6ca6a39ebb9b277f68f38d4c8606e3211fb646ac851d791e77b609c210d541e267e58e83bce8c171b156a8cdf2e99a46d2f87d871a22f

data/app/models/renalware/ukrdc/patients_query.rb

@@ -9,10 +9,11 @@ module Renalware
     # patients who have changed since the last time they were exported.
     class PatientsQuery
       def call(changed_since: nil)
+
         if changed_since.present?
           rpv_patients.where("updated_at > ?", changed_since)
         else
-          rpv_patients.where("updated_at > sent_to_ukrdc_at")
+          rpv_patients.where("(sent_to_ukrdc_at is null) or (updated_at > sent_to_ukrdc_at)")
         end
       end
 

data/app/models/renalware/ukrdc/send_patient.rb

@@ -13,9 +13,16 @@ module Renalware
           logger.info "  Patient #{patient.to_param}"
           xml_payload = build_payload(log)
           if xml_payload_same_as_last_sent_payload?(xml_payload)
+            logger.info "    skipping as no change in XML file"
             log.unsent_no_change_since_last_send!
           else
             send_file(xml_payload, log)
+            # Important we use update_column here so we don't trigger updated_at to change
+            # on the patient, which affects the results of PatientsQuery next time.
+            patient.update_column(:sent_to_ukrdc_at, Time.zone.now)
+            logger.info(
+              "    sending file and setting patient.sent_to_ukrdc_at = #{patient.sent_to_ukrdc_at}"
+            )
           end
           logger.info "    Status: #{log.status}"
         end
@@ -58,7 +65,10 @@ module Renalware
       end
 
       def presenter_for(patient)
-        Renalware::UKRDC::PatientPresenter.new(patient, changes_since: changes_since)
+        Renalware::UKRDC::PatientPresenter.new(
+          patient,
+          changes_since: changes_since
+        )
       end
 
       # Note a test might have passed in a mock renderer
@@ -80,8 +90,6 @@ module Renalware
           @to_md5_hash ||= Digest::MD5.hexdigest(time_neutral_payload)
         end
 
-        private
-
         # Remove the time elements from SendingFacility
         # e.g.
         #   <SendingFacility channelName='Renalware' time='2018-02-26T13:18:02+00:00'/>
@@ -92,6 +100,7 @@ module Renalware
           payload
             .gsub(/<Stream>[^<]*<\/Stream>/, "<Stream>removed</Stream>")
             .gsub(/ (time|start|stop)=["'][^'"]*['"]/, '')
+            .gsub(/<UpdatedOn>[^<]*<\/UpdatedOn>/, "<UpdatedOn>removed</UpdatedOn>")
         end
       end
     end

data/app/models/renalware/ukrdc/send_patients.rb

@@ -68,7 +68,7 @@ module Renalware
       end
 
       def within_new_folder
-        dir = Rails.root.join("tmp", timestamp)
+        dir = Pathname(File.join("/var", "ukrdc", timestamp))
         FileUtils.mkdir_p dir
         FileUtils.mkdir_p File.join(dir, "xml")
         FileUtils.mkdir_p File.join(dir, "encrypted")

data/app/models/renalware/ukrdc/transmission_log.rb

@@ -19,6 +19,7 @@ module Renalware
         log.error = formatted_exception(error)
         log.status = :error
         log.save!
+        raise error
       end
 
       def self.formatted_exception(error)

data/app/presenters/renalware/ukrdc/patient_presenter.rb

@@ -15,7 +15,10 @@ module Renalware
         if changes_since.present? && changes_since.is_a?(String)
           changes_since = Time.zone.parse(changes_since)
         end
-        @changes_since = changes_since || patient.sent_to_ukrdc_at
+        # TODO: document what's happening here with dates
+        @changes_since = changes_since ||
+                         patient.sent_to_ukrdc_at ||
+                         Renalware.config.ukrdc_default_changes_since_date
         if @changes_since.blank?
           raise(
             ArgumentError,
@@ -114,7 +117,7 @@ module Renalware
       end
 
       def clinics_patient
-        @clinic_patient ||= Renalware::Clinics.cast_patient(__getobj__)
+        @clinics_patient ||= Renalware::Clinics.cast_patient(__getobj__)
       end
 
       def letters_patient

data/lib/renalware/configuration.rb

@@ -53,6 +53,9 @@ module Renalware
       ENV["FALLBACK_EMAIL_ADDRESS_FOR_TEST_MESSAGES"]
     end
     config_accessor(:ukrdc_sending_facility_name) { ENV["UKRDC_SENDING_FACILITY_NAME"] }
+    config_accessor(:ukrdc_default_changes_since_date) {
+      Date.parse(ENV.fetch("UKRDC_DEFAULT_CHANGES_SINCE_DATE", "2018-01-01"))
+    }
 
     # We override this in some tests as a means of getting wicked_Pdf to generate an HTML version
     # of the PDF so we can examine its content

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.34"
+  VERSION = "2.0.35"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.34
+  version: 2.0.35
 platform: ruby
 authors:
 - Airslie