lifen_fhir 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6e9cc27391f2a2ca45aa80e3c7577d345d5f265
-  data.tar.gz: 7c6ed9d68019892246b3412125f874ade9ba23d4
+  metadata.gz: 1ff83240349a82a1baf58f72f9e8da8e88fd5578
+  data.tar.gz: d133e7733803dfb73aef7473840d093969e9d701
 SHA512:
-  metadata.gz: 021a874fee8606735c51be90303a45ca69750c01b854b390fdc9780799cbd3e13ab889ccdf42adfbc28874210fc0fae82dec74971092b0f12dc2795b17f7b553
-  data.tar.gz: afe404699c29e053bca25206788026902f609005d2575f85c83b74aa34ebdb809b13dde914ae03850d5ac598b588795db6a9be29eafe5b90757c7262de6ac0c4
+  metadata.gz: 31aa76ec4ebf4b495ffdec8569c53221c95b32fc961d1c6a09655369526aca76ae593af06b55cfff7d781c8c2508a5e7aaa1a7ebf7dddd14d50a633700d574fd
+  data.tar.gz: 73f4eaf5948b53a131fd0d470cc9e20a2065d549019897e9b9a6e8ce21ecbaf21ece57adb4ea34193c42e850b713fd22fd854ef26153cdaf95abb45c6d4f0285

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.4.0
+-----
+
+- Added possibility to add a patient to a list of recipients in a CommunicationRequest
+- Added Reference object to abstract all class reference relative to fhir
+
 0.3.0
 -----
 

data/README.md

@@ -77,7 +77,7 @@ other_medium = LifenFhir::Medium(uuid: other_recipient.channels.first.uuid)
 
 binary = LifenFhir::Binary.new(uuid: "b7c7dae671b93e951ce6a4f530736276")
 
-communication_request_request = LifenFhir::CommunicationRequest.new(sender: sender, recipients: [recipient, other_recipient], medium: [medium, other_medium], binary: binary, patient: patient, category: category)
+communication_request = LifenFhir::CommunicationRequest.new(sender: sender, recipients: [recipient, other_recipient], medium: [medium, other_medium], binary: binary, patient: patient, category: category)
 
 communication_request_request.send
 
@@ -104,6 +104,10 @@ patient = LifenFhir::Patient.create(first_name: ["Jean", "Charles"], last_name:
 
 # To find a patient by id
 patient = LifenFhir::Patient.find_by_uuid("c3f96278-3bfe-4933-96e7-171ebca7489f")
+
+# To set the patient as a recipient in a CommunicationRequest
+communication_request = LifenFhir::CommunicationRequest.new(sender: sender, recipients: [patient],  binary: binary, category: category)
+
 ```
 
 ## Deploying to Rubygems

data/lib/lifen_fhir/binary.rb

@@ -32,7 +32,7 @@ module LifenFhir
       end
 
       def reference
-        "Binary/#{uuid}"
+        LifenFhir::Reference.new(self).to_s
       end
 
   end

data/lib/lifen_fhir/communication_request.rb

@@ -4,8 +4,8 @@ module LifenFhir
     attribute :uuid, String
     attribute :number_communications, Integer
 
-    attribute :sender, LifenFhir::Practitioner
-    attribute :recipients, [LifenFhir::Practitioner]
+    attribute :sender, LifenFhir::Reference
+    attribute :recipients, [LifenFhir::Reference]
 
     attribute :category, LifenFhir::Category, default: LifenFhir::Category.new
     attribute :medium, [LifenFhir::Medium]
@@ -87,4 +87,4 @@ module LifenFhir
       end
 
   end
-end
+end

data/lib/lifen_fhir/patient.rb

@@ -22,7 +22,8 @@ module LifenFhir
     end
 
     def self.find_by_uuid(uuid)
-      json = application_client.get("fhir/Patient/#{uuid}")
+      patient = new(uuid:uuid)
+      json = application_client.get("fhir/#{LifenFhir::Reference.new(patient)}")
 
       patient = new
       patient.attributes_from_json(json)

data/lib/lifen_fhir/practitioner.rb

@@ -9,7 +9,7 @@ module LifenFhir
     attribute :rpps, String
 
     def fhir_payload
-      { reference: "Practitioner/#{uuid}" }
+      { reference: reference }
     end
 
     def self.find_by_rpps(rpps)
@@ -46,7 +46,7 @@ module LifenFhir
 
       filtered_params[params[:type]] = address
 
-      json = application_client.post("fhir/Practitioner/#{uuid}/$add-address", filtered_params)
+      json = application_client.post("fhir/#{reference}/$add-address", filtered_params)
 
       channel = Channel.new(uuid: json["issue"][0]["id"], type: params[:type], value: "#{Array(params[:lines]).join(", ")}, #{params[:postal_code]} #{params[:city]}")
 
@@ -73,7 +73,7 @@ module LifenFhir
 
       filtered_params[params[:type]] = telecom
 
-      json = application_client.post("fhir/Practitioner/#{uuid}/$add-telecom", filtered_params)
+      json = application_client.post("fhir/#{reference}/$add-telecom", filtered_params)
 
       channel = Channel.new(uuid: json["issue"][0]["id"], type: params[:type], value: params[:value])
 
@@ -83,6 +83,10 @@ module LifenFhir
 
     end
 
+    def reference
+      LifenFhir::Reference.new(self).to_s
+    end
+
     private
 
       def application_client

data/lib/lifen_fhir/reference.rb

@@ -0,0 +1,23 @@
+module LifenFhir
+  class Reference < Base
+
+    def initialize(source)
+      @source = source
+    end
+
+    attr_reader :source
+
+    def to_s
+      "#{class_name}/#{source.uuid}"
+    end
+
+    def class_name
+      source.class.name.gsub!('LifenFhir::', '')
+    end
+
+    def fhir_payload
+      { reference: self.to_s }
+    end
+
+  end
+end

data/lib/lifen_fhir/version.rb

@@ -1,3 +1,3 @@
 module LifenFhir
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/lifen_fhir.rb

@@ -14,6 +14,7 @@ module LifenFhir
   require 'lifen_fhir/configuration'
   require 'lifen_fhir/base'
 
+  require 'lifen_fhir/reference'
   require 'lifen_fhir/address'
   require 'lifen_fhir/channel'
   require 'lifen_fhir/practitioner'

data/spec/cassettes/communication_request/send/patient/invalid_attributes_binary.yml

@@ -0,0 +1,61 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://develop.lifen.fr/fhir/CommunicationRequest
+    body:
+      encoding: UTF-8
+      string: '{"resourceType":"CommunicationRequest","sender":[{"reference":"Practitioner/valid-sender-uuid"}],"recipient":[{"reference":"Patient/invalid-patient-id"}],"contained":[],"medium":[],"category":[{"coding":[{"system":"http://honestica.com/fhir/communication/category","code":"MEDICAL_REPORT"}]}],"payload":[{"contentReference":{"reference":"Binary/valid-binary-uuid"}}]}'
+    headers:
+      User-Agent:
+      - Faraday v0.12.1
+      Authorization:
+      - Bearer valid_application_access_token
+      Accept:
+      - application/json
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 422
+      message: Unprocessable Entity
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Cache-Control:
+      - no-cache, no-store, max-age=0, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
+      X-Powered-By:
+      - HAPI FHIR 2.4 REST Server (FHIR Server; FHIR 3.0.1/DSTU3)
+      Content-Type:
+      - application/json+fhir;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 31 May 2017 16:55:13 GMT
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "resourceType": "OperationOutcome",
+          "id": "8ad3928e-ddcb-4e5e-9467-909f058ea3b0",
+          "issue": [
+            {
+              "severity": "fatal",
+              "code": "required",
+              "diagnostics": "No recipient provided."
+            }
+          ]
+        }
+    http_version:
+  recorded_at: Wed, 31 May 2017 16:54:51 GMT
+recorded_with: VCR 3.0.3

data/spec/cassettes/communication_request/send/patient/valid_attributes_binary.yml

@@ -0,0 +1,62 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://develop.lifen.fr/fhir/CommunicationRequest
+    body:
+      encoding: UTF-8
+      string: '{"resourceType":"CommunicationRequest","sender":[{"reference":"Practitioner/valid-sender-uuid"}],"recipient":[{"reference":"Patient/valid-patient-id"}],"contained":[{"id":"patient","resourceType":"Patient","name":[{"family":["Dupond"],"given":[["Jean"]]}],"birthDate":"2000-01-01"}],"medium":[],"category":[{"coding":[{"system":"http://honestica.com/fhir/communication/category","code":"MEDICAL_REPORT"}]}],"payload":[{"contentReference":{"reference":"Binary/valid-binary-uuid"}}],"subject":[{"reference":"patient"}]}'
+    headers:
+      User-Agent:
+      - Faraday v0.12.1
+      Authorization:
+      - Bearer valid_application_access_token
+      Accept:
+      - application/json
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Cache-Control:
+      - no-cache, no-store, max-age=0, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
+      X-Powered-By:
+      - HAPI FHIR 2.4 REST Server (FHIR Server; FHIR 3.0.1/DSTU3)
+      Location:
+      - http://rc.lifen.fr:10133/fhir/OperationOutcome/22d87145-79f3-4a06-9c4e-6dde586a865d
+      Content-Type:
+      - application/json+fhir;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Tue, 30 May 2017 10:04:04 GMT
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "resourceType": "OperationOutcome",
+          "id": "22d87145-79f3-4a06-9c4e-6dde586a865d",
+          "issue": [
+            {
+              "severity": "information",
+              "diagnostics": "CommunicationRequest accepted"
+            }
+          ]
+        }
+    http_version:
+  recorded_at: Tue, 30 May 2017 10:03:47 GMT
+recorded_with: VCR 3.0.3

data/spec/cassettes/communication_request/send/to_patient_also.yml

@@ -0,0 +1,66 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://develop.lifen.fr/fhir/CommunicationRequest
+    body:
+      encoding: UTF-8
+      string: '{"resourceType":"CommunicationRequest","sender":[{"reference":"Practitioner/valid-sender-uuid"}],"recipient":[{"reference":"Practitioner/valid-recipient-uuid-1"},{"reference":"Patient/valid-patient-id"}],"contained":[],"medium":[{"coding":[{"id":"valid-medium-uuid-1"}]}],"category":[{"coding":[{"system":"http://honestica.com/fhir/communication/category","code":"MEDICAL_REPORT"}]}],"payload":[{"contentReference":{"reference":"Binary/valid-binary-uuid"}}]}'
+    headers:
+      User-Agent:
+      - Faraday v0.12.1
+      Authorization:
+      - Bearer valid_application_access_token
+      Accept:
+      - application/json
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Cache-Control:
+      - no-cache, no-store, max-age=0, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
+      X-Powered-By:
+      - HAPI FHIR 2.4 REST Server (FHIR Server; FHIR 3.0.1/DSTU3)
+      Location:
+      - http://rc.lifen.fr:10129/fhir/OperationOutcome/e3c336cc-2cdf-4e8c-99da-417e15e3084b
+      Content-Type:
+      - application/json+fhir;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 31 May 2017 16:32:34 GMT
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "resourceType": "OperationOutcome",
+          "id": "e3c336cc-2cdf-4e8c-99da-417e15e3084b",
+          "issue": [
+            {
+              "severity": "information",
+              "diagnostics": "CommunicationRequest accepted"
+            },
+            {
+              "severity": "information",
+              "diagnostics": "CommunicationRequest accepted"
+            }
+          ]
+        }
+    http_version:
+  recorded_at: Wed, 31 May 2017 16:32:13 GMT
+recorded_with: VCR 3.0.3

data/spec/communication_request_spec.rb

@@ -15,24 +15,64 @@ describe LifenFhir::CommunicationRequest do
 
     let(:attachment)          { LifenFhir::Attachment.new(title: "Master Plan", path: File.dirname(__FILE__) + "/support/master_plan.pdf", content_type: "application/pdf") }
 
-    let(:patient)             { LifenFhir::Patient.new(first_name: "Jean", last_name: "Dupond", birth_date: Date.new(2000,1,1)) }
+  let(:patient)             { LifenFhir::Patient.new(uuid: "valid-patient-id", first_name: "Jean", last_name: "Dupond", birth_date: Date.new(2000,1,1)) }
 
-    describe ':send multi-recipients with a binary' do
+  let(:invalid_patient)             { LifenFhir::Patient.new(uuid: "invalid-patient-id", first_name: "Jean", last_name: "Dupond", birth_date: Date.new(2000,1,1)) }
 
-      let(:communication_request)          { LifenFhir::CommunicationRequest.new(sender: sender, recipients: [recipient1, recipient2], medium: [medium1, medium2], binary: binary, patient: patient) }
+  describe ':send multi-recipients with a binary' do
 
-      it 'works' do
-        VCR.use_cassette "communication_request/send/valid_attributes_binary" do
-          communication_request.send
-        end
+    let(:communication_request)          { LifenFhir::CommunicationRequest.new(sender: sender, recipients: [recipient1, recipient2], medium: [medium1, medium2], binary: binary, patient: patient) }
 
-        expect(communication_request.uuid).to_not be_nil
-        expect(communication_request.number_communications).to eq(2)
+
+    it 'works' do
+      VCR.use_cassette "communication_request/send/valid_attributes_binary" do
+        communication_request.send
+      end
+
+      expect(communication_request.uuid).to_not be_nil
+      expect(communication_request.number_communications).to eq(2)
+    end
+
+  end
+
+
+  describe ':send to patient with a binary' do
+    let(:communication_request)          { LifenFhir::CommunicationRequest.new(sender: patient, recipients: [patient], binary: binary) }
+
+    let(:wrong_communication_request)          { LifenFhir::CommunicationRequest.new(sender: sender, recipients: [invalid_patient], binary: binary) }
+
+    it 'works' do
+      VCR.use_cassette "communication_request/send/patient/valid_attributes_binary" do
+        communication_request.send
       end
 
+      expect(communication_request.uuid).to_not be_nil
+      expect(communication_request.number_communications).to eq(1)
+    end
+
+    it 'does not work' do
+      VCR.use_cassette "communication_request/send/patient/invalid_attributes_binary" do
+        expect{wrong_communication_request.send}.to raise_error LifenFhir::Error
+      end
     end
+  end
+
+  describe ':send to patient and practitioner with a binary' do
+
+    let(:communication_request)          { LifenFhir::CommunicationRequest.new(sender: sender, recipients: [recipient1, patient], binary: binary, medium: [medium1]) }
+
+    it 'works' do
+      VCR.use_cassette("communication_request/send/to_patient_also", match_requests_on: [:method, :uri, :body]) do
+        communication_request.send
+      end
+
+      expect(communication_request.uuid).to_not be_nil
+      expect(communication_request.number_communications).to eq(2)
+    end
+  end
+
 
-    describe ':send multi-recipients with an attachment' do
+  describe ':send multi-recipients with an attachment' do
 
       let(:communication_request)          { LifenFhir::CommunicationRequest.new(sender: sender, recipients: [recipient1, recipient2], medium: [medium1, medium2], attachment: attachment, patient: patient) }
 

data/spec/patient_spec.rb

@@ -19,7 +19,7 @@ describe LifenFhir::Patient do
         address: address
       )
 
-      VCR.use_cassette "patient/create/with_all_information" do
+      VCR.use_cassette("patient/create/with_all_information", match_requests_on: [:method, :uri, :body]) do
         patient.save
       end
 

data/spec/reference_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe LifenFhir::Reference do
+
+  describe ':to_s' do
+
+    let(:patient)           { LifenFhir::Patient.new(uuid: "valid_patient_uuid") }
+    let(:practitioner)           { LifenFhir::Practitioner.new(uuid: "valid_practitioner_uuid") }
+    let(:binary)           { LifenFhir::Binary.new(uuid: "valid_binary_uuid") }
+
+
+    it 'works' do
+      expect(LifenFhir::Reference.new(patient).to_s).to eq("Patient/valid_patient_uuid")
+      expect(LifenFhir::Reference.new(practitioner).to_s).to eq("Practitioner/valid_practitioner_uuid")
+      expect(LifenFhir::Reference.new(binary).to_s).to eq("Binary/valid_binary_uuid")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lifen_fhir
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Leonard Sellam
@@ -169,6 +169,7 @@ files:
 - lib/lifen_fhir/medium.rb
 - lib/lifen_fhir/patient.rb
 - lib/lifen_fhir/practitioner.rb
+- lib/lifen_fhir/reference.rb
 - lib/lifen_fhir/user_authenticated_client.rb
 - lib/lifen_fhir/version.rb
 - lifen_fhir.gemspec
@@ -179,6 +180,9 @@ files:
 - spec/cassettes/communication_request/find_by_uuid/valid_uuid_with_a_status.yml
 - spec/cassettes/communication_request/find_by_uuid/valid_uuid_with_no_status.yml
 - spec/cassettes/communication_request/send/invalid_medium.yml
+- spec/cassettes/communication_request/send/patient/invalid_attributes_binary.yml
+- spec/cassettes/communication_request/send/patient/valid_attributes_binary.yml
+- spec/cassettes/communication_request/send/to_patient_also.yml
 - spec/cassettes/communication_request/send/valid_attributes.yml
 - spec/cassettes/communication_request/send/valid_attributes_binary.yml
 - spec/cassettes/patient/create/with_all_information.yml
@@ -194,6 +198,7 @@ files:
 - spec/communication_request_spec.rb
 - spec/patient_spec.rb
 - spec/practitionner_spec.rb
+- spec/reference_spec.rb
 - spec/spec_helper.rb
 - spec/support/master_plan.pdf
 homepage: https://github.com/honestica/lifen-fhir
@@ -228,6 +233,9 @@ test_files:
 - spec/cassettes/communication_request/find_by_uuid/valid_uuid_with_a_status.yml
 - spec/cassettes/communication_request/find_by_uuid/valid_uuid_with_no_status.yml
 - spec/cassettes/communication_request/send/invalid_medium.yml
+- spec/cassettes/communication_request/send/patient/invalid_attributes_binary.yml
+- spec/cassettes/communication_request/send/patient/valid_attributes_binary.yml
+- spec/cassettes/communication_request/send/to_patient_also.yml
 - spec/cassettes/communication_request/send/valid_attributes.yml
 - spec/cassettes/communication_request/send/valid_attributes_binary.yml
 - spec/cassettes/patient/create/with_all_information.yml
@@ -243,5 +251,6 @@ test_files:
 - spec/communication_request_spec.rb
 - spec/patient_spec.rb
 - spec/practitionner_spec.rb
+- spec/reference_spec.rb
 - spec/spec_helper.rb
 - spec/support/master_plan.pdf