lifen 1.6.8 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3d322a8bc4f1c194166d375f02116f0ac2cbe8e
-  data.tar.gz: b8e31970ddbdca6c158ee313c4405b0f7340f2e9
+  metadata.gz: 9a170e3ecea4b77de29a7e3f1d43b07d326f75c0
+  data.tar.gz: 655170fca70cedd95108e8f4ddd70aa09a31777d
 SHA512:
-  metadata.gz: 961fe51d9c3518abc4ed8372d250ec1df9a5f3b3ad75942a04609ddb6f8935050faa67b083c15585b33c9b5cb5f7736017d90e8ff9ec795d825b591014b6453e
-  data.tar.gz: f3ae94a202cc841fda0abe90f5b3a1147076232d82d6ef115ce6f0b7bfee1d4bd05334ee5b286ebe5fd6b07972fa6a7ecf4bb349320fdf2c2eff2a2f74538860
+  metadata.gz: ab0ea57784dae76f2289b0a5a99769d5ced3f9ae50394fcd0ecae836c5b589460b88919d85b34d6f976466cbdebe9d7501fc57ce0ed30375dc50ab87fc43efde
+  data.tar.gz: 3c2446fdfb4a54af5fe4f670e54446d75e3ebd00e77b206d42b211128d77c5b70b585a62d5168ead5be95fe087f94531361fed5ebabfe424dfe3a6a279de20bf

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+2.0.0
+-----
+
+- Major refactoring on objects to better manage Communications
+- Added the possibility to select a Category
+- Added the possibility to find a Communication
+
 1.6.8
 -----
 

data/Gemfile.lock

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

data/README.md

@@ -126,7 +126,7 @@ message = Lifen::Message.new(flow: flow, content: "Hello World !")
 message.create
 ```
 
-### Communication requests (FHIR)
+### Communications (FHIR)
 
 ```ruby
 sender = Lifen::User.find_by_rpps("899900018483")
@@ -134,12 +134,17 @@ sender = Lifen::User.find_by_rpps("899900018483")
 recipient = Lifen::User.find_by_rpps("899900018484")
 channel = recipient.channels.first
 
-attachment = Lifen::Communication::Attachment.new(title: "Test document", path: "path/to/file")
+category = Lifen::Category.new(code: "MEDICAL_REPORT") # default case, optionnal element
 
-patient = Lifen::Communication::Patient.new(first_name: "Jean", last_name: "Dupond", birthdate: Date.new(2000,1,1))
+attachment = Lifen::Attachment.new(title: "Test document", path: "path/to/file")
 
-request = Lifen::Communication::Request.new(sender: sender, recipient: recipient, channel: channel, attachment: attachment, patient: patient)
-request.send
+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 = Lifen::Communication.find("valid-communication-uuid")
+communication.status
 ```
 
 ### Custom Addresses management

data/lib/lifen.rb

@@ -22,12 +22,11 @@ module Lifen
   require 'lifen/flows'
   require 'lifen/message'
 
-  require 'lifen/communication/attachment'
-  require 'lifen/communication/channel'
-  require 'lifen/communication/patient'
-  require 'lifen/communication/request'
-
-
+  require 'lifen/category'
+  require 'lifen/attachment'
+  require 'lifen/channel'
+  require 'lifen/patient'
+  require 'lifen/communication'
 
   Virtus.finalize
 

data/lib/lifen/attachment.rb

@@ -0,0 +1,26 @@
+module Lifen
+
+  class Attachment < Base
+
+    attribute :title, String
+    attribute :path, String
+    attribute :content_type, String
+
+    def fhir_payload
+      {
+        contentAttachment: {
+          data: base_64_encoded_content,
+          title: title,
+          contentType: "{#{content_type}}"
+        }
+      }
+    end
+
+    private
+
+      def base_64_encoded_content
+        Base64.encode64(File.open(path, "rb").read)
+      end
+
+  end
+end

data/lib/lifen/category.rb

@@ -0,0 +1,26 @@
+module Lifen
+  class Category < Base
+
+    CODES = ["MEDICAL_REPORT", "MESSAGE", "MEDICATION_ORDER", "REFERRAL_REQUEST", "OTHER"]
+
+    attribute :code, String, default: "MEDICAL_REPORT"
+
+    def fhir_payload
+      raise Lifen::Error, "Invalid category: code must be in the authorized values" if !valid?
+
+      {
+        coding: [
+           {
+              system: "http://honestica.com/fhir/communication/category",
+              code: code
+           }
+        ]
+      }
+    end
+
+    def valid?
+      CODES.include? code
+    end
+
+  end
+end

data/lib/lifen/channel.rb

@@ -0,0 +1,31 @@
+module Lifen
+  class Channel < Base
+
+    attribute :uuid, String
+    attribute :type, String
+    attribute :value, String
+
+    def fhir_payload(user)
+      raise Lifen::Error, "Invalid channel: an UUID is required" if !valid?
+
+      {
+        id: user.uuid,
+        resourceType: "Practitioner",
+        type => [
+          {
+            id: uuid
+          }
+        ]
+      }
+    end
+
+    def valid?
+      uuid and uuid.length != 0
+    end
+
+    def self.from_json(json, type = nil)
+      new(uuid: json["id"], type: type, value: json["value"] || "#{Array(json["line"]).join(", ")}, #{json["postalCode"]} #{json["city"]}")
+    end
+
+  end
+end

data/lib/lifen/communication.rb

@@ -0,0 +1,77 @@
+module Lifen
+  class Communication < Base
+
+    attribute :uuid, String
+
+    attribute :sender, Lifen::User
+    attribute :recipient, Lifen::User
+
+    attribute :category, Lifen::Category, default: Lifen::Category.new
+    attribute :channel, Lifen::Channel
+    attribute :patient, Lifen::Patient
+    attribute :attachment, Lifen::Attachment
+
+    attribute :status, String
+    attribute :sent_at, DateTime
+    attribute :received_at, DateTime
+
+    def send
+      json = application_client.post("fhir/CommunicationRequest", fhir_payload)
+
+      self.uuid = json["id"]
+
+      self
+    end
+
+    def self.find(uuid)
+      json = application_client.get("fhir/Communication/#{uuid}")
+
+      resource_type = json["resourceType"]
+
+      raise Error, "Invalid resourceType (#{resource_type})" if resource_type != "Communication"
+
+      attributes = {}
+
+      attributes[:uuid]                 = json["id"]
+      attributes[:status]               = json["status"]
+      attributes[:sent_at]              = json["sent"]
+      attributes[:received_at]          = json["received"]
+
+      attributes[:sender]               = User.from_json(json["sender"])
+      attributes[:recipient]            = User.from_json(Array(json["recipient"]).first)
+
+      new(attributes)
+    end
+
+  private
+
+    def fhir_payload
+      payload = {
+        resourceType: "CommunicationRequest",
+        sender: [ sender.fhir_payload ],
+        recipient: [ recipient.fhir_payload ],
+        contained: [ channel.fhir_payload(recipient) ],
+        category: [ category.fhir_payload],
+        payload: [ attachment.fhir_payload ],
+      }
+
+      if patient
+        payload[:contained] << patient.fhir_payload
+        payload[:subject] = [
+          {reference: "patient"}
+        ]
+      end
+
+      payload
+    end
+
+    def application_client
+      @application_client ||= AppAuthenticatedClient.new
+    end
+
+    def self.application_client
+      @application_client ||= AppAuthenticatedClient.new
+    end
+
+  end
+end

data/lib/lifen/patient.rb

@@ -0,0 +1,27 @@
+module Lifen
+  class Patient < Base
+
+    attribute :first_name, String
+    attribute :last_name, String
+    attribute :birthdate, Date
+
+    def fhir_payload
+      {
+        id: "patient",
+        resourceType: "Patient",
+        name: [
+          {
+            family: [
+              last_name
+            ],
+            given: [
+              first_name
+            ]
+          }
+        ],
+        birthDate: birthdate.to_s
+      }
+    end
+
+  end
+end

data/lib/lifen/user.rb

@@ -5,7 +5,7 @@ module Lifen
     attribute :token, "Lifen::Token"
     attribute :status, "Lifen::Status"
     attribute :settings, "Lifen::Settings"
-    attribute :channels, ["Lifen::Communication::Channel"]
+    attribute :channels, ["Lifen::Channel"]
 
     attribute :uuid, String
     attribute :email, String
@@ -128,11 +128,11 @@ module Lifen
       user = new(user_json)
 
       Array(user_json["telecom"]).each do |telecom_json|
-        user.channels <<  Lifen::Communication::Channel.from_json(telecom_json, "telecom")
+        user.channels <<  Lifen::Channel.from_json(telecom_json, "telecom")
       end
 
       Array(user_json["address"]).each do |address_json|
-        user.channels <<  Lifen::Communication::Channel.from_json(address_json, "address")
+        user.channels <<  Lifen::Channel.from_json(address_json, "address")
       end
 
       user
@@ -152,13 +152,21 @@ module Lifen
 
       json = application_client.post("fhir/Practitioner/#{uuid}/$add-address", filtered_params)
 
-      channel = Communication::Channel.new(uuid: json["issue"][0]["id"], type: params[:type], value: "#{Array(params[:lines]).join(", ")}, #{params[:postal_code]} #{params[:city]}")
+      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
+
     private
 
       def application_client

data/lib/lifen/version.rb

@@ -1,3 +1,3 @@
 module Lifen
-  VERSION = "1.6.8"
+  VERSION = "2.0.0"
 end

data/spec/cassettes/communication/find/invalid_uuid.yml

@@ -0,0 +1,70 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://develop.lifen.fr/fhir/Communication/invalid-communication-uuid
+    body:
+      encoding: UTF-8
+      string: "{}"
+    headers:
+      User-Agent:
+      - Faraday v0.11.0
+      Authorization:
+      - Bearer valid_application_access_token
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      X-B3-Sampled:
+      - '1'
+      X-B3-Spanid:
+      - 8a19efd4d9012fbd
+      X-B3-Traceid:
+      - 8a19efd4d9012fbd
+      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.2 REST Server (FHIR Server; FHIR 1.0.2/DSTU2)
+      Content-Type:
+      - application/json+fhir;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Fri, 24 Mar 2017 09:37:43 GMT
+      Connection:
+      - close
+      Access-Control-Allow-Credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "resourceType": "OperationOutcome",
+          "issue": [
+            {
+              "severity": "error",
+              "code": "not-found",
+              "diagnostics": "Unknown Resource id=invalid-communication-uuid"
+            }
+          ]
+        }
+    http_version:
+  recorded_at: Fri, 24 Mar 2017 09:37:43 GMT
+recorded_with: VCR 3.0.3

data/spec/cassettes/communication/find/valid_uuid.yml

@@ -0,0 +1,96 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://develop.lifen.fr/fhir/Communication/11e71070-15f9-23c1-9ad2-0242ac110002
+    body:
+      encoding: UTF-8
+      string: "{}"
+    headers:
+      User-Agent:
+      - Faraday v0.11.0
+      Authorization:
+      - Bearer valid_application_access_token
+      Content-Type:
+      - application/json
+      Accept:
+      - 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:
+      - e3501c29e536dd60
+      X-B3-Traceid:
+      - e3501c29e536dd60
+      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.2 REST Server (FHIR Server; FHIR 1.0.2/DSTU2)
+      Content-Location:
+      - http://develop.lifen.fr/fhir/Communication/11e71070-15f9-23c1-9ad2-0242ac110002
+      Location:
+      - http://develop.lifen.fr/fhir/Communication/11e71070-15f9-23c1-9ad2-0242ac110002
+      Content-Type:
+      - application/json+fhir;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Fri, 24 Mar 2017 09:35:35 GMT
+      Connection:
+      - close
+      Access-Control-Allow-Credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "resourceType": "Communication",
+          "id": "11e71070-15f9-23c1-9ad2-0242ac110002",
+          "sender": {
+            "reference": "Practitioner/11e5b841-4ff1-2dbb-9643-eabb809fa654"
+          },
+          "recipient": [
+            {
+              "reference": "Practitioner/11e5c866-a698-cfb0-9b29-deb9993a92c0"
+            }
+          ],
+          "payload": [
+            {
+              "contentReference": {
+                "reference": "11e71070-15f3-5755-9ad2-0242ac110002"
+              }
+            }
+          ],
+          "medium": [
+            {
+              "coding": [
+                {
+                  "system": "http://honestica.com/fhir/channel",
+                  "code": "APICRYPT"
+                }
+              ]
+            }
+          ],
+          "status": "completed",
+          "sent": "2017-03-24T08:58:45+00:00",
+          "received": "2017-03-24T08:58:44+00:00"
+        }
+    http_version:
+  recorded_at: Fri, 24 Mar 2017 09:35:35 GMT
+recorded_with: VCR 3.0.3

data/spec/cassettes/users/find_by_rpps/existing_rpps.yml

@@ -68,12 +68,12 @@ http_interactions:
           "link": [
             {
               "relation": "self",
-              "url": "http://demo.lifen.fr/public-api/fhir/Practitioner/?identifier=810004085790"
+              "url": "http://develop.lifen.fr/public-api/fhir/Practitioner/?identifier=810004085790"
             }
           ],
           "entry": [
             {
-              "fullUrl": "http://demo.lifen.fr/public-api/fhir/Practitioner/11e5c86b-e4ba-eee4-9b29-deb9993a92c0",
+              "fullUrl": "http://develop.lifen.fr/public-api/fhir/Practitioner/11e5c86b-e4ba-eee4-9b29-deb9993a92c0",
               "resource": {
                 "resourceType": "Practitioner",
                 "id": "11e5c86b-e4ba-eee4-9b29-deb9993a92c0",

data/spec/cassettes/users/find_by_rpps/missing_line_attribute.yml

@@ -68,12 +68,12 @@ http_interactions:
           "link": [
             {
               "relation": "self",
-              "url": "http://demo.lifen.fr/public-api/fhir/Practitioner/?identifier=810004085790"
+              "url": "http://develop.lifen.fr/public-api/fhir/Practitioner/?identifier=810004085790"
             }
           ],
           "entry": [
             {
-              "fullUrl": "http://demo.lifen.fr/public-api/fhir/Practitioner/11e5c86b-e4ba-eee4-9b29-deb9993a92c0",
+              "fullUrl": "http://develop.lifen.fr/public-api/fhir/Practitioner/11e5c86b-e4ba-eee4-9b29-deb9993a92c0",
               "resource": {
                 "resourceType": "Practitioner",
                 "id": "11e5c86b-e4ba-eee4-9b29-deb9993a92c0",

data/spec/category_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Lifen::Category do
+
+  let(:category)            { Lifen::Category.new }
+
+  describe ':valid?' do
+
+    it 'default case is valid' do
+      expect(category).to be_valid
+    end
+
+    it 'unknown case is not valid' do
+      category.code = "UNKOWN CODE"
+
+      expect(category).to_not be_valid
+    end
+
+  end
+
+end

data/spec/communication_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe Lifen::Communication do
+
+  let(:channel)             { Lifen::Channel.new(uuid: "valid_channel_uuid", type: "address") } #valid_channel_uuid
+
+  let(:sender)              { Lifen::User.new(uuid: "valid_sender_uuid") } #valid_sender_uuid
+  let(:recipient)           { Lifen::User.new(uuid: "valid_recipient_uuid") } #valid_recipient_uuid
+
+  let(:attachment)          { Lifen::Attachment.new(title: "Master Plan", path: File.dirname(__FILE__) + "/support/master_plan.pdf", content_type: "application/pdf") }
+
+  let(:patient)             { Lifen::Patient.new(first_name: "Jean", last_name: "Dupond", birthdate: Date.new(2000,1,1)) }
+
+
+  describe ':send' do
+
+    let(:communication)           { Lifen::Communication.new(sender: sender, recipient: recipient, channel: channel, attachment: attachment, patient: patient) }
+
+    it 'works' do
+      VCR.use_cassette "communication/send/valid_attributes" do
+        communication.send
+      end
+
+      expect(communication.uuid).to_not be_nil
+    end
+
+    context 'invalid channel' do
+
+      let(:channel)             { Lifen::Channel.new(uuid: nil) }
+
+      it 'raises an error' do
+        expect{
+          communication.send
+        }.to raise_error Lifen::Error, "Invalid channel: an UUID is required"
+      end
+
+    end
+
+  end
+
+  describe ':find' do
+
+    it 'works' do
+      VCR.use_cassette "communication/find/valid_uuid" do
+        @communication = Lifen::Communication.find "11e71070-15f9-23c1-9ad2-0242ac110002"
+      end
+
+      expect(@communication.status).to eq "completed"
+      expect(@communication.uuid).to eq "11e71070-15f9-23c1-9ad2-0242ac110002"
+
+      expect(@communication.sent_at).to eq DateTime.new(2017,3,24,8,58,45)
+      expect(@communication.received_at).to eq DateTime.new(2017,3,24,8,58,44)
+
+      expect(@communication.sender.uuid).to eq "11e5b841-4ff1-2dbb-9643-eabb809fa654"
+      expect(@communication.recipient.uuid).to eq "11e5c866-a698-cfb0-9b29-deb9993a92c0"
+
+    end
+
+    context 'invalid uuid' do
+
+      it 'raises an error' do
+        VCR.use_cassette "communication/find/invalid_uuid" do
+          expect{
+            Lifen::Communication.find "invalid-communication-uuid"
+          }.to raise_error Lifen::Error, "Error 404, Page not found, App Client, GET 'https://develop.lifen.fr/fhir/Communication/invalid-communication-uuid' with params '{}' and bearer 'valid_application_access******'"
+        end
+
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifen
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Etienne Depaulis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,17 +154,18 @@ files:
 - Rakefile
 - lib/lifen.rb
 - lib/lifen/app_authenticated_client.rb
+- lib/lifen/attachment.rb
 - lib/lifen/base.rb
+- lib/lifen/category.rb
+- lib/lifen/channel.rb
 - lib/lifen/client.rb
-- lib/lifen/communication/attachment.rb
-- lib/lifen/communication/channel.rb
-- lib/lifen/communication/patient.rb
-- lib/lifen/communication/request.rb
+- lib/lifen/communication.rb
 - lib/lifen/configuration.rb
 - lib/lifen/error.rb
 - lib/lifen/flow.rb
 - lib/lifen/flows.rb
 - lib/lifen/message.rb
+- lib/lifen/patient.rb
 - lib/lifen/settings.rb
 - lib/lifen/status.rb
 - lib/lifen/token.rb
@@ -172,6 +173,9 @@ files:
 - lib/lifen/user_authenticated_client.rb
 - lib/lifen/version.rb
 - lifen.gemspec
+- spec/cassettes/communication/find/invalid_uuid.yml
+- spec/cassettes/communication/find/valid_uuid.yml
+- spec/cassettes/communication/send/valid_attributes.yml
 - spec/cassettes/flows/attach_users/invalid_flow_uuid.yml
 - spec/cassettes/flows/attach_users/invalid_user_uuid.yml
 - spec/cassettes/flows/attach_users/valid.yml
@@ -184,8 +188,6 @@ files:
 - spec/cassettes/flows/update_valid_title.yml
 - spec/cassettes/flows/valid_token.yml
 - spec/cassettes/messages/valid_message.yml
-- spec/cassettes/request/send/error.yml
-- spec/cassettes/request/send/valid_attributes.yml
 - spec/cassettes/settings/initial_state.yml
 - spec/cassettes/settings/reload.yml
 - spec/cassettes/settings/update.yml
@@ -204,15 +206,16 @@ files:
 - spec/cassettes/users/status/reload/valid_token.yml
 - spec/cassettes/users/token/refresh/invalid_user_uuid.yml
 - spec/cassettes/users/token/refresh/valid_user_uuid.yml
+- spec/category_spec.rb
+- spec/communication_spec.rb
 - spec/configuration_spec.rb
-- spec/flows_spec.rb
-- spec/messages_spec.rb
-- spec/requests_spec.rb
+- spec/flow_spec.rb
+- spec/message_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
 - spec/support/master_plan.pdf
 - spec/token_spec.rb
-- spec/users_spec.rb
+- spec/user_spec.rb
 homepage: https://github.com/honestica/lifen
 licenses:
 - MIT
@@ -238,6 +241,9 @@ signing_key:
 specification_version: 4
 summary: Lifen JSON API ruby client
 test_files:
+- spec/cassettes/communication/find/invalid_uuid.yml
+- spec/cassettes/communication/find/valid_uuid.yml
+- spec/cassettes/communication/send/valid_attributes.yml
 - spec/cassettes/flows/attach_users/invalid_flow_uuid.yml
 - spec/cassettes/flows/attach_users/invalid_user_uuid.yml
 - spec/cassettes/flows/attach_users/valid.yml
@@ -250,8 +256,6 @@ test_files:
 - spec/cassettes/flows/update_valid_title.yml
 - spec/cassettes/flows/valid_token.yml
 - spec/cassettes/messages/valid_message.yml
-- spec/cassettes/request/send/error.yml
-- spec/cassettes/request/send/valid_attributes.yml
 - spec/cassettes/settings/initial_state.yml
 - spec/cassettes/settings/reload.yml
 - spec/cassettes/settings/update.yml
@@ -270,12 +274,13 @@ test_files:
 - spec/cassettes/users/status/reload/valid_token.yml
 - spec/cassettes/users/token/refresh/invalid_user_uuid.yml
 - spec/cassettes/users/token/refresh/valid_user_uuid.yml
+- spec/category_spec.rb
+- spec/communication_spec.rb
 - spec/configuration_spec.rb
-- spec/flows_spec.rb
-- spec/messages_spec.rb
-- spec/requests_spec.rb
+- spec/flow_spec.rb
+- spec/message_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
 - spec/support/master_plan.pdf
 - spec/token_spec.rb
-- spec/users_spec.rb
+- spec/user_spec.rb

data/lib/lifen/communication/attachment.rb

@@ -1,27 +0,0 @@
-module Lifen
-  module Communication
-    class Attachment < Lifen::Base
-
-      attribute :title, String
-      attribute :path, String
-      attribute :content_type, String
-
-      def fhir_payload
-        {
-          contentAttachment: {
-            data: base_64_encoded_content,
-            title: title,
-            contentType: "{#{content_type}}"
-          }
-        }
-      end
-
-      private
-
-        def base_64_encoded_content
-          Base64.encode64(File.open(path, "rb").read)
-        end
-
-    end
-  end
-end

data/lib/lifen/communication/channel.rb

@@ -1,33 +0,0 @@
-module Lifen
-  module Communication
-    class Channel < Lifen::Base
-
-      attribute :uuid, String
-      attribute :type, String
-      attribute :value, String
-
-      def fhir_payload(user)
-        raise Lifen::Error, "Invalid channel: an UUID is required" if !valid?
-
-        {
-          id: user.uuid,
-          resourceType: "Practitioner",
-          type => [
-            {
-              id: uuid
-            }
-          ]
-        }
-      end
-
-      def valid?
-        uuid and uuid.length != 0
-      end
-
-      def self.from_json(json, type = nil)
-        new(uuid: json["id"], type: type, value: json["value"] || "#{Array(json["line"]).join(", ")}, #{json["postalCode"]} #{json["city"]}")
-      end
-
-    end
-  end
-end

data/lib/lifen/communication/patient.rb

@@ -1,29 +0,0 @@
-module Lifen
-  module Communication
-    class Patient < Lifen::Base
-
-      attribute :first_name, String
-      attribute :last_name, String
-      attribute :birthdate, Date
-
-      def fhir_payload
-        {
-          id: "patient",
-          resourceType: "Patient",
-          name: [
-            {
-              family: [
-                last_name
-              ],
-              given: [
-                first_name
-              ]
-            }
-          ],
-          birthDate: birthdate.to_s
-        }
-      end
-
-    end
-  end
-end

data/lib/lifen/communication/request.rb

@@ -1,61 +0,0 @@
-module Lifen
-  module Communication
-    class Request < Lifen::Base
-
-      attribute :uuid, String
-
-      attribute :sender, Lifen::User
-      attribute :recipient, Lifen::User
-
-      attribute :channel, Lifen::Communication::Channel
-      attribute :patient, Lifen::Communication::Patient
-      attribute :attachment, Lifen::Communication::Attachment
-
-      def send
-        json = application_client.post("fhir/CommunicationRequest", fhir_payload)
-
-        self.uuid = json["id"]
-
-        self
-      end
-
-    private
-
-      def fhir_payload
-        payload = {
-          resourceType: "CommunicationRequest",
-          sender: [ sender.fhir_payload ],
-          recipient: [ recipient.fhir_payload ],
-          contained: [ channel.fhir_payload(recipient) ],
-          category: [ default_category],
-          payload: [ attachment.fhir_payload ],
-        }
-
-        if patient
-          payload[:contained] << patient.fhir_payload
-          payload[:subject] = [
-            {reference: "patient"}
-          ]
-        end
-
-        payload
-      end
-
-      def default_category
-        {
-          coding: [
-             {
-                system: "http://honestica.com/fhir/communication/category",
-                code: "MEDICAL_REPORT"
-             }
-          ]
-        }
-      end
-
-      def application_client
-        @application_client ||= AppAuthenticatedClient.new
-      end
-
-    end
-  end
-end

data/spec/cassettes/request/send/error.yml

@@ -1,75 +0,0 @@
----
-http_interactions:
-- request:
-    method: post
-    uri: https://develop.lifen.fr/fhir/CommunicationRequest
-    body:
-      encoding: UTF-8
-      string: '{"resourceType":"CommunicationRequest","sender":[{"reference":"valid_sender_uuid"}],"recipient":[{"reference":"valid_recipient_uuid"}],"contained":[{"id":"valid_recipient_uuid","resourceType":"Practitioner","address":[{"id":"valid_channel_uuid"}]},{"id":"patient","resourceType":"Patient","name":[{"family":["Dupond"],"given":["Jean"]}],"birthDate":"2000-01-01"}],"category":[{"coding":[{"system":"http://honestica.com/fhir/communication/category","code":"MEDICAL_REPORT"}]}],"payload":[{"contentAttachment":{"data":"binary_data","title":"Master
-        Plan","contentType":"{application/pdf}"}}],"subject":[{"reference":"patient"}]}'
-    headers:
-      User-Agent:
-      - Faraday v0.11.0
-      Authorization:
-      - Bearer valid_application_access_token
-      Content-Type:
-      - application/json
-      Accept:
-      - application/json
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-  response:
-    status:
-      code: 500
-      message: Created
-    headers:
-      Server:
-      - Apache-Coyote/1.1
-      X-B3-Sampled:
-      - '1'
-      X-B3-Spanid:
-      - 4033e9bebe0988e4
-      X-B3-Traceid:
-      - 4033e9bebe0988e4
-      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.2 REST Server (FHIR Server; FHIR 1.0.2/DSTU2)
-      Content-Location:
-      - http://develop.lifen.fr/fhir/OperationOutcome/a2f959a5-9211-48ee-8350-22bc02fee2b8
-      Location:
-      - http://develop.lifen.fr/fhir/OperationOutcome/a2f959a5-9211-48ee-8350-22bc02fee2b8
-      Content-Type:
-      - application/json+fhir;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Tue, 07 Mar 2017 15:37:55 GMT
-      Connection:
-      - close
-      Access-Control-Allow-Credentials:
-      - 'true'
-    body:
-      encoding: UTF-8
-      string: |-
-        {
-          "resourceType": "OperationOutcome",
-          "id": "a2f959a5-9211-48ee-8350-22bc02fee2b8",
-          "issue": [
-            {
-              "severity": "information",
-              "diagnostics": "CommunicationRequest accepted"
-            }
-          ]
-        }
-    http_version:
-  recorded_at: Tue, 07 Mar 2017 15:37:56 GMT
-recorded_with: VCR 3.0.3

data/spec/requests_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe Lifen::Communication::Request do
-
-  let(:channel)             { Lifen::Communication::Channel.new(uuid: "valid_channel_uuid", type: "address") } #valid_channel_uuid
-
-  let(:sender)              { Lifen::User.new(uuid: "valid_sender_uuid") } #valid_sender_uuid
-  let(:recipient)           { Lifen::User.new(uuid: "valid_recipient_uuid") } #valid_recipient_uuid
-
-  let(:attachment)          { Lifen::Communication::Attachment.new(title: "Master Plan", path: File.dirname(__FILE__) + "/support/master_plan.pdf", content_type: "application/pdf") }
-
-  let(:patient)             { Lifen::Communication::Patient.new(first_name: "Jean", last_name: "Dupond", birthdate: Date.new(2000,1,1)) }
-
-
-  describe ':send' do
-
-    let(:request)           { Lifen::Communication::Request.new(sender: sender, recipient: recipient, channel: channel, attachment: attachment, patient: patient) }
-
-    it 'works' do
-      VCR.use_cassette "request/send/valid_attributes" do
-        request.send
-      end
-
-      expect(request.uuid).to_not be_nil
-    end
-
-    context 'invalid channel' do
-
-      let(:channel)             { Lifen::Communication::Channel.new(uuid: nil) }
-
-      it 'raises an error' do
-        expect{
-          request.send
-        }.to raise_error Lifen::Error, "Invalid channel: an UUID is required"
-      end
-
-    end
-
-  end
-
-end