lifen 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e808f690c7594a8a9fbb168e6b83d5fc8ebfe1ae
-  data.tar.gz: ed7525498a82f199e230817c42c143ebfe41097b
+  metadata.gz: 79deed444977cb5560f104a1507ad85d3f7066fa
+  data.tar.gz: ca4895e8cf1356a51d01661e18acfd3d4e52e8a6
 SHA512:
-  metadata.gz: bdcccaff11cb9d9ef89037084d93bcedae393769be52e2a72ed68238a21aaf317e061e4fc0c85514fa10a3167a8a82eee64a4b7815a355a3937156b348399b18
-  data.tar.gz: 48e9ab0eb11eb976d7addf3d25ad3f6f1e093d16004591c96a2bca3bfefca521d0a59f02e5eeabf798b4518313d9a1793bdb53a2a54f02639ec7aafd3fa6263c
+  metadata.gz: f9a0a0d34c22b03898a17af6b078693e31d5d512073c1d7c35874d931d0c64e94743d3a8d584d8e388b8f597c03b9abfc333d3e2e5e82d831a2a33f17997b7f6
+  data.tar.gz: 813dc3995c10b1d70f4bf9fccb3190cd7dc2b0757ca1d401bc312552c835ff929160af47467dd2eee0b55be2079eea33ae1180f56df3706c08066c0ad9b2e62c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+3.0.0
+-----
+
+- Major refactoring to separate the private and public use of the gem
+- Added `Practitioner`
+- Extracts some business and methods from `User` to `Practitioner`
+- Deleted `Communication`. Use `CommunicationRequest` from now on
+
 2.4.0
 -----
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lifen (2.4.0)
+    lifen (3.0.0)
       faraday (>= 0.9)
       inflecto
       virtus (>= 1.0)

data/README.md

@@ -140,9 +140,9 @@ binary.download
 #### Communications with an Attachment
 
 ```ruby
-sender = Lifen::User.find_by_rpps("899900018483")
+sender = Lifen::Practitioner.find_by_rpps("899900018483")
 
-recipient = Lifen::User.find_by_rpps("899900018484")
+recipient = Lifen::Practitioner.find_by_rpps("899900018484")
 channel = recipient.channels.first
 
 category = Lifen::Category.new(code: "MEDICAL_REPORT") # default case, optionnal element
@@ -151,52 +151,52 @@ attachment = Lifen::Attachment.new(title: "Test document", path: "path/to/file")
 
 patient = Lifen::Patient.new(first_name: "Jean", last_name: "Dupond", birthdate: Date.new(2000,1,1))
 
-communication = Lifen::Communication.new(sender: sender, recipient: recipient, channel: channel, attachment: attachment, patient: patient, category: category)
-communication.send
+communication_request = Lifen::CommunicationRequest.new(sender: sender, recipient: recipient, channel: channel, attachment: attachment, patient: patient, category: category)
+communication_request.send
 
-communication = Lifen::Communication.find("valid-communication-uuid")
-communication.status
+communication_request = Lifen::CommunicationRequest.find("valid-communication_request-uuid")
+communication_request.status
 ```
 
 ### Communications with a Binary
 
 ```ruby
-sender = Lifen::User.find_by_rpps("899900018483")
+sender = Lifen::Practitioner.find_by_rpps("899900018483")
 
-recipient = Lifen::User.find_by_rpps("899900018484")
+recipient = Lifen::Practitioner.find_by_rpps("899900018484")
 channel = recipient.channels.first
 
 binary = Lifen::Binary.new(uuid: "b7c7dae671b93e951ce6a4f530736276")
 
-communication = Lifen::Communication.new(sender: sender, recipient: recipient, channel: channel, binary: binary, patient: patient, category: category)
+communication_request = Lifen::CommunicationRequest.new(sender: sender, recipient: recipient, channel: channel, binary: binary, patient: patient, category: category)
 
-communication.send
+communication_request.send
 
 ```
 
 #### Communication requets with multiple recipients
 
 ```ruby
-sender = Lifen::User.find_by_rpps("899900018483")
+sender = Lifen::Practitioner.find_by_rpps("899900018483")
 
-recipient = Lifen::User.find_by_rpps("899900018484")
+recipient = Lifen::Practitioner.find_by_rpps("899900018484")
 medium = Lifen::Medium(uuid: recipient.channels.first.uuid)
 
-other_recipient = Lifen::User.find_by_rpps("899900018484")
+other_recipient = Lifen::Practitioner.find_by_rpps("899900018484")
 other_medium = Lifen::Medium(uuid: other_recipient.channels.first.uuid)
 
 binary = Lifen::Binary.new(uuid: "b7c7dae671b93e951ce6a4f530736276")
 
-communication_request = Lifen::CommunicationRequest.new(sender: sender, recipients: [recipient, other_recipient], medium: [medium, other_medium], binary: binary, patient: patient, category: category)
+communication_request_request = Lifen::CommunicationRequest.new(sender: sender, recipients: [recipient, other_recipient], medium: [medium, other_medium], binary: binary, patient: patient, category: category)
 
-communication_request.send
+communication_request_request.send
 
 ```
 
 #### Custom Channels management
 
 ```ruby
-recipient = Lifen::User.new(uuid: "valid-user-uuid")
+recipient = Lifen::Practitioner.new(uuid: "valid-user-uuid")
 
 # To create a new mailing address channel
 channel = recipient.create_address(type: "address", lines: ["39 rue Aboukir"], city: "Paris", postal_code: "75002", country: "France")

data/lib/lifen.rb

@@ -22,14 +22,14 @@ module Lifen
   require 'lifen/flows'
   require 'lifen/message'
 
+  require 'lifen/channel'
+  require 'lifen/practitioner'
   require 'lifen/category'
   require 'lifen/medium'
   require 'lifen/attachment'
   require 'lifen/binary'
-  require 'lifen/channel'
   require 'lifen/patient'
   require 'lifen/content_string'
-  require 'lifen/communication'
   require 'lifen/communication_request'
 
   Virtus.finalize

data/lib/lifen/communication_request.rb

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

data/lib/lifen/practitioner.rb

@@ -0,0 +1,97 @@
+module Lifen
+  class Practitioner < Base
+
+    attribute :channels, [Lifen::Channel]
+
+    attribute :uuid, String
+    attribute :last_name, String
+    attribute :first_name, String
+    attribute :rpps, String
+
+    def fhir_payload
+      { reference: "Practitioner/#{uuid}" }
+    end
+
+    def self.find_by_rpps(rpps)
+      json = application_client.get("fhir/Practitioner/?identifier=#{rpps}")
+
+      raise "Practitioner not found" if Array(json["entry"]).size != 1
+
+      user_json = Array(json["entry"]).first.fetch("resource") { {} }
+
+      user_json[:uuid]                 = user_json["id"]
+
+      user = new(user_json)
+
+      Array(user_json["telecom"]).each do |telecom_json|
+        user.channels <<  Lifen::Channel.from_json(telecom_json, "telecom")
+      end
+
+      Array(user_json["address"]).each do |address_json|
+        user.channels <<  Lifen::Channel.from_json(address_json, "address")
+      end
+
+      user
+    end
+
+    def create_address(params)
+      filtered_params = {"resourceType" => "Practitioner"}
+
+      address = {
+        "line": Array(params[:lines]),
+        "city": params[:city],
+        "postalCode": params[:postal_code],
+        "country": params[:country]
+      }
+
+      filtered_params[params[:type]] = address
+
+      json = application_client.post("fhir/Practitioner/#{uuid}/$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]}")
+
+      self.channels << channel
+
+      channel
+    end
+
+    def self.from_json(json)
+      reference = json["reference"]
+
+      uuid = reference.gsub("Practitioner/", "")
+
+      new(uuid: uuid)
+    end
+
+    def create_telecom(params)
+      filtered_params = {"resourceType" => "Practitioner"}
+
+      telecom = {
+        "system": params[:system],
+        "value": params[:value]
+      }
+
+      filtered_params[params[:type]] = telecom
+
+      json = application_client.post("fhir/Practitioner/#{uuid}/$add-telecom", filtered_params)
+
+      channel = Channel.new(uuid: json["issue"][0]["id"], type: params[:type], value: params[:value])
+
+      self.channels << channel
+
+      channel
+
+    end
+
+    private
+
+      def application_client
+        @application_client ||= AppAuthenticatedClient.new
+      end
+
+      def self.application_client
+        @application_client ||= AppAuthenticatedClient.new
+      end
+
+  end
+end

data/lib/lifen/user.rb

@@ -101,10 +101,6 @@ module Lifen
       UserAuthenticatedClient.new(token)
     end
 
-    def fhir_payload
-      { reference: "Practitioner/#{uuid}" }
-    end
-
     # def self.where(params)
     #   json = application_client.get("fhir/Practitioner/", params)
 
@@ -115,80 +111,6 @@ module Lifen
     #   users
     # end
 
-    def self.find_by_rpps(rpps)
-      json = application_client.get("fhir/Practitioner/?identifier=#{rpps}")
-
-
-
-      raise "User not found" if Array(json["entry"]).size != 1
-
-      user_json = Array(json["entry"]).first.fetch("resource") { {} }
-
-      user_json[:uuid]                 = user_json["id"]
-
-      user = new(user_json)
-
-      Array(user_json["telecom"]).each do |telecom_json|
-        user.channels <<  Lifen::Channel.from_json(telecom_json, "telecom")
-      end
-
-      Array(user_json["address"]).each do |address_json|
-        user.channels <<  Lifen::Channel.from_json(address_json, "address")
-      end
-
-      user
-    end
-
-    def create_address(params)
-      filtered_params = {"resourceType" => "Practitioner"}
-
-      address = {
-        "line": Array(params[:lines]),
-        "city": params[:city],
-        "postalCode": params[:postal_code],
-        "country": params[:country]
-      }
-
-      filtered_params[params[:type]] = address
-
-      json = application_client.post("fhir/Practitioner/#{uuid}/$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]}")
-
-      self.channels << channel
-
-      channel
-    end
-
-    alias_method :create_channel, :create_address
-
-    def self.from_json(json)
-      reference = json["reference"]
-
-      uuid = reference.gsub("Practitioner/", "")
-
-      new(uuid: uuid)
-    end
-
-    def create_telecom(params)
-      filtered_params = {"resourceType" => "Practitioner"}
-
-      telecom = {
-        "system": params[:system],
-        "value": params[:value]
-      }
-
-      filtered_params[params[:type]] = telecom
-
-      json = application_client.post("fhir/Practitioner/#{uuid}/$add-telecom", filtered_params)
-
-      channel = Channel.new(uuid: json["issue"][0]["id"], type: params[:type], value: params[:value])
-
-      self.channels << channel
-
-      channel
-
-    end
 
     private
 

data/lib/lifen/version.rb

@@ -1,3 +1,3 @@
 module Lifen
-  VERSION = "2.4.0"
+  VERSION = "3.0.0"
 end

data/spec/cassettes/practitionner/create_channel/address/old_valid_attributes.yml

@@ -0,0 +1,71 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://develop.lifen.fr/fhir/Practitioner/11e5c85e-9bc0-4c6e-9b29-deb9993a92c0/$add-address
+    body:
+      encoding: UTF-8
+      string: '{"resourceType":"Practitioner","address":{"line":["Honestica","39 rue
+        d''Aboukir"],"city":"Paris","postalCode":"75002","country":"France"}}'
+    headers:
+      User-Agent:
+      - Faraday v0.11.0
+      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: 200
+      message: OK
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      X-B3-Sampled:
+      - '1'
+      X-B3-Spanid:
+      - 1471c2eb1e86756b
+      X-B3-Traceid:
+      - 1471c2eb1e86756b
+      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:
+      - Fri, 19 May 2017 15:07:35 GMT
+      Connection:
+      - close
+      Access-Control-Allow-Credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "resourceType": "OperationOutcome",
+          "issue": [
+            {
+              "id": "11e73ca4-e3d4-8c5f-b5c5-0242ac110002",
+              "severity": "information",
+              "diagnostics": "Address created."
+            }
+          ]
+        }
+    http_version:
+  recorded_at: Fri, 19 May 2017 15:07:06 GMT
+recorded_with: VCR 3.0.3

data/spec/cassettes/practitionner/create_channel/address/valid_attributes.yml

@@ -0,0 +1,71 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://develop.lifen.fr/fhir/Practitioner/11e5c85e-9bc0-4c6e-9b29-deb9993a92c0/$add-address
+    body:
+      encoding: UTF-8
+      string: '{"resourceType":"Practitioner","address":{"line":["Honestica","39 rue
+        d''Aboukir"],"city":"Paris","postalCode":"75002","country":"France"}}'
+    headers:
+      User-Agent:
+      - Faraday v0.11.0
+      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: 200
+      message: OK
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      X-B3-Sampled:
+      - '1'
+      X-B3-Spanid:
+      - 6bdba43c90ff2827
+      X-B3-Traceid:
+      - 6bdba43c90ff2827
+      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:
+      - Fri, 19 May 2017 14:59:33 GMT
+      Connection:
+      - close
+      Access-Control-Allow-Credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "resourceType": "OperationOutcome",
+          "issue": [
+            {
+              "id": "11e73ca3-c4b2-fe69-b5c5-0242ac110002",
+              "severity": "information",
+              "diagnostics": "Address created."
+            }
+          ]
+        }
+    http_version:
+  recorded_at: Fri, 19 May 2017 14:59:03 GMT
+recorded_with: VCR 3.0.3