roqua-healthy 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 964fbac85a2be76b1cef6c67dbbc3709263bd075
-  data.tar.gz: 7ca7069b1a9f82c4bb8f219f2626c37373facc44
+  metadata.gz: 535dbe075acc71ad6cfb216f74c0459d30076680
+  data.tar.gz: d0ca4037f6610614aa35350fc9f7e3ac80f83c4e
 SHA512:
-  metadata.gz: 5c90e5bcc6533683c1c3ebcd9b8b2b7c114bd45c077b673c02c80c7f4fcebe4895b311ca0b26c0a187af7de195dced3a5d6001d356de26df086ba814d33a019e
-  data.tar.gz: bcc1ab265d2aae32b9f3f391864c3fb53f0a51cc611b1b832bba5eef038e266e125a5bac1dcface2328327fe26e6976ca11de639ad20cb1f6ccc5c6121642d75
+  metadata.gz: 768b8effbda52101455902040e0ba9357778ab73070bf36626ce6f2addf1311dba1c5cf175c104bd894d09fb13cad530fff4602aca8f0b31d4c7e7b37f7295a4
+  data.tar.gz: 7559755407e7e2ba44079dd4e89e2b0f8bc2243fcf6d5b7eee88ca5cb9b4297728f8cc0cbe87957c63d7ed631a9862b6b8475e5663c80eb49918935802e6af19

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 1.2.0
+
+* Added support for MEDOQ hl7 a19 identities encoded in JSON
+
 ### 1.1.9
 
 * Handle upgraded mirth error messages

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

@@ -10,9 +10,9 @@ module Roqua
         end
 
         def check
-          record[:identities].any? { |i| i[:ident] == patient_id }
+          record[:identities].try(:any?) { |i| i[:ident] == patient_id }
         end
       end
     end
   end
-end
+end

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

@@ -2,6 +2,7 @@ require 'roqua/healthy/a19/name_parser'
 require 'roqua/healthy/a19/cdis_name_parser'
 require 'roqua/healthy/a19/impulse_name_parser'
 require 'roqua/healthy/a19/address_parser'
+require 'active_support/core_ext/hash'
 
 module Roqua
   module Healthy
@@ -35,7 +36,8 @@ module Roqua
             country:      address.country,
             birthdate:    birthdate,
             gender:       gender,
-            phone_cell:   phone_cell
+            phone_cell:   phone_cell,
+            medoq_data:   medoq_data
           }
         end
 
@@ -48,12 +50,30 @@ module Roqua
         end
 
         def identities
-          message.fetch('PID').fetch('PID.3').map do |identity|
+          @identities ||= message.fetch('PID').fetch('PID.3').map do |identity|
             next if identity.fetch('PID.3.1').blank?
-            {ident: identity.fetch('PID.3.1'), authority: identity.fetch('PID.3.5')}
+            authority = identity.fetch('PID.3.5')
+            # medoq sends all its (possibly identifying) metadata in 1 json encoded identity
+            # non medoq hl7 clients could fake being medoq, so do not add any trusted behavior
+            # to medoq identities beyond what a regular hl7 field would enable
+            if authority == 'MEDOQ'
+              parsed_medoq_data = JSON.parse(identity.fetch('PID.3.1')).with_indifferent_access
+              {ident: parsed_medoq_data[:epd_id],
+               research_number: parsed_medoq_data[:research_number],
+               metadata: parsed_medoq_data[:metadata],
+               authority: authority}
+            else
+              {ident: identity.fetch('PID.3.1'), authority: authority}
+            end
           end.compact
         end
 
+        def medoq_data
+          identities.find do |identity|
+            identity[:authority] == 'MEDOQ'
+          end || {}
+        end
+
         def birthdate
           birthdate_details = message.fetch('PID').fetch('PID.7')
           birthdate_details.fetch('PID.7.1') if birthdate_details

data/lib/roqua/healthy/version.rb

@@ -1,6 +1,6 @@
 module Roqua
   module Healthy
     # healthy version
-    VERSION = "1.1.9"
+    VERSION = "1.2.0"
   end
 end

data/lib/roqua-healthy.rb

@@ -1 +1 @@
-require 'roqua/healthy'
+require 'roqua/healthy'

data/roqua-healthy.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Arranges communication between Mirth and RoQua}
   gem.description   = %q{Receives queries from RoQua, sends them to Mirth, and translates Mirth's responses back into Rubyland.}
   gem.license       = "MIT"
-  gem.authors       = ["Marten Veldthuis"]
-  gem.email         = "marten@roqua.nl"
+  gem.authors       = ["Marten Veldthuis", "Jorn van de Beek"]
+  gem.email         = "support@roqua.nl"
   gem.homepage      = "https://github.com/roqua/healthy"
 
   gem.files         = `git ls-files`.split($/)

data/spec/fixtures/{medo_patient.xml → medoq_patient.xml}

@@ -4,7 +4,7 @@
     <MSH.1>|</MSH.1>
     <MSH.2>^~\&amp;</MSH.2>
     <MSH.3>
-      <MSH.3.1>MEDO</MSH.3.1>
+      <MSH.3.1>MEDOQ</MSH.3.1>
     </MSH.3>
     <MSH.4>
       <MSH.4.1>RGOC</MSH.4.1>
@@ -46,12 +46,9 @@
     </PID.1>
     <PID.3 type="array">
       <PID.3>
-        <PID.3.1>md-cdae5d100d8e0131d2623c075478eb56</PID.3.1>
-        <PID.3.5>epd</PID.3.5>
-      </PID.3>
-      <PID.3>
-        <PID.3.1>research-id-123</PID.3.1>
-        <PID.3.5>medo-research-number</PID.3.5>
+        <PID.3.1>{"research_number":"research-id-123",
+          "epd_id":"md-cdae5d100d8e0131d2623c075478eb56", "metadata":{"test":"12"}}</PID.3.1>
+        <PID.3.5>MEDOQ</PID.3.5>
       </PID.3>
     </PID.3>
     <PID.5 type="array">

data/spec/integration/medo_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
 # rubocop:disable Blocks,BlockAlignment
-describe 'Fetching A19 from Medo' do
+describe 'Fetching A19 from Medoq' do
   describe 'a patient' do
-    before { load_fixture 'medo_patient', 'md-cdae5d100d8e0131d2623c075478eb56' }
+    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', authority: 'epd'},
-                                               {ident: 'research-id-123', authority: 'medo-research-number'}]) }
+    it { expect(subject[:identities]).to   eq([{ident: "md-cdae5d100d8e0131d2623c075478eb56",
+                                                research_number: "research-id-123",
+                                                metadata: {"test" => "12"},
+                                                authority: 'MEDOQ'}]) }
     it { expect(subject[:firstname]).to    eq('Jan') }
     it { expect(subject[:initials]).to     eq('J.') }
     it { expect(subject[:lastname]).to     eq('Fictief') }

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Marten Veldthuis
+- Jorn van de Beek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -228,7 +229,7 @@ dependencies:
         version: '1.2'
 description: Receives queries from RoQua, sends them to Mirth, and translates Mirth's
   responses back into Rubyland.
-email: marten@roqua.nl
+email: support@roqua.nl
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -270,7 +271,7 @@ files:
 - spec/fixtures/cdis_missing_address.xml
 - spec/fixtures/cdis_piet_fictief.xml
 - spec/fixtures/comez_patient.xml
-- spec/fixtures/medo_patient.xml
+- spec/fixtures/medoq_patient.xml
 - spec/fixtures/oru-requests/spsy1218j.hl7
 - spec/fixtures/oru-requests/spsy1218o.hl7
 - spec/fixtures/oru-requests/spsy1218o2.hl7
@@ -334,7 +335,7 @@ test_files:
 - spec/fixtures/cdis_missing_address.xml
 - spec/fixtures/cdis_piet_fictief.xml
 - spec/fixtures/comez_patient.xml
-- spec/fixtures/medo_patient.xml
+- spec/fixtures/medoq_patient.xml
 - spec/fixtures/oru-requests/spsy1218j.hl7
 - spec/fixtures/oru-requests/spsy1218o.hl7
 - spec/fixtures/oru-requests/spsy1218o2.hl7