renalware-core 2.0.129 → 2.0.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 156b1e1ab54f4596ebc2b14b72f0f82c1476191b8b0efbe035615136120ad49e
-  data.tar.gz: 05cc53cd4907c8545db2566f8ab8e33744821f50274b259212765b108a92c929
+  metadata.gz: da57af35307fc3b61ecd3a63a06fbbc38bcf7b11a50e81b2def0333a5f9cd773
+  data.tar.gz: dce6d2238587ebb06f9b25d2fb4dd90997255eb485af69df9fb0a2ad4ed080a4
 SHA512:
-  metadata.gz: 2c8b74079f3b0dcb8e7cc78ca57f01b8d81a5ca789c3f76f60c8bedac26cab9b5e78d57d2c41ac072c2acdf2adf528c1af653787ecf7548ded3abb4b8b90741c
-  data.tar.gz: c2e35bc6f3bf69085582d1905353b07a3e6d0f8fa20c6c180ea3d48d8d3910a125a71868302aee08ffcfe74c65fafc89dce41df30e217a7cdd486a061ce434da
+  metadata.gz: 319282259cb9f86a3d0bbd343b236401accd2bc70be630e152e309de57199a02680f7c27e4f566ad2eb7c8523c18a31641610f683082965f3e6684991c99b65e
+  data.tar.gz: 89d78ef44fc08a1de7e88ddb24f9e6c1f401c0d1481156d6cd3d967b01b130ba12aaf83006dc2183a12128ba702d37e663743776d4eb533ec3ef183be8788f39

data/app/models/renalware/patients/ingestion/message_mappers/patient.rb

@@ -55,7 +55,7 @@ module Renalware
               street_3: nil,
               town: address[2],
               county: address[3],
-              postcode: address.last
+              postcode: address[4]
             }
           end
           # rubocop:enable Metrics/AbcSize, Metrics/MethodLength

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

@@ -33,9 +33,19 @@ module Renalware
       private
 
       def sendable_patients
-        Renalware::Patient.where(send_to_rpv: true).or(
-          Renalware::Patient.where(send_to_renalreg: true)
-        ).order(family_name: :asc, given_name: :asc)
+        Renalware::Patient.where(send_to__where_sql).order(family_name: :asc, given_name: :asc)
+      end
+
+      def send_to__where_sql
+        where = []
+        where << "send_to_rpv = true" if Renalware.config.ukrdc_send_rpv_patients
+        where << "send_to_renalreg = true" if Renalware.config.ukrdc_send_rreg_patients
+
+        if where.empty?
+          raise ArgumentError, "#{self.class.name}.sendable_patients would send all patients!"
+        end
+
+        where.join(" or ")
       end
     end
   end

data/lib/renalware/configuration.rb

@@ -80,6 +80,13 @@ module Renalware
     # a dump of historical pathology.
     config_accessor(:ukrdc_pathology_start_date) { ENV["UKRDC_PATHOLOGY_START_DATE"] }
 
+    config_accessor(:ukrdc_send_rpv_patients) {
+      ENV.fetch("UKRDC_SEND_RPV_PATIENTS", "true") == "true"
+    }
+    config_accessor(:ukrdc_send_rreg_patients) {
+      ENV.fetch("UKRDC_SEND_RREG_PATIENTS", "true") == "true"
+    }
+
     # 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
     config_accessor(:render_pdf_as_html_for_debugging) { false }

data/lib/renalware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.129
+  version: 2.0.130
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component