roqua-healthy 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94043430c465a276baeada045aa06422ab61b57c
-  data.tar.gz: a2bcdc10bf57c6276760a43ed9aa24b502618e61
+  metadata.gz: ccd4dc01c0792957e4a17ef4ffa69b4ffbdbc95b
+  data.tar.gz: 3c2e6f19aeec8ee2eaf36ad82c97bb65a00b8376
 SHA512:
-  metadata.gz: 71981bf3d4f6cb4ebddaecfd79439ac698bd2a02654ac85c96fb9f9ea6801682bd7122a21cb00288a0ecb3a22e56555a6d3f1a5cc1f1550d74dd2af97eee6007
-  data.tar.gz: f0325fbc386fc3932e4abb1964d435c7ffb970cfeb3c8d04997654d328829dc96bade7184b8fa233036a45a1f76420508acc8dfd398be5e6c8fa53b65eac33ee
+  metadata.gz: 0ba26e105e2ca2d90c2bbec3d4d008072729013a14bb14d8e381b946e8de2bf784b1ea55501edf8c326d6548a6d180c5582c28fd275d1fbdb940ece0839141cd
+  data.tar.gz: 1675add8d6649f2904c3fb5f164aa304f0b489de09935982b26efac2a6443bdf4c873329177ca72d873699b0ec33bbc1137e6035d92725871ab7928355f1bbf3

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 1.5.3
+
+* Support address type P (permanent)
+
+========
+
 ### 1.4.2
 
 * If PID 8.1 (gender) is empty/unavailable, the to_patient's gender attribute will be nil instead of erroring

data/README.md

@@ -42,6 +42,6 @@ These two commands are then chained together by `bin/get`:
 
 ## Copyright
 
-Copyright (c) 2016 Marten Veldthuis, Jorn van de Beek, Samuel Esposito, Henk van der Veen
+Copyright (c) 2017 Marten Veldthuis, Jorn van de Beek, Samuel Esposito, Henk van der Veen
 
 Publicly available under an MIT license. See [LICENSE.txt](https://github.com/roqua/healthy/blob/master/LICENSE.txt) for details.

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

@@ -35,11 +35,24 @@ module Roqua
         end
 
         def record
-          @record = nil
-          @record ||= message.fetch('PID').fetch('PID.11').find { |record| record.fetch('PID.11.7', :unknown_type_of_address_record) == 'M' }
-          @record ||= message.fetch('PID').fetch('PID.11').find { |record| record.fetch('PID.11.7', :unknown_type_of_address_record) == 'H' }
-          @record ||= message.fetch('PID').fetch('PID.11').find { |record| record.fetch('PID.11.7', :unknown_type_of_address_record) == 'L' }
-          @record
+          # PID.11.7 address types:
+          # M: Mailing
+          # P: Permanent
+          # H: Home
+          # L: Legal address
+
+          @record ||= get_address_of_type(message, 'M') ||
+                      get_address_of_type(message, 'P') ||
+                      get_address_of_type(message, 'H') ||
+                      get_address_of_type(message, 'L')
+        end
+
+        private
+
+        def get_address_of_type(message, type)
+          message.fetch('PID').fetch('PID.11').find do |record|
+            record.fetch('PID.11.7', :unknown_type_of_address_record) == type
+          end
         end
       end
     end

data/lib/roqua/healthy/errors.rb

@@ -45,7 +45,11 @@ module Roqua
       "Unable to connect to destination\tConnectException\tConnection refused" =>
         ::Roqua::Healthy::ConnectionRefused,
       'ERROR: ConnectException: Connection refused' =>
-        ::Roqua::Healthy::ConnectionRefused
+        ::Roqua::Healthy::ConnectionRefused,
+      "ERROR: NACK sent from receiver. (Rejected)" =>
+        ::Roqua::Healthy::NACK,
+      "ERROR: NACK sent from receiver. (Error)" => # ie. Patient not found
+        ::Roqua::Healthy::NACK
     }.freeze
   end
 end

data/lib/roqua/healthy/version.rb

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

data/spec/fixtures/epic_test_client.xml

@@ -0,0 +1,233 @@
+<HL7Message>
+  <MSH>
+    <MSH.1>|</MSH.1>
+    <MSH.2>^~\\&amp;</MSH.2>
+    <MSH.3>
+      <MSH.3.1>CLOVDMZ</MSH.3.1>
+    </MSH.3>
+    <MSH.4>
+      <MSH.4.1>CLOVDMZA</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>20171114121022</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>
+    <MSH.10>
+      <MSH.10.1>807c7c1e85</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.16/>
+    <MSH.17/>
+  </MSH>
+  <MSA>
+    <MSA.1>
+      <MSA.1.1>CA</MSA.1.1>
+    </MSA.1>
+    <MSA.2>
+      <MSA.2.1>807c7c1e85</MSA.2.1>
+    </MSA.2>
+    <MSA.3/>
+    <MSA.4/>
+    <MSA.5/>
+    <MSA.6/>
+  </MSA>
+  <QRD>
+    <QRD.1>
+      <QRD.1.1>20171114</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>807c7c1e85</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>7767853</QRD.8.1>
+    </QRD.8>
+    <QRD.9>
+      <QRD.9.1>DEM</QRD.9.1>
+    </QRD.9>
+  </QRD>
+  <EVN>
+    <EVN.1>
+      <EVN.1.1>A19</EVN.1.1>
+    </EVN.1>
+    <EVN.2>
+      <EVN.2.1>20171114121022</EVN.2.1>
+    </EVN.2>
+    <EVN.3/>
+    <EVN.4/>
+    <EVN.5>
+      <EVN.5.1/>
+      <EVN.5.2/>
+      <EVN.5.3/>
+      <EVN.5.4/>
+      <EVN.5.5/>
+      <EVN.5.6/>
+      <EVN.5.7/>
+      <EVN.5.8/>
+      <EVN.5.9/>
+      <EVN.5.10/>
+      <EVN.5.11/>
+      <EVN.5.12/>
+      <EVN.5.13/>
+      <EVN.5.14/>
+    </EVN.5>
+  </EVN>
+  <PID>
+    <PID.1>
+      <PID.1.1>1</PID.1.1>
+    </PID.1>
+    <PID.2/>
+    <PID.3>
+      <PID.3.1>7767853</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>UMCG</PID.3.4>
+      <PID.3.5>PI</PID.3.5>
+    </PID.3>
+    <PID.4/>
+    <PID.5>
+      <PID.5.1>
+        <PID.5.1.1>Fictief</PID.5.1.1>
+        <PID.5.1.2/>
+        <PID.5.1.3>Fictief</PID.5.1.3>
+      </PID.5.1>
+      <PID.5.2>J</PID.5.2>
+      <PID.5.3>A B C</PID.5.3>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>L</PID.5.7>
+      <PID.5.8/>
+      <PID.5.9/>
+      <PID.5.10/>
+      <PID.5.11>NL1</PID.5.11>
+    </PID.5>
+    <PID.5>
+      <PID.5.1/>
+      <PID.5.2>Jan</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.6/>
+    <PID.7>
+      <PID.7.1>19800101</PID.7.1>
+    </PID.7>
+    <PID.8>
+      <PID.8.1>M</PID.8.1>
+    </PID.8>
+    <PID.9/>
+    <PID.10/>
+    <PID.11>
+      <PID.11.1>
+        <PID.11.1.1>HANZEPLEIN 1</PID.11.1.1>
+        <PID.11.1.2>HANZEPLEIN</PID.11.1.2>
+        <PID.11.1.3>1</PID.11.1.3>
+      </PID.11.1>
+      <PID.11.2/>
+      <PID.11.3>GRONINGEN</PID.11.3>
+      <PID.11.4/>
+      <PID.11.5>9713GZ</PID.11.5>
+      <PID.11.6>NLD</PID.11.6>
+      <PID.11.7>P</PID.11.7>
+    </PID.11>
+    <PID.12/>
+    <PID.13>
+      <PID.13.1>06 67 89 54 31</PID.13.1>
+      <PID.13.2>ORN</PID.13.2>
+      <PID.13.3>PH</PID.13.3>
+      <PID.13.4/>
+      <PID.13.5>31</PID.13.5>
+      <PID.13.6>0667895431</PID.13.6>
+    </PID.13>
+    <PID.13>
+      <PID.13.1>06 67 89 54 32</PID.13.1>
+      <PID.13.2>PRN</PID.13.2>
+      <PID.13.3>CP</PID.13.3>
+      <PID.13.4/>
+      <PID.13.5>31</PID.13.5>
+      <PID.13.6>0667895432</PID.13.6>
+    </PID.13>
+    <PID.14/>
+    <PID.15/>
+    <PID.16/>
+    <PID.17/>
+    <PID.18/>
+    <PID.19/>
+    <PID.20/>
+    <PID.21/>
+    <PID.22/>
+    <PID.23>
+      <PID.23.1>GRONINGEN</PID.23.1>
+    </PID.23>
+    <PID.24>
+      <PID.24.1>Y</PID.24.1>
+    </PID.24>
+    <PID.25/>
+    <PID.26/>
+    <PID.27/>
+    <PID.28/>
+    <PID.29/>
+    <PID.30>
+      <PID.30.1>N</PID.30.1>
+    </PID.30>
+    <PID.31>
+      <PID.31.1>Y</PID.31.1>
+    </PID.31>
+    <PID.32>
+      <PID.32.1>NNNLD</PID.32.1>
+    </PID.32>
+  </PID>
+  <PV1>
+    <PV1.1>
+      <PV1.1.1>1</PV1.1.1>
+    </PV1.1>
+    <PV1.2>
+      <PV1.2.1>O</PV1.2.1>
+    </PV1.2>
+  </PV1>
+  <AL1>
+    <AL1.1>
+      <AL1.1.1>1</AL1.1.1>
+    </AL1.1>
+    <AL1.2>
+      <AL1.2.1>SYSTEMISCH</AL1.2.1>
+    </AL1.2>
+    <AL1.3>
+      <AL1.3.1/>
+      <AL1.3.2>GEEN ALLERGIEEN GEDOCUMENTEERD</AL1.3.2>
+      <AL1.3.3/>
+    </AL1.3>
+  </AL1>
+</HL7Message>

data/spec/integration/epic_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe 'Fetching A19 from EPIC' do
+  describe 'the patient Jan Fictief' do
+    before { load_fixture 'epic_test_client', '7767853' }
+    subject { Roqua::Healthy::A19.fetch("7767853") }
+
+    it { expect(subject[:status]).to       eq('SUCCESS') }
+    it { expect(subject[:error]).to        be_nil }
+    it { expect(subject[:source]).to       eq('CLOVDMZA') }
+    it { expect(subject[:identities]).to   eq([{ident: '7767853', authority: 'PI'}]) }
+    it { expect(subject[:firstname]).to    eq('Jan') }
+    it { expect(subject[:initials]).to     eq('J A B C') }
+    it { expect(subject[:lastname]).to     eq('Fictief') }
+    it { expect(subject[:display_name]).to be_nil }
+    it { expect(subject[:nickname]).to     eq('Jan') }
+    it { expect(subject[:email]).to        be_nil }
+    it { expect(subject[:address_type]).to eq('P') }
+    it { expect(subject[:street]).to       eq('HANZEPLEIN 1') }
+    it { expect(subject[:city]).to         eq('GRONINGEN') }
+    it { expect(subject[:zipcode]).to      eq('9713GZ') }
+    it { expect(subject[:country]).to      eq('NLD') }
+    it { expect(subject[:birthdate]).to    eq('19800101') }
+    it { expect(subject[:gender]).to       eq('M') }
+    it { expect(subject[:phone_cell]).to   eq('0667895432') }
+  end
+end

data/spec/unit/a19/response_validator_spec.rb

@@ -42,6 +42,18 @@ describe Roqua::Healthy::A19::ResponseValidator do
       end
     end
 
+    context "ERROR: NACK sent from receiver. (Rejected)" do
+      it 'raises ::Roqua::Healthy::NACK' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::NACK)
+      end
+    end
+
+    context "ERROR: NACK sent from receiver. (Error)" do
+      it 'raises ::Roqua::Healthy::NACK' do
+        expect { subject.validate }.to raise_error(::Roqua::Healthy::NACK)
+      end
+    end
+
     context 'Unknown error' do
       it 'raises ::Roqua::Healthy::UnknownFailure' do
         expect { subject.validate }.to raise_error(::Roqua::Healthy::UnknownFailure)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -340,6 +340,7 @@ files:
 - spec/fixtures/cdis_piet_fictief.xml
 - spec/fixtures/comez_patient.xml
 - spec/fixtures/epic_no_gender.xml
+- spec/fixtures/epic_test_client.xml
 - spec/fixtures/ggzwnb_patient.xml
 - spec/fixtures/medoq_patient.xml
 - spec/fixtures/oru-requests/spsy1218j.hl7
@@ -368,6 +369,7 @@ files:
 - spec/healthy_spec.rb
 - spec/integration/cdis_spec.rb
 - spec/integration/comez_spec.rb
+- spec/integration/epic_spec.rb
 - spec/integration/ggzwnb_spec.rb
 - spec/integration/medo_spec.rb
 - spec/integration/mirth_spec.rb
@@ -403,7 +405,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua
@@ -414,6 +416,7 @@ test_files:
 - spec/fixtures/cdis_piet_fictief.xml
 - spec/fixtures/comez_patient.xml
 - spec/fixtures/epic_no_gender.xml
+- spec/fixtures/epic_test_client.xml
 - spec/fixtures/ggzwnb_patient.xml
 - spec/fixtures/medoq_patient.xml
 - spec/fixtures/oru-requests/spsy1218j.hl7
@@ -442,6 +445,7 @@ test_files:
 - spec/healthy_spec.rb
 - spec/integration/cdis_spec.rb
 - spec/integration/comez_spec.rb
+- spec/integration/epic_spec.rb
 - spec/integration/ggzwnb_spec.rb
 - spec/integration/medo_spec.rb
 - spec/integration/mirth_spec.rb