redox 1.3.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0666bbb5152f4d34f3966dad512c2b1c6bb62cd661235516ad2a123eca63e653
-  data.tar.gz: ec535077633c70fa241a3ee5a8af81812791e53e36f72dfcfcb87900b96a9fe5
+  metadata.gz: 4e502173db4efa95ee3c6e4f338ad78344c25c52aa35be766d4f6137724a4923
+  data.tar.gz: 339890660bea9426b4950c33697a7e38eada9b07ba0a4356ecda5076271d404c
 SHA512:
-  metadata.gz: 844d30e49f7d57e5ca0dd7acc91d3bbc0aac672213e7016de5f5f52cac6e77e1123f1cb94613c5521d90c2f0a7445e0174af223c1e5b93c092386f6be5d2f9d6
-  data.tar.gz: 1d09377d50c8729f7e3698bd2de877b3b4c081a8ec21a3b9997e0da6dbc9c5bab7f58fb6cb1da273e062443b41168bdb7178c872c8beeda77e24f8239cd7636f
+  metadata.gz: a434730a3fb38681fdd434ac7451c1c9ee5ed49f9f136292991f2499e97f6f16537c853bb1d1b2c13b25882e3ea0210d2cb301f64594fc97c9a229341a5fc213
+  data.tar.gz: 7d9ab435afe16ae9288f5a8dea5c18e137d592adc4122ecd3b65dbd6504ecbe22b5ecd0ba1c262abcd797ecc230f8c24ce39963fbabf315c8233eb7d9b0334f7

data/CHANGELOG.md

@@ -4,6 +4,42 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.5.2] - 2021-01-08
+### Added
+- Visit#Type
+- Visit#Status
+- Visit#Reason
+- Visit#Equipment
+
+## [1.5.1] - 2020-12-22
+### Added
+- Contacts model
+- Patient#contacts
+
+### Changed
+- typo of martialstatus is now maritalstatus for Demographics model
+
+## [1.5.0] - 2020-12-15
+### Added
+- Scheduling model
+- Scheduling#create
+- Scheduling#cancel
+- Scheduling#reschedule
+- Scheduling#modification
+
+## [1.4.0] - 2020-10-13
+### Added
+- AbstractModel that does not add top level key
+- OrderingProvider that is the base for PCP
+- Provider model
+- Provider#query
+- Created new method that can add helpers dynamically from response
+
+## [1.3.1] - 2020-10-02
+### Added
+- Transaction#as\_json
+- Visit#as\_json
+
 ## [1.3.0] - 2020-09-17
 ### Added 
 - Transaction model
@@ -23,7 +59,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Moving to Requst classes instead of mixing in logic to models (kept backwards compatibility)
 - Added potential matches to responses and implemented for patient search
 
-=======
 ### Added
 - PotentialMatches class
 
@@ -108,6 +143,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial Release
 
+[1.5.2]: https://github.com/WeInfuse/redox/compare/v1.5.1...v1.5.2
+[1.5.1]: https://github.com/WeInfuse/redox/compare/v1.5.0...v1.5.1
+[1.5.0]: https://github.com/WeInfuse/redox/compare/v1.4.0...v1.5.0
+[1.4.0]: https://github.com/WeInfuse/redox/compare/v1.3.1...v1.4.0
+[1.3.1]: https://github.com/WeInfuse/redox/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/WeInfuse/redox/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/WeInfuse/redox/compare/v1.1.1...v1.2.0
 [1.1.1]: https://github.com/WeInfuse/redox/compare/v1.1.0...v1.1.1

data/lib/redox.rb

@@ -6,19 +6,25 @@ require 'redox/connection'
 require 'redox/authentication'
 require 'redox/models/model'
 require 'redox/models/meta'
+require 'redox/models/ordering_provider'
 require 'redox/models/patient'
+require 'redox/models/provider'
 require 'redox/models/visit'
 require 'redox/models/transaction'
 require 'redox/models/financial'
 require 'redox/models/patient/demographics'
+require 'redox/models/patient/contacts'
 require 'redox/models/patient/identifier'
 require 'redox/models/patient/insurance'
 require 'redox/models/patient/p_c_p'
 require 'redox/models/potential_matches'
+require 'redox/models/scheduling'
 require 'redox/request/request'
 require 'redox/request/financial'
 require 'redox/request/patient_admin'
 require 'redox/request/patient_search'
+require 'redox/request/provider'
+require 'redox/request/scheduling'
 
 module Redox
   class Configuration

data/lib/redox/models/financial.rb

@@ -1,9 +1,6 @@
 module Redox
   module Models
-    class Financial < Hashie::Trash
-      include Hashie::Extensions::IgnoreUndeclared
-      include Hashie::Extensions::IndifferentAccess
-
+    class Financial < AbstractModel
       property :Visit, required: false, from: :visit, default: Redox::Models::Visit.new
       property :Patient, required: false, from: :patient, default: Redox::Models::Patient.new
       property :Transactions, required: false, from: :transactions, default: []

data/lib/redox/models/model.rb

@@ -8,10 +8,12 @@ module Redox
       end
     end
 
-    class Model < Hashie::Trash
+    class AbstractModel < Hashie::Trash
       include Hashie::Extensions::IgnoreUndeclared
       include Hashie::Extensions::IndifferentAccess
 
+      HIGH_LEVEL_KEYS = %w[Meta Patient Visit PotentialMatches]
+
       property :Meta, from: :meta, required: false
       property :Patient, from: :patient, required: false
       property :Visit, from: :visit, required: false
@@ -24,6 +26,70 @@ module Redox
       alias_method :visit, :Visit
       alias_method :meta, :Meta
 
+      def to_json(args = {})
+        return self.to_h.to_json
+      end
+
+      def insurances
+        (self.patient&.insurances || []) + (self.visit&.insurances || [])
+      end
+
+      def self.from_response(response)
+        model = Model.new
+        model.response = response
+
+        HIGH_LEVEL_KEYS.each do |k|
+          begin
+            model.send("#{k}=", Module.const_get("Redox::Models::#{k}").new(response[k])) if response[k]
+          rescue
+          end
+        end
+
+        return model
+      end
+
+      def self.from_response_inflected(response)
+        model = self.from_response(response)
+
+        if (model.response.ok?)
+          data = model.response.parsed_response
+
+          if data.respond_to?(:keys)
+            model_class = nil
+
+            if model.meta&.data_model
+              model_class = "Redox::Models::#{model.meta.data_model}"
+
+              begin
+                model_class = Object.const_get(model_class)
+              rescue NameError
+                model_class = nil
+              end
+            end
+
+            data.keys.each do |key|
+              next if HIGH_LEVEL_KEYS.include?(key.to_s)
+
+              helper_name = key.to_s.downcase.to_sym
+
+              if model_class.nil?
+                model.define_singleton_method(helper_name) { data[key] }
+              else
+                if data[key].is_a?(Array)
+                  model.define_singleton_method(helper_name) { data[key].map {|obj| model_class.new(obj) } }
+                else
+                  model.define_singleton_method(helper_name) { model_class.new(data[key]) }
+                end
+              end
+            end
+          end
+        end
+
+        return model
+      end
+    end
+
+    class Model < AbstractModel
       def initialize(data = {})
         if data.is_a?(Hash)
           if data.include?(key)
@@ -40,32 +106,7 @@ module Redox
         return { key => super.to_h }
       end
 
-      def to_json(args = {})
-        return self.to_h.to_json
-      end
-
-      def insurances
-        (self.patient&.insurances || []) + (self.visit&.insurances || [])
-      end
-
-      class << self
-        def from_response(response)
-          model = Model.new
-          model.response = response
-
-          %w[Meta Patient Visit PotentialMatches].each do |k|
-            begin
-              model.send("#{k}=", Module.const_get("Redox::Models::#{k}").new(response[k])) if response[k]
-            rescue
-            end
-          end
-
-          return model
-        end
-      end
-
       private
-
       def key
         return self.class.to_s.split('::').last.to_s
       end

data/lib/redox/models/ordering_provider.rb

@@ -0,0 +1,15 @@
+module Redox
+  module Models
+    class OrderingProvider < AbstractModel
+      property :ID, required: false, from: :id
+      property :IDType, required: false, from: :id_type
+      property :FirstName, required: false, from: :first_name
+      property :LastName, required: false, from: :last_name
+
+      alias_method :first_name, :FirstName
+      alias_method :last_name, :LastName
+      alias_method :id, :ID
+      alias_method :id_type, :IDType
+    end
+  end
+end

data/lib/redox/models/patient.rb

@@ -4,10 +4,12 @@ module Redox
       property :Identifiers, from: :identifiers, required: false, default: []
       property :Insurances, from: :insurances, required: false, default: []
       property :Demographics, from: :demographics, required: false
+      property :Contacts, from: :contacts, required: false, default: []
       property :PCP, from: :primary_care_provider, required: false
 
       alias_method :identifiers, :Identifiers
       alias_method :insurances, :Insurances
+      alias_method :contacts, :Contacts
 
       def demographics
         self[:Demographics] = Demographics.new(self[:Demographics]) unless self[:Demographics].is_a?(Redox::Models::Demographics)
@@ -22,6 +24,10 @@ module Redox
         self[:PCP] ||= PCP.new
       end
 
+      def contacts
+        self[:Contacts] = self[:Contacts].map {|contact| contact.is_a?(Redox::Models::Contact) ? contact : Contact.new(contact)}
+      end
+
       def add_identifier(type: , value: )
         self[:Identifiers] << Identifier.new({'ID' => value, 'IDType' => type})
 

data/lib/redox/models/patient/contacts.rb

@@ -0,0 +1,20 @@
+module Redox
+  module Models
+    class Contact < AbstractModel
+      property :FirstName, required: false, from: :first_name
+      property :MiddleName, required: false, from: :middle_name
+      property :LastName, required: false, from: :last_name
+      property :RelationToPatient, required: false
+      property :EmailAddresses, required: false, default: []
+      property :Address, required: false, default: {}
+      property :PhoneNumber, required: false, default: {}
+      property :Roles, required: false, default: []
+
+      alias_method :first_name, :FirstName
+      alias_method :middle_name, :MiddleName
+      alias_method :last_name, :LastName
+      alias_method :address, :Address
+      alias_method :phone_number, :PhoneNumber
+    end
+  end
+end

data/lib/redox/models/patient/demographics.rb

@@ -1,6 +1,6 @@
 module Redox
   module Models
-    class Demographics < Model
+    class Demographics < AbstractModel
       property :FirstName, required: false, from: :first_name
       property :MiddleName, required: false, from: :middle_name
       property :LastName, required: false, from: :last_name
@@ -9,7 +9,7 @@ module Redox
       property :Sex, required: false, from: :sex
       property :Race, required: false, from: :race
       property :IsHispanic, required: false
-      property :MaritalStatus, required: false, from: :martial_status
+      property :MaritalStatus, required: false, from: :marital_status
       property :IsDeceased, required: false
       property :DeathDateTime, required: false
       property :Language, required: false, from: :language
@@ -25,7 +25,7 @@ module Redox
       alias_method :ssn, :SSN
       alias_method :sex, :Sex
       alias_method :race, :Race
-      alias_method :martial_status, :MaritalStatus
+      alias_method :marital_status, :MaritalStatus
       alias_method :language, :Language
       alias_method :address, :Address
       alias_method :phone_number, :PhoneNumber

data/lib/redox/models/patient/identifier.rb

@@ -1,6 +1,6 @@
 module Redox
   module Models
-    class Identifier < Model
+    class Identifier < AbstractModel
       property :ID, from: :id
       property :IDType, from: :id_type
 

data/lib/redox/models/patient/p_c_p.rb

@@ -1,13 +1,9 @@
 module Redox
   module Models
-    class PCP < Model
+    class PCP < OrderingProvider
       property :NPI, from: :npi
-      property :FirstName, required: false, from: :first_name
-      property :LastName, required: false, from: :last_name
 
       alias_method :npi, :NPI
-      alias_method :first_name, :FirstName
-      alias_method :last_name, :LastName
     end
   end
 end

data/lib/redox/models/provider.rb

@@ -0,0 +1,21 @@
+module Redox
+  module Models
+    class Provider < Model
+      property :Identifiers, from: :identifiers, required: false, default: []
+      property :Demographics, from: :demographics, required: false
+
+      alias_method :identifiers, :Identifiers
+
+      def demographics
+        self[:Demographics] = Demographics.new(self[:Demographics]) unless self[:Demographics].is_a?(Redox::Models::Demographics)
+        self[:Demographics] ||= Demographics.new
+      end
+
+      def add_identifier(type: , value: )
+        self[:Identifiers] << Identifier.new({'ID' => value, 'IDType' => type})
+
+        return self
+      end
+    end
+  end
+end

data/lib/redox/models/scheduling.rb

@@ -0,0 +1,24 @@
+module Redox
+  module Models
+    class Scheduling < AbstractModel
+      property :Visit, required: false, from: :visit, default: Redox::Models::Visit.new
+      property :Patient, required: false, from: :patient, default: Redox::Models::Patient.new
+      property :AppointmentInfo, required: false, from: :appointment_info, default: []
+
+      alias_method :patient, :Patient
+      alias_method :visit, :Visit
+      alias_method :appointment_info, :AppointmentInfo
+
+      def add_appointment_info(code: nil, codeset: nil, description: nil, value: nil)
+        self[:AppointmentInfo] << {
+          Code: code,
+          Codeset: codeset,
+          Description: description,
+          Value: value
+        }
+
+        self
+      end
+    end
+  end
+end

data/lib/redox/models/transaction.rb

@@ -1,9 +1,6 @@
 module Redox
   module Models
-    class Transaction < Hashie::Trash
-      include Hashie::Extensions::IgnoreUndeclared
-      include Hashie::Extensions::IndifferentAccess
-
+    class Transaction < AbstractModel
       property :Chargeable, required: false, from: :chargeable, default: {}
       property :DateTimeOfService, required: false, from: :start
       property :Department, required: false, from: :department, default: {}
@@ -48,14 +45,30 @@ module Redox
         self
       end
 
-      def to_json(args = nil)
-        d = self.dup
+      def add_ordering_provider(**kwargs)
+        self[:OrderingProviders] ||= []
+        self[:OrderingProviders] << OrderingProvider.new(kwargs)
+        self
+      end
 
-        [:EndDateTime, :DateTimeOfService].each do |k|
-          d[k] = Redox::Models.format_datetime(d[k])
+      def add_performer(**kwargs)
+        self[:Performers] ||= []
+        self[:Performers] << OrderingProvider.new(kwargs)
+        self
+      end
+
+      def to_h
+        result = super.to_h
+
+        %w[EndDateTime DateTimeOfService].each do |k|
+          result[k] = Redox::Models.format_datetime(result[k])
         end
 
-        d.to_h.to_json
+        result
+      end
+
+      def as_json(args)
+        self.to_h
       end
     end
   end

data/lib/redox/models/visit.rb

@@ -9,8 +9,13 @@ module Redox
       property :Insurances, from: :insurances, required: false, default: []
       property :Location, from: :location, required: false, default: DEFAULT_LOCATION
       property :VisitDateTime, from: :start, required: false
+      property :Duration, from: :duration, required: false
       property :VisitNumber, from: :visit_number, required: false
       property :AccountNumber, from: :account_number, required: false
+      property :Status, from: :status, required: false
+      property :Type, from: :type, required: false
+      property :Reason, from: :reason, required: false
+      property :Equipment, from: :equipment, required: false
 
       alias_method :insurances, :Insurances
       alias_method :start, :VisitDateTime
@@ -27,14 +32,32 @@ module Redox
         self
       end
 
+      def add_equipment(description: nil, code: nil)
+        self[:Equipment] ||= []
+        self[:Equipment] << { Description: description, Code: code }
+        self
+      end
+
       def insurances
         self[:Insurances] = self[:Insurances].map {|ins| ins.is_a?(Redox::Models::Insurance) ? ins : Insurance.new(ins) }
       end
 
-      def to_json(args = nil)
-        d = self.dup
-        d[:VisitDateTime] = Redox::Models.format_datetime(d[:VisitDateTime])
-        d.to_h.to_json
+      def to_h
+        result = super.to_h
+
+        %w[VisitDateTime].each do |k|
+          result[key][k] = Redox::Models.format_datetime(result[key][k])
+        end
+
+        result
+      end
+
+      def to_json(args = {})
+        self.to_h.to_json
+      end
+
+      def as_json(args = {})
+        self.to_h.dig('Visit')
       end
     end
   end

data/lib/redox/request/provider.rb

@@ -0,0 +1,12 @@
+module Redox
+  module Request
+    class Provider
+      QUERY_META = Redox::Models::Meta.new(EventType: 'ProviderQuery', DataModel: 'Provider')
+
+      def self.query(provider, meta: Redox::Models::Meta.new)
+        meta = QUERY_META.merge(meta)
+        return Redox::Models::Model.from_response_inflected((RedoxClient.connection.request(body: Redox::Request.build_body(provider, meta))))
+      end
+    end
+  end
+end

data/lib/redox/request/scheduling.rb

@@ -0,0 +1,30 @@
+module Redox
+  module Request
+    class Scheduling
+      CREATE_META       = Redox::Models::Meta.new(EventType: 'New', DataModel: 'Scheduling')
+      CANCEL_META       = Redox::Models::Meta.new(EventType: 'Cancel', DataModel: 'Scheduling')
+      RESCHEDULE_META   = Redox::Models::Meta.new(EventType: 'Reschedule', DataModel: 'Scheduling')
+      MODIFICATION_META = Redox::Models::Meta.new(EventType: 'Modification', DataModel: 'Scheduling')
+
+      def self.create(model, meta: Redox::Models::Meta.new)
+        meta = CREATE_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(model, meta))))
+      end
+
+      def self.cancel(model, meta: Redox::Models::Meta.new)
+        meta = CANCEL_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(model, meta))))
+      end
+
+      def self.reschedule(model, meta: Redox::Models::Meta.new)
+        meta = RESCHEDULE_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(model, meta))))
+      end
+
+      def self.modification(model, meta: Redox::Models::Meta.new)
+        meta = MODIFICATION_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(model, meta))))
+      end
+    end
+  end
+end

data/lib/redox/version.rb

@@ -1,3 +1,3 @@
 module Redox
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.5.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redox
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Alexander Clark
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -150,19 +150,25 @@ files:
 - lib/redox/models/financial.rb
 - lib/redox/models/meta.rb
 - lib/redox/models/model.rb
+- lib/redox/models/ordering_provider.rb
 - lib/redox/models/patient.rb
+- lib/redox/models/patient/contacts.rb
 - lib/redox/models/patient/demographics.rb
 - lib/redox/models/patient/identifier.rb
 - lib/redox/models/patient/insurance.rb
 - lib/redox/models/patient/p_c_p.rb
 - lib/redox/models/potential_matches.rb
+- lib/redox/models/provider.rb
+- lib/redox/models/scheduling.rb
 - lib/redox/models/transaction.rb
 - lib/redox/models/visit.rb
 - lib/redox/redox_exception.rb
 - lib/redox/request/financial.rb
 - lib/redox/request/patient_admin.rb
 - lib/redox/request/patient_search.rb
+- lib/redox/request/provider.rb
 - lib/redox/request/request.rb
+- lib/redox/request/scheduling.rb
 - lib/redox/version.rb
 - redox.gemspec
 homepage: https://github.com/WeInfuse/redox