roqua-healthy 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fe41526687263d414b6fbb4a14e77d0538d14cfc
-  data.tar.gz: d9222496cb31cd289ac4050f89a0bd77dea11d71
+SHA256:
+  metadata.gz: a69d14d381de12c9ce4e1cbb04015bf71f2008de5f17bfa9704dab05f9d38791
+  data.tar.gz: 7c1943cc8598a5c13c66a017278503cb864511238389957c71dd9110580a4d43
 SHA512:
-  metadata.gz: f408d157c74b9d00f250921b041e35faa9cfa116f931ec8e3d38127ab484565c195915fc583aa73d9a23f7d004719e9ce675d1993e026c06ab7ebc9d5739eb13
-  data.tar.gz: b16066084c03e52ea5f81f857cf6c994c72164696eb36e853f9f52bbe1bac0b0ba5a3b47cab969c02be495a8b4bbc891917dd64247b353d72867e1c37968eae3
+  metadata.gz: d4ae997cb7c753cbffb28dfa7694598ddef996a8e780c9d8299fcf21a8a6d854440c5a3f6ced15e14d87d2e6c662506ce6df1290a102a1aaf04be7eed0dd689d
+  data.tar.gz: f8dfa8991ae1acf13bdcd5351dd4bcf50e5012aa8cbedd1ffdbf3fd6a788f43b65d24a5cb4d27d1fa0843e7857eac1ffd80b04d1553bb49ba62ad8a65c454d64

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 1.6.11
+
+* Support for PID.11 and PID.13 completely missing from an hl7 response.
+
 ### 1.5.10
 
 * Support for house number suffices in PID 11.2

data/Guardfile

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-guard 'rspec', cmd: 'bundle exec rspec -f Fuubar' do
+guard 'rspec', cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/healthy/(.+)\.rb$}) { |m| ["spec/unit/#{m[1]}_spec.rb", "spec/integration"] }
   watch('spec/spec_helper.rb') { "spec" }

data/lib/roqua/healthy/a19/address_parser.rb

@@ -58,7 +58,7 @@ module Roqua
         private
 
         def get_address_of_type(message, type)
-          message.fetch('PID').fetch('PID.11').find do |record|
+          message.dig('PID', 'PID.11')&.find do |record|
             record.fetch('PID.11.7', :unknown_type_of_address_record) == type
           end
         end

data/lib/roqua/healthy/a19/phone_parser.rb

@@ -11,7 +11,7 @@ module Roqua
 
         # this is a heuristic to pick likely dutch cell phone numbers from hl7 messages
         def to_s
-          pid13 = message.fetch('PID').fetch('PID.13')
+          pid13 = message.dig('PID', 'PID.13') || []
 
           # prefer PRN (Primary Residence Number) that contains a cell phone number
           phone_cell_record = pid13.find do |record|

data/lib/roqua/healthy/a19/transformer.rb

@@ -19,8 +19,8 @@ module Roqua
           raise ::Roqua::Healthy::PatientNotFound unless message['PID'].present?
           message['PID']['PID.3']  = [message.fetch('PID').fetch('PID.3')].flatten.compact
           message['PID']['PID.5']  = [message.fetch('PID').fetch('PID.5')].flatten.compact
-          message['PID']['PID.11'] = [message.fetch('PID').fetch('PID.11')].flatten.compact
-          message['PID']['PID.13'] = [message.fetch('PID').fetch('PID.13')].flatten.compact
+          message['PID']['PID.11'] = [message.dig('PID', 'PID.11')].flatten.compact
+          message['PID']['PID.13'] = [message.dig('PID', 'PID.13')].flatten.compact
           @message = MessageCleaner.new(message).message
         end
 

data/lib/roqua/healthy/version.rb

@@ -2,6 +2,6 @@
 module Roqua
   module Healthy
     # healthy version
-    VERSION = "1.5.10"
+    VERSION = "1.5.11"
   end
 end

data/roqua-healthy.gemspec

@@ -37,7 +37,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'webmock', '~> 3.2'
 
   # Workflow and tools
-  gem.add_development_dependency 'fuubar'
   gem.add_development_dependency 'guard', '~> 2.1'
   gem.add_development_dependency 'guard-rspec', '~> 4.2.4'
   gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'

data/spec/fixtures/xmcare_missing_whole_pids.xml

@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+<HL7Message>
+  <MSH>
+    <MSH.1>|</MSH.1>
+    <MSH.2>^~\&amp;</MSH.2>
+    <MSH.3>
+      <MSH.3.1>XMCARE</MSH.3.1>
+    </MSH.3>
+    <MSH.4>
+      <MSH.4.1>ZIS</MSH.4.1>
+    </MSH.4>
+    <MSH.5>
+      <MSH.5.1>ROQUA</MSH.5.1>
+    </MSH.5>
+    <MSH.6>
+      <MSH.6.1>RGOC</MSH.6.1>
+    </MSH.6>
+    <MSH.7>
+      <MSH.7.1>20130924132007</MSH.7.1>
+    </MSH.7>
+    <MSH.8/>
+    <MSH.9>
+      <MSH.9.1>ADR</MSH.9.1>
+      <MSH.9.2>A19</MSH.9.2>
+      <MSH.9.3>ADR_A19</MSH.9.3>
+    </MSH.9>
+    <MSH.10>
+      <MSH.10.1>23099201</MSH.10.1>
+    </MSH.10>
+    <MSH.11>
+      <MSH.11.1>P</MSH.11.1>
+    </MSH.11>
+    <MSH.12>
+      <MSH.12.1>2.4</MSH.12.1>
+    </MSH.12>
+    <MSH.13/>
+    <MSH.14/>
+    <MSH.15>
+      <MSH.15.1>NE</MSH.15.1>
+    </MSH.15>
+    <MSH.16>
+      <MSH.16.1>NE</MSH.16.1>
+    </MSH.16>
+  </MSH>
+  <MSA>
+    <MSA.1>
+      <MSA.1.1>CA</MSA.1.1>
+    </MSA.1>
+    <MSA.2>
+      <MSA.2.1>2013092413200823</MSA.2.1>
+    </MSA.2>
+  </MSA>
+  <QRD>
+    <QRD.1>
+      <QRD.1.1>20130924132008</QRD.1.1>
+    </QRD.1>
+    <QRD.2>
+      <QRD.2.1>R</QRD.2.1>
+    </QRD.2>
+    <QRD.3>
+      <QRD.3.1>I</QRD.3.1>
+    </QRD.3>
+    <QRD.4>
+      <QRD.4.1>23</QRD.4.1>
+    </QRD.4>
+    <QRD.5/>
+    <QRD.6/>
+    <QRD.7>
+      <QRD.7.1>1</QRD.7.1>
+      <QRD.7.2>RD</QRD.7.2>
+    </QRD.7>
+    <QRD.8>
+      <QRD.8.1>12345678901</QRD.8.1>
+    </QRD.8>
+    <QRD.9>
+      <QRD.9.1>DEM</QRD.9.1>
+    </QRD.9>
+  </QRD>
+  <PID>
+    <PID.1>
+      <PID.1.1>1</PID.1.1>
+    </PID.1>
+    <PID.2/>
+    <PID.3>
+      <PID.3.1>12345678901</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>XMCARE</PID.3.4>
+      <PID.3.5>PI</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>123456789</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>NLMINBIZA</PID.3.4>
+      <PID.3.5>NNNLD</PID.3.5>
+      <PID.3.6/>
+      <PID.3.7>20120820</PID.3.7>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4/>
+      <PID.3.5>IBAN</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>GIRO</PID.3.4>
+      <PID.3.5>BA</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>BANK</PID.3.4>
+      <PID.3.5>BA</PID.3.5>
+    </PID.3>
+    <PID.4/>
+    <PID.5>
+      <PID.5.1>
+        <PID.5.1.1>Achternaam</PID.5.1.1>
+        <PID.5.1.2>""</PID.5.1.2>
+        <PID.5.1.3>Achternaam</PID.5.1.3>
+        <PID.5.1.4>""</PID.5.1.4>
+        <PID.5.1.5>""</PID.5.1.5>
+      </PID.5.1>
+      <PID.5.2>A</PID.5.2>
+      <PID.5.3>B</PID.5.3>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>L</PID.5.7>
+    </PID.5>
+    <PID.5>
+      <PID.5.1>Achternaam</PID.5.1>
+      <PID.5.2/>
+      <PID.5.3/>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>D</PID.5.7>
+    </PID.5>
+    <PID.5>
+      <PID.5.1/>
+      <PID.5.2>Babette</PID.5.2>
+      <PID.5.3/>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>N</PID.5.7>
+    </PID.5>
+    <PID.7>
+      <PID.7.1>17070415</PID.7.1>
+    </PID.7>
+    <PID.8>
+      <PID.8.1>F</PID.8.1>
+    </PID.8>
+  </PID>
+</HL7Message>

data/spec/integration/xmcare_spec.rb

@@ -215,6 +215,16 @@ describe 'Fetching A19 from XMcare' do
       expect(subject[:street]).to eq("Straatnaam 123ab")
     end
   end
+
+  describe 'a patient with no PID.11 (address) or PID.13 (phone) at all' do
+    before { load_fixture 'xmcare_missing_whole_pids', '12345678901' }
+    subject { Roqua::Healthy::A19.fetch("12345678901") }
+
+    it 'loads the rest' do
+      expect(subject[:firstname]).to eq("Babette")
+    end
+  end
+
   describe 'a patient that does not exist' do
     before { load_fixture 'xmcare_patient_not_found', '12345678901' }
 

data/spec/unit/a19/address_parser_spec.rb

@@ -54,6 +54,11 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.address_type).to be_nil
     end
+
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.address_type).to be_nil
+    end
   end
 
   describe '#street' do
@@ -98,6 +103,11 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.street).to eq("Homestreet 1ab")
     end
+
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.street).to be_nil
+    end
   end
 
   describe '#city' do
@@ -118,6 +128,11 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.city).to be_nil
     end
+
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.city).to be_nil
+    end
   end
 
   describe '#zipcode' do
@@ -138,6 +153,10 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.zipcode).to be_nil
     end
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.zipcode).to be_nil
+    end
   end
 
   describe '#country' do
@@ -158,6 +177,11 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.country).to be_nil
     end
+
+    it 'handles missing PID' do
+      parser = described_class.new('PID' => {})
+      expect(parser.country).to be_nil
+    end
   end
   # rubocop:enable Metrics/MethodLength
 end

data/spec/unit/a19/phone_parser_spec.rb

@@ -31,6 +31,13 @@ RSpec.describe Roqua::Healthy::A19::PhoneParser do
     it { should be_nil }
   end
 
+  describe 'no phone number field at all' do
+    let(:message) do
+      {'PID' => {}}
+    end
+    it { should be_nil }
+  end
+
   describe 'mobile type in PRN is preferred over other mobile numbers' do
     let(:message) do
       {'PID' => {'PID.13' => [{'PID.13.1' => '0612345678', 'PID.13.2' => 'CP'},

data/spec/unit/oru/client_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Roqua::Healthy::Oru::Client do
           'hash%3E%0A++%3Coru+type%3D%22symbol%22%3Edata%3C%2Foru%3E%0A%3C%2Fhash%3E%0A',
         headers: {
           'Accept' => '*/*',
-          'Accept-Encoding' => 'gzip, deflate',
+          'Accept-Encoding' => /gzip.*?deflate.*/,
           'Content-Length' => '140',
           'Content-Type' => 'text/xml'
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -187,20 +187,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -358,6 +344,7 @@ files:
 - spec/fixtures/user_patient_with_maiden_name.xml
 - spec/fixtures/xmcare_house_number_addendum.xml
 - spec/fixtures/xmcare_impersonating_cdis.xml
+- spec/fixtures/xmcare_missing_whole_pids.xml
 - spec/fixtures/xmcare_patient.xml
 - spec/fixtures/xmcare_patient_email_in_field_number_four.xml
 - spec/fixtures/xmcare_patient_not_found.xml
@@ -408,8 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua
@@ -435,6 +421,7 @@ test_files:
 - spec/fixtures/user_patient_with_maiden_name.xml
 - spec/fixtures/xmcare_house_number_addendum.xml
 - spec/fixtures/xmcare_impersonating_cdis.xml
+- spec/fixtures/xmcare_missing_whole_pids.xml
 - spec/fixtures/xmcare_patient.xml
 - spec/fixtures/xmcare_patient_email_in_field_number_four.xml
 - spec/fixtures/xmcare_patient_not_found.xml