renalware-core 2.0.118 → 2.0.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 362a3539cb21366fb7702b1e0e6131abbe433e9e6212898ad9a599c80ed67ba7
-  data.tar.gz: eb33cd22ab7bbda713cfefe9d9cf007eb79bff1ed3dcac72b7a7edb09781a85f
+  metadata.gz: 6b20fd2784102f2bc228e130563e12f6cdd028c8236aac107f1379a7ffb87264
+  data.tar.gz: c6ed21e356671d93abd5f85f385a0d455ed0b9b88b9af2c94aa2cd8321585808
 SHA512:
-  metadata.gz: e502880f5d989ea8741e218033bf9f5235ffd9be6ce2c05229f8da46f06c2f509f254014dfc0363b637b5c6a6fc5e46532af3e2c922bc4e373a352602ca5f115
-  data.tar.gz: 120370c1f5c9fb3ece4f87f30cae88a33f07d4c2de6077de0a4c5a7adff832b4df862bdefd08459d579ff00c2ffb3d736fa81cd15c7160cee3bde5de6869bc0f
+  metadata.gz: c2999fd94caa5f2f4194c4b90e674b03df5f0f650c1bcf0bcf0d04fa762aa959db98d254d33b65339c2e0bc60bde53d268cafc30000abe8cad744a63e4f0b6ff
+  data.tar.gz: 6bf213076af4c9481f54f8678aa256260814b2a43a68ad29aa0f97b24f7f3f2bc7f2fbf6c29a671c85ff9b2cb8173b201bf28a9fc2e548081a2538658df838ef

data/app/models/renalware/feeds/hl7_message.rb

@@ -124,7 +124,6 @@ module Renalware
 
       class PatientIdentification < SimpleDelegator
         alias_attribute :external_id, :patient_id
-        alias_attribute :sex, :admin_sex
         alias_attribute :dob, :patient_dob
         alias_attribute :born_on, :patient_dob
         alias_attribute :died_at, :death_date
@@ -157,6 +156,15 @@ module Renalware
           super.split("^")
         end
 
+        # Try to read sex_admin, but be aware it raises an error if it is not in F|M|O|U|A|N|C
+        # in which case append the actual value so we know what is causing the failure.
+        def sex
+          self[8] = self[8]&.upcase # Sex eg F should always be uppercase so no harm in doing this
+          admin_sex
+        rescue HL7::InvalidDataError => e
+          raise e, "#{e} value is '#{self[8]}'", e.backtrace
+        end
+
         private
 
         def patient_name

data/app/models/renalware/patients/ingestion/command_factory.rb

@@ -21,7 +21,7 @@ module Renalware
           # when :discharge_patient then make_discharge_patient(message)
           # when :cancel_discharge then make_cancel_discharge(message)
           # when :add_consultant then make_add_consultant(message)
-          else :no_matching_command
+          else noop
           end
         end
 
@@ -49,6 +49,10 @@ module Renalware
           Commands::AddOrUpdatePatient.new(message)
         end
 
+        def noop
+          NullObject.instance
+        end
+
         # def make_merge_patient(message)
         #   Commands::MergePatient.new(message,
         #     major_patient_finder: make_patient_finder_with_add_if_missing,

data/lib/renalware/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.118
+  version: 2.0.119
 platform: ruby
 authors:
 - Airslie
@@ -878,20 +878,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: webpacker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: whenever
   requirement: !ruby/object:Gem::Requirement