roqua-healthy 1.2.0 → 1.2.1

data/spec/integration/comez_spec.rb

@@ -5,10 +5,13 @@ describe 'Fetching A19 from Comez' do
     before { load_fixture 'comez_patient', '0000123456' }
     subject { Roqua::Healthy::A19.fetch("0000123456") }
 
-    it { expect(subject[:status]).to       eq('SUCCESS') }
-    it { expect(subject[:error]).to        be_nil }
-    it { expect(subject[:source]).to       eq('CS') }
-    it { expect(subject[:identities]).to   eq([{ident: '0000123456', authority: 'PI'}, {ident: '123456789',   authority: 'NNNLD'}]) }
+    it { expect(subject[:status]).to eq('SUCCESS') }
+    it { expect(subject[:error]).to  be_nil }
+    it { expect(subject[:source]).to eq('CS') }
+    it do
+      expect(subject[:identities]).to eq([{ident: '0000123456', authority: 'PI'},
+                                          {ident: '123456789', authority: 'NNNLD'}])
+    end
     it { expect(subject[:firstname]).to    eq('Voornaam') }
     it { expect(subject[:initials]).to     eq('A') }
     it { expect(subject[:lastname]).to     eq('Achternaam') }
@@ -23,4 +26,4 @@ describe 'Fetching A19 from Comez' do
     it { expect(subject[:gender]).to       eq('F') }
     it { expect(subject[:phone_cell]).to   eq('0612345678mdr') }
   end
-end
+end

data/spec/integration/medo_spec.rb

@@ -1,18 +1,19 @@
 require 'spec_helper'
 
-# rubocop:disable Blocks,BlockAlignment
 describe 'Fetching A19 from Medoq' do
   describe 'a patient' do
     before { load_fixture 'medoq_patient', 'md-cdae5d100d8e0131d2623c075478eb56' }
     subject { Roqua::Healthy::A19.fetch("md-cdae5d100d8e0131d2623c075478eb56") }
 
-    it { expect(subject[:status]).to       eq('SUCCESS') }
-    it { expect(subject[:error]).to        be_nil }
-    it { expect(subject[:source]).to       eq('RGOC') }
-    it { expect(subject[:identities]).to   eq([{ident: "md-cdae5d100d8e0131d2623c075478eb56",
-                                                research_number: "research-id-123",
-                                                metadata: {"test" => "12"},
-                                                authority: 'MEDOQ'}]) }
+    it { expect(subject[:status]).to eq('SUCCESS') }
+    it { expect(subject[:error]).to  be_nil }
+    it { expect(subject[:source]).to eq('RGOC') }
+    it do
+      expect(subject[:identities]).to eq([{ident: "md-cdae5d100d8e0131d2623c075478eb56",
+                                           research_number: "research-id-123",
+                                           metadata: {"test" => "12"},
+                                           authority: 'MEDOQ'}])
+    end
     it { expect(subject[:firstname]).to    eq('Jan') }
     it { expect(subject[:initials]).to     eq('J.') }
     it { expect(subject[:lastname]).to     eq('Fictief') }

data/spec/integration/mirth_spec.rb

@@ -14,4 +14,4 @@ describe 'Accounting for Mirth bugs' do
       expect { Roqua::Healthy::A19.fetch("12345678") }.to raise_error(Roqua::Healthy::MirthErrors::WrongPatient)
     end
   end
-end
+end

data/spec/integration/xmcare_spec.rb

@@ -5,10 +5,13 @@ describe 'Fetching A19 from XMcare' do
     before { load_fixture 'xmcare_patient', '12345678901' }
     subject { Roqua::Healthy::A19.fetch("12345678901") }
 
-    it { expect(subject[:status]).to       eq('SUCCESS') }
-    it { expect(subject[:error]).to        be_nil }
-    it { expect(subject[:source]).to       eq('ZIS') }
-    it { expect(subject[:identities]).to   eq([{ident: '12345678901', authority: 'PI'}, {ident: '123456789',   authority: 'NNNLD'}]) }
+    it { expect(subject[:status]).to eq('SUCCESS') }
+    it { expect(subject[:error]).to  be_nil }
+    it { expect(subject[:source]).to eq('ZIS') }
+    it do
+      expect(subject[:identities]).to eq([{ident: '12345678901', authority: 'PI'},
+                                          {ident: '123456789', authority: 'NNNLD'}])
+    end
     it { expect(subject[:firstname]).to    eq('Babette') }
     it { expect(subject[:initials]).to     eq('A B') }
     it { expect(subject[:lastname]).to     eq('Achternaam') }
@@ -28,10 +31,13 @@ describe 'Fetching A19 from XMcare' do
     before { load_fixture 'xmcare_patient_with_maiden_name', '12345678901' }
     subject { Roqua::Healthy::A19.fetch("12345678901") }
 
-    it { expect(subject[:status]).to       eq('SUCCESS') }
-    it { expect(subject[:error]).to        be_nil }
-    it { expect(subject[:source]).to       eq('ZIS') }
-    it { expect(subject[:identities]).to   eq([{ident: '12345678901', authority: 'PI'}, {ident: '123456789',   authority: 'NNNLD'}]) }
+    it { expect(subject[:status]).to eq('SUCCESS') }
+    it { expect(subject[:error]).to  be_nil }
+    it { expect(subject[:source]).to eq('ZIS') }
+    it do
+      expect(subject[:identities]).to eq([{ident: '12345678901', authority: 'PI'},
+                                          {ident: '123456789', authority: 'NNNLD'}])
+    end
     it { expect(subject[:firstname]).to    eq('Babette') }
     it { expect(subject[:initials]).to     eq('A B') }
     it { expect(subject[:lastname]).to     eq('Achternaam') }
@@ -51,10 +57,13 @@ describe 'Fetching A19 from XMcare' do
     before { load_fixture 'xmcare_patient_without_birthdate', '12345678901' }
     subject { Roqua::Healthy::A19.fetch("12345678901") }
 
-    it { expect(subject[:status]).to       eq('SUCCESS') }
-    it { expect(subject[:error]).to        be_nil }
-    it { expect(subject[:source]).to       eq('ZIS') }
-    it { expect(subject[:identities]).to   eq([{ident: '12345678901', authority: 'PI'}, {ident: '123456789',   authority: 'NNNLD'}]) }
+    it { expect(subject[:status]).to eq('SUCCESS') }
+    it { expect(subject[:error]).to  be_nil }
+    it { expect(subject[:source]).to eq('ZIS') }
+    it do
+      expect(subject[:identities]).to eq([{ident: '12345678901', authority: 'PI'},
+                                          {ident: '123456789', authority: 'NNNLD'}])
+    end
     it { expect(subject[:firstname]).to    eq('Babette') }
     it { expect(subject[:initials]).to     eq('A B') }
     it { expect(subject[:lastname]).to     eq('Achternaam') }
@@ -74,10 +83,13 @@ describe 'Fetching A19 from XMcare' do
     before { load_fixture 'xmcare_patient_email_in_field_number_four', '12345678901' }
     subject { Roqua::Healthy::A19.fetch("12345678901") }
 
-    it { expect(subject[:status]).to       eq('SUCCESS') }
-    it { expect(subject[:error]).to        be_nil }
-    it { expect(subject[:source]).to       eq('ZIS') }
-    it { expect(subject[:identities]).to   eq([{ident: '12345678901', authority: 'PI'}, {ident: '123456789',   authority: 'NNNLD'}]) }
+    it { expect(subject[:status]).to eq('SUCCESS') }
+    it { expect(subject[:error]).to  be_nil }
+    it { expect(subject[:source]).to eq('ZIS') }
+    it do
+      expect(subject[:identities]).to eq([{ident: '12345678901', authority: 'PI'},
+                                          {ident: '123456789', authority: 'NNNLD'}])
+    end
     it { expect(subject[:firstname]).to    eq('Babette') }
     it { expect(subject[:initials]).to     eq('A B') }
     it { expect(subject[:lastname]).to     eq('Achternaam') }
@@ -91,17 +103,19 @@ describe 'Fetching A19 from XMcare' do
     it { expect(subject[:birthdate]).to    eq('17070415') }
     it { expect(subject[:gender]).to       eq('F') }
     it { expect(subject[:phone_cell]).to   eq('06 12 34 56 78') }
-
   end
 
   describe 'a patient from an xmcare instance impersonating cdis' do
     before { load_fixture 'xmcare_impersonating_cdis', '12345678901' }
     subject { Roqua::Healthy::A19.fetch("12345678901") }
 
-    it { expect(subject[:status]).to       eq('SUCCESS') }
-    it { expect(subject[:error]).to        be_nil }
-    it { expect(subject[:source]).to       eq('UMCG') }
-    it { expect(subject[:identities]).to   eq([{ident: '12345678901', authority: 'PI'}, {ident: '123456789',   authority: 'NNNLD'}]) }
+    it { expect(subject[:status]).to eq('SUCCESS') }
+    it { expect(subject[:error]).to  be_nil }
+    it { expect(subject[:source]).to eq('UMCG') }
+    it do
+      expect(subject[:identities]).to eq([{ident: '12345678901', authority: 'PI'},
+                                          {ident: '123456789', authority: 'NNNLD'}])
+    end
     it { expect(subject[:firstname]).to    eq('A') }
     it { expect(subject[:initials]).to     eq('B C') }
     it { expect(subject[:lastname]).to     eq('Achternaam') }
@@ -117,6 +131,50 @@ describe 'Fetching A19 from XMcare' do
     it { expect(subject[:phone_cell]).to   eq('06-12345678') }
   end
 
+  describe 'a patient with a 06 cell phone number only in the primary residence number field' do
+    before { load_fixture 'xmcare_phone_cell_in_prn', '88888888888' }
+    subject { Roqua::Healthy::A19.fetch("88888888888") }
+
+    it { expect(subject[:status]).to       eq('SUCCESS') }
+    it { expect(subject[:error]).to        be_nil }
+    it { expect(subject[:source]).to       eq('XMCARE') }
+    it do
+      expect(subject[:identities]).to eq([{ident: '88888888888', authority: 'PI'},
+                                          {ident: '222222222', authority: 'NNNLD'}])
+    end
+    it { expect(subject[:firstname]).to    eq('Voorname') }
+    it { expect(subject[:initials]).to     eq('V') }
+    it { expect(subject[:lastname]).to     eq('Achternom') }
+    it { expect(subject[:display_name]).to eq('Achternom') }
+    it { expect(subject[:email]).to        eq('support@roqua.nl') }
+    it { expect(subject[:address_type]).to eq('H') }
+    it { expect(subject[:street]).to       eq('Straat 8') }
+    it { expect(subject[:city]).to         eq('GRONINGEN') }
+    it { expect(subject[:zipcode]).to      eq('9711CR') }
+    it { expect(subject[:country]).to      eq('NED') }
+    it { expect(subject[:birthdate]).to    eq('19900101') }
+    it { expect(subject[:gender]).to       eq('F') }
+    it { expect(subject[:phone_cell]).to   eq('0612345678') }
+  end
+
+  describe 'a patient with a 06 cell phone number in the both residence number fields' do
+    before { load_fixture 'xmcare_phone_cell_in_prn_orn', '88888888888' }
+    subject { Roqua::Healthy::A19.fetch("88888888888") }
+
+    it 'prefers the orn cell phone number over the prn' do
+      expect(subject[:phone_cell]).to eq('0612345678')
+    end
+  end
+
+  describe 'a patient with an unconventional cell phone number in the other residence number field' do
+    before { load_fixture 'xmcare_unconventional_phone_cell_in_orn', '88888888888' }
+    subject { Roqua::Healthy::A19.fetch("88888888888") }
+
+    it 'returns the orn number' do
+      expect(subject[:phone_cell]).to eq('+31612345678')
+    end
+  end
+
   describe 'a patient that does not exist' do
     before { load_fixture 'xmcare_patient_not_found', '12345678901' }
 
@@ -124,4 +182,4 @@ describe 'Fetching A19 from XMcare' do
       expect { Roqua::Healthy::A19.fetch("12345678901") }.to raise_error(Roqua::Healthy::PatientNotFound)
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -26,4 +26,4 @@ RSpec.configure do |config|
       puts "", "Log file: ", LOG_FILE.read
     end
   end
-end
+end

data/spec/support/fixtures.rb

@@ -11,4 +11,4 @@ def load_fixture(name, patient_id = '123')
   fixture_filename = File.expand_path(File.join(__FILE__, "../../fixtures", "#{name}.xml"))
   response = File.read(fixture_filename)
   stub_mirth_response(response, 200, patient_id)
-end
+end

data/spec/unit/a19/address_parser_spec.rb

@@ -7,20 +7,17 @@ describe Roqua::Healthy::A19::AddressParser do
                   'PID.11.1' => {'PID.11.1.1' => 'Mailstreet 1'},
                   'PID.11.3' => 'Mailcity',
                   'PID.11.5' => 'Mailzipcode',
-                  'PID.11.6' => 'Mailcountry'
-                  } if types.include?('M')
+                  'PID.11.6' => 'Mailcountry'} if types.include?('M')
     addresses << {'PID.11.7' => 'H',
                   'PID.11.1' => {'PID.11.1.1' => 'Homestreet 1'},
                   'PID.11.3' => 'Homecity',
                   'PID.11.5' => 'Homezipcode',
-                  'PID.11.6' => 'Homecountry'
-                  } if types.include?('H')
+                  'PID.11.6' => 'Homecountry'} if types.include?('H')
     addresses << {'PID.11.7' => '?',
                   'PID.11.1' => {'PID.11.1.1' => '????street 1'},
                   'PID.11.3' => '????city',
                   'PID.11.5' => '????zipcode',
-                  'PID.11.6' => '????country'
-                  } if types.include?('?')
+                  'PID.11.6' => '????country'} if types.include?('?')
     {'PID' => {'PID.11' => addresses}}
   end
 
@@ -129,4 +126,4 @@ describe Roqua::Healthy::A19::AddressParser do
       expect(parser.country).to be_nil
     end
   end
-end
+end

data/spec/unit/a19/correct_patient_check_spec.rb

@@ -19,4 +19,4 @@ module Roqua
       end
     end
   end
-end
+end

data/spec/unit/client_spec.rb

@@ -13,7 +13,5 @@ describe Roqua::Healthy::Client do
     it 'defaults to system wide config' do
       expect(subject.a19_endpoint).to eq Roqua::Healthy.a19_endpoint
     end
-
   end
-
 end

data/spec/unit/message_cleaner_spec.rb

@@ -44,4 +44,4 @@ describe Roqua::Healthy::MessageCleaner do
       expect(cleaner.clean_string('""')).to eq('')
     end
   end
-end
+end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Marten Veldthuis
 - Jorn van de Beek
+- Samuel Esposito
+- Henk van der Veen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,28 +179,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.40'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +240,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".yardopts"
 - ChangeLog.md
 - Gemfile
@@ -249,6 +252,7 @@ files:
 - bin/get_old_mirth_processing_result
 - bin/get_xml_for_patient
 - bin/parse_local_xml
+- circle.yml
 - lib/roqua-healthy.rb
 - lib/roqua/healthy.rb
 - lib/roqua/healthy/a19.rb
@@ -289,7 +293,10 @@ files:
 - spec/fixtures/xmcare_patient_not_found.xml
 - spec/fixtures/xmcare_patient_with_maiden_name.xml
 - spec/fixtures/xmcare_patient_without_birthdate.xml
+- spec/fixtures/xmcare_phone_cell_in_prn.xml
+- spec/fixtures/xmcare_phone_cell_in_prn_orn.xml
 - spec/fixtures/xmcare_timeout_waiting_for_ack.xml
+- spec/fixtures/xmcare_unconventional_phone_cell_in_orn.xml
 - spec/healthy_spec.rb
 - spec/integration/cdis_spec.rb
 - spec/integration/comez_spec.rb
@@ -325,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua
@@ -353,7 +360,10 @@ test_files:
 - spec/fixtures/xmcare_patient_not_found.xml
 - spec/fixtures/xmcare_patient_with_maiden_name.xml
 - spec/fixtures/xmcare_patient_without_birthdate.xml
+- spec/fixtures/xmcare_phone_cell_in_prn.xml
+- spec/fixtures/xmcare_phone_cell_in_prn_orn.xml
 - spec/fixtures/xmcare_timeout_waiting_for_ack.xml
+- spec/fixtures/xmcare_unconventional_phone_cell_in_orn.xml
 - spec/healthy_spec.rb
 - spec/integration/cdis_spec.rb
 - spec/integration/comez_spec.rb