athena_health 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f98cfaa15caca65ad1fbc036674eb76d38fd0a5bee50a4b20c64149d286cce
-  data.tar.gz: ad2e1d5be5847a5f5bed1e4df4b583ab474ea15b2d60b807e9b671e5f698f5d9
+  metadata.gz: 72d528a701d5b4e4495d1e37121779dc39e6940e7dd761e199478e269c955f2e
+  data.tar.gz: 5849da85a6822b0a5f92f5c333ab51eb2cb75a8b9ea823a37282447b91651b0d
 SHA512:
-  metadata.gz: 616b05bc653fd2722229718b9ba633cd19263d1dfadbaa0c15abbddc70c61703749343d5af14027f1fa583498491f4c490ac42d5e855e624e6cbce68f7facac5
-  data.tar.gz: 709e309ceaf94ccd4a0c0b716d8bdb350d4d97f66f1079c416320ba0dfaf769979a8a66c25e30084c19b8df871ee532e233685de52547412f045aae57bfc1d9f
+  metadata.gz: 1209d763734ae0fed0e659d87841215a3db81da08abae384d7e50abfaea8c8d66dfc55901dee7de408958df04fad37273b9f57236dcdf4172de946b249819a96
+  data.tar.gz: d327001b2902eb318b97bd3b3d294809c77b6b06d20ceb9614a7608ee63e412314c80f992d5518637ff540a2b2cea051d7388b80586582e704f577f8822c6a17

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .idea
+.vscode/settings.json

data/athena_health.gemspec

@@ -1,13 +1,12 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'athena_health/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'athena_health'
   spec.version       = AthenaHealth::VERSION
-  spec.authors       = ["Mateusz Urbański"]
-  spec.email         = ['mateuszurbanski@yahoo.pl']
+  spec.authors       = ['Mateusz Urbański', 'Ben Jones']
+  spec.email         = ['mateuszurbanski@yahoo.pl', 'ben@benjones.io']
 
   spec.summary       = 'Ruby wrapper for Athenahealth API.'
   spec.description   = 'Ruby wrapper for Athenahealth API. See https://developer.athenahealth.com/io-docs for more details.'
@@ -18,11 +17,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'typhoeus'
-  spec.add_dependency 'virtus'
+  spec.add_dependency 'typhoeus', '~> 1.4'
+  spec.add_dependency 'virtus', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 2.2.24'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'vcr', '~> 3.0'
+  spec.add_development_dependency 'timecop', '~> 0.9.6'
+  spec.add_development_dependency 'rubocop', '~> 1.42'
 end

data/lib/athena_health/appointment.rb

@@ -12,6 +12,7 @@ module AthenaHealth
     attribute :date,                        String
     attribute :departmentid,                Integer
     attribute :duration,                    Integer
+    attribute :encounterid,                 Integer
     attribute :encounterstatus,             String
     attribute :frozen,                      Boolean
     attribute :lastmodified,                String

data/lib/athena_health/auth_token.rb

@@ -0,0 +1,69 @@
+require 'json'
+
+module AthenaHealth
+  class AuthToken
+    def initialize(client_id:, secret:, base_url:, api_version:, auth_token_hash: nil)
+      @base_url = base_url
+      @api_version = api_version
+      @client_id = client_id
+      @secret = secret
+      reset!
+      parse_auth_token_hash!(auth_token_hash) unless auth_token_hash.nil?
+    end
+
+    def auth_header
+      { 'Authorization' => "Bearer #{token}" }
+    end
+
+    def reset!
+      @access_token = nil
+      @expires_at = nil
+    end
+
+    def serialized_token
+      {
+        'access_token' => token,
+        'expires_at' => @expires_at.to_i
+      }
+    end
+
+    private
+
+    def token
+      fetch_token! unless valid?
+      @access_token
+    end
+
+    def valid?
+      !@access_token.nil? &&
+        !@expires_at.nil? &&
+        @expires_at > Time.now
+    end
+
+    def parse_auth_token_hash!(auth_token_hash)
+      # make sure it has the right parts
+      return unless auth_token_hash['access_token'].instance_of? String
+      return unless auth_token_hash['expires_at'].instance_of? Integer
+
+      @access_token = auth_token_hash['access_token']
+      @expires_at = Time.at(auth_token_hash['expires_at'])
+    end
+
+    def fetch_token!
+      reset!
+      initiated_at = Time.now
+      response = Typhoeus.post(
+        "#{@base_url}/oauth2/#{@api_version}/token",
+        userpwd: "#{@client_id}:#{@secret}",
+        body: {
+          grant_type: 'client_credentials',
+          scope: 'athena/service/Athenanet.MDP.*'
+        }
+      )
+      token_hash = JSON.parse(response.response_body)
+      expires_in = token_hash['expires_in'].to_i
+      @access_token = token_hash['access_token']
+      @expires_at = initiated_at + expires_in
+    end
+  end
+end

data/lib/athena_health/client.rb

@@ -1,14 +1,27 @@
 module AthenaHealth
   class Client
-    def initialize(production: false, client_id:, secret:, token: nil)
-      @api = AthenaHealth::Connection.new(
-        production: production,
+    PRODUCTION_BASE_URL = 'https://api.platform.athenahealth.com'.freeze
+    PREVIEW_BASE_URL = 'https://api.preview.platform.athenahealth.com'.freeze
+    API_VERSION = 'v1'.freeze
+
+    def initialize(client_id:, secret:, production: false, auth_token_hash: nil)
+      base_url = Client.base_url(production: production)
+      @token = AthenaHealth::AuthToken.new(
         client_id: client_id,
         secret: secret,
-        token: token,
+        auth_token_hash: auth_token_hash,
+        base_url: base_url,
+        api_version: API_VERSION
+      )
+      @api = AthenaHealth::Connection.new(
+        base_url: base_url, api_version: API_VERSION, token: @token
       )
     end
 
+    def serialized_token
+      @token.serialized_token
+    end
+
     include Endpoints::Practices
     include Endpoints::Departments
     include Endpoints::Patients
@@ -20,5 +33,9 @@ module AthenaHealth
     include Endpoints::Subscriptions
     include Endpoints::Claims
     include Endpoints::CustomFields
+
+    def self.base_url(production:)
+      production ? PRODUCTION_BASE_URL : PREVIEW_BASE_URL
+    end
   end
 end

data/lib/athena_health/connection.rb

@@ -2,43 +2,23 @@ require 'json'
 
 module AthenaHealth
   class Connection
-    PRODUCTION_BASE_URL    = 'https://api.platform.athenahealth.com'.freeze
-    PREVIEW_BASE_URL = 'https://api.preview.platform.athenahealth.com'.freeze
-    API_VERSION = 'v1'.freeze
-
-    def initialize(client_id:, secret:, token: nil, production: )
-      @client_id = client_id
-      @secret = secret
+    def initialize(base_url:, api_version:, token:)
       @token = token
-      @production = production
-    end
-
-    def authenticate
-      response = Typhoeus.post(
-        "#{base_url}/oauth2/#{API_VERSION}/token",
-        userpwd: "#{@client_id}:#{@secret}",
-        body: { 
-          grant_type: 'client_credentials', 
-          scope: 'athena/service/Athenanet.MDP.*' 
-        }
-      ).response_body
-
-      @token = JSON.parse(response)['access_token']
+      @api_version = api_version
+      @base_url = base_url
     end
 
     def call(endpoint:, method:, params: {}, body: {}, second_call: false)
-      authenticate if @token.nil?
-
       response = Typhoeus::Request.new(
-        "#{base_url}/#{API_VERSION}/#{endpoint}",
+        "#{@base_url}/#{@api_version}/#{endpoint}",
         method: method,
-        headers: { "Authorization" => "Bearer #{@token}"},
+        headers: @token.auth_header,
         params: params,
         body: body
       ).run
 
       if response.response_code == 401 && !second_call
-        authenticate
+        @token.reset!
         return call(endpoint: endpoint, method: method, second_call: true, body: body, params: params)
       end
 
@@ -48,13 +28,9 @@ module AthenaHealth
 
       body = response.response_body
 
-      if [400, 409].include? response.response_code
-        fail AthenaHealth::ValidationError.new(json_response(body))
-      end
+      raise AthenaHealth::ValidationError, json_response(body) if [400, 409].include? response.response_code
 
-      if response.response_code != 200
-        AthenaHealth::Error.new(code: response.response_code).render
-      end
+      AthenaHealth::Error.new(code: response.response_code).render if response.response_code != 200
 
       json_response(body)
     end
@@ -64,9 +40,5 @@ module AthenaHealth
     def json_response(body)
       JSON.parse(body)
     end
-
-    def base_url
-      @base_url ||= @production ? PRODUCTION_BASE_URL : PREVIEW_BASE_URL
-    end
   end
 end

data/lib/athena_health/endpoints/configurations.rb

@@ -8,7 +8,7 @@ module AthenaHealth
           params: params.merge!(departmentid: department_id, ordertype: order_type)
         )
 
-        response.map {|facility| AthenaHealth::Facility.new(facility) }
+        response.map { |facility| AthenaHealth::Facility.new(facility) }
       end
 
       def all_medications(practice_id:, search_value:)
@@ -18,7 +18,7 @@ module AthenaHealth
           params: { searchvalue: search_value }
         )
 
-        response.map {|medication| AthenaHealth::Medication.new(medication) }
+        response.map { |medication| AthenaHealth::Medication.new(medication) }
       end
 
       def all_allergies(practice_id:, search_value:)
@@ -28,7 +28,7 @@ module AthenaHealth
           params: { searchvalue: search_value }
         )
 
-        response.map {|allergy| AthenaHealth::Allergy.new(allergy) }
+        response.map { |allergy| AthenaHealth::Allergy.new(allergy) }
       end
 
       def all_insurances(practice_id:, plan_name:, member_id:, state:, params: {})
@@ -54,6 +54,20 @@ module AthenaHealth
 
         response.map { |ordertype| AthenaHealth::OrderType.new(ordertype) }
       end
+
+      def all_gender_identities(practice_id:, show2015edcehrtvalues: nil, limit: nil, offset: nil)
+        params = {
+          show2015edcehrtvalues: show2015edcehrtvalues, limit: limit, offset: offset
+        }.reject { |_k, v| v.nil? }
+
+        GenderIdentityFieldCollection.new(
+          @api.call(
+            endpoint: "#{practice_id}/configuration/patients/genderidentity",
+            method: :get,
+            params: params
+          )
+        )
+      end
     end
   end
 end

data/lib/athena_health/gender_identity_field_collection.rb

@@ -0,0 +1,5 @@
+module AthenaHealth
+  class GenderIdentityFieldCollection < BaseCollection
+    attribute :genderidentityfields, Array[String]
+  end
+end

data/lib/athena_health/provider.rb

@@ -16,6 +16,7 @@ module AthenaHealth
     attribute :entitytype,           String
     attribute :npi,                  Integer
     attribute :providertype,         String
+    attribute :otherprovideridlist,  Array[String]
 
     def fullname
       "#{firstname} #{lastname}"

data/lib/athena_health/version.rb

@@ -1,3 +1,3 @@
 module AthenaHealth
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.3'.freeze
 end

data/lib/athena_health.rb

@@ -3,6 +3,7 @@ require 'virtus'
 
 require 'athena_health/version'
 require 'athena_health/connection'
+require 'athena_health/auth_token'
 require 'athena_health/error'
 require 'athena_health/endpoints/practices'
 require 'athena_health/endpoints/departments'
@@ -37,6 +38,7 @@ require 'athena_health/appointment_type_collection'
 require 'athena_health/appointment'
 require 'athena_health/appointment_waitlist'
 require 'athena_health/appointment_collection'
+require 'athena_health/gender_identity_field_collection'
 require 'athena_health/insurance_package'
 require 'athena_health/insurance_package_collection'
 require 'athena_health/patient_appointment_reason'

metadata

@@ -1,43 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: athena_health
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Mateusz Urbański
+- Ben Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,10 +95,39 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.42'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.42'
 description: Ruby wrapper for Athenahealth API. See https://developer.athenahealth.com/io-docs
   for more details.
 email:
 - mateuszurbanski@yahoo.pl
+- ben@benjones.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,6 +153,7 @@ files:
 - lib/athena_health/appointment_type.rb
 - lib/athena_health/appointment_type_collection.rb
 - lib/athena_health/appointment_waitlist.rb
+- lib/athena_health/auth_token.rb
 - lib/athena_health/balance.rb
 - lib/athena_health/base_collection.rb
 - lib/athena_health/base_model.rb
@@ -156,6 +187,7 @@ files:
 - lib/athena_health/error.rb
 - lib/athena_health/event.rb
 - lib/athena_health/facility.rb
+- lib/athena_health/gender_identity_field_collection.rb
 - lib/athena_health/insurance.rb
 - lib/athena_health/insurance_collection.rb
 - lib/athena_health/insurance_package.rb