redox 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451221082b696c7421fa2feacde94c0235bbd78348c416d904cba8df3d1ff67b
-  data.tar.gz: 9934ade2a99d85628444a8845b15bf14c79cb595f1307da196d57d1faa2a2668
+  metadata.gz: e2c926b510dc2e56b85369003ee89caf82292929308a18775df049e4a57e1d95
+  data.tar.gz: 9799c173cb24daa74f3dfe02eefb3f8c2a456557dafa819fb7ca2760621a3b4e
 SHA512:
-  metadata.gz: 192db714b76ee2a5d197577e21c2907f50d211667b1d16f7ee468af71196655da67fc593771e1f713419bc5a382e8b196b315660dba62c4563ee553bc9581e8d
-  data.tar.gz: 2f72e880e360b4d74e6b8b27b25baf0f9a4bb867615723afa9c40089d1a4debaf42c96aa6ee5997f2bc432d315bcbd6c02d9612c9f73aa096dffed1e6cb18cb9
+  metadata.gz: 1499bf55b2c53f0a0dafc2d68d3b420bc5a0a0760d4258103360d32526b32e4f418a59fddb50afb3feb80ac45a979045b943018d24a717129e7db072c7233faf
+  data.tar.gz: 2b2eeebee1f5a35c028cee6c77f582e0dff10734cec40ce620fdc02617c01daf42f73d62e4960ec7a7b77ed4290f733c3fb0ce46f408566f826fa86f1d71a970

data/CHANGELOG.md

@@ -4,6 +4,33 @@ 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.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
+- Financial#create
+
+## [1.2.0] - 2020-07-30
+### Added 
+- Visit model
+- Model#insurances helper for Patient.Insurances || Visit.Insurances
+
+## [1.1.1] - 2020-06-15
+### Changed
+- Bugfix with patient param in update
+
 ## [1.1.0] - 2020-06-15
 ### Changed
 - Moving to Requst classes instead of mixing in logic to models (kept backwards compatibility)
@@ -94,6 +121,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial Release
 
+[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
 [1.1.0]: https://github.com/WeInfuse/redox/compare/v1.0.2...v1.1.0
 [1.0.2]: https://github.com/WeInfuse/redox/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/WeInfuse/redox/compare/v1.0.0...v1.0.1

data/lib/redox.rb

@@ -6,14 +6,22 @@ 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/identifier'
 require 'redox/models/patient/insurance'
 require 'redox/models/patient/p_c_p'
 require 'redox/models/potential_matches'
+require 'redox/request/request'
+require 'redox/request/financial'
 require 'redox/request/patient_admin'
 require 'redox/request/patient_search'
+require 'redox/request/provider'
 
 module Redox
   class Configuration

data/lib/redox/models/financial.rb

@@ -0,0 +1,13 @@
+module Redox
+  module Models
+    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: []
+
+      alias_method :patient, :Patient
+      alias_method :visit, :Visit
+      alias_method :transactions, :Transactions
+    end
+  end
+end

data/lib/redox/models/model.rb

@@ -1,19 +1,95 @@
 module Redox
   module Models
-    class Model < Hashie::Trash
+    def self.format_datetime(d)
+      if d.respond_to?(:strftime)
+        d.strftime(Redox::Models::Meta::TO_DATETIME_FORMAT)
+      else
+        d
+      end
+    end
+
+    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
       property :PotentialMatches, from: :potential_matches, required: false
       property :Extensions, from: :extensions, required: false
       property :response, required: false
 
       alias_method :potential_matches, :PotentialMatches
       alias_method :patient, :Patient
+      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)
@@ -30,28 +106,7 @@ module Redox
         return { key => super.to_h }
       end
 
-      def to_json
-        return self.to_h.to_json
-      end
-
-      class << self
-        def from_response(response)
-          model = Model.new
-          model.response = response
-
-          %w[Meta Patient 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/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

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/transaction.rb

@@ -0,0 +1,75 @@
+module Redox
+  module Models
+    class Transaction < AbstractModel
+      property :Chargeable, required: false, from: :chargeable, default: {}
+      property :DateTimeOfService, required: false, from: :start
+      property :Department, required: false, from: :department, default: {}
+      property :Diagnoses, required: false, from: :diagnoses, default: []
+      property :EndDateTime, required: false, from: :end
+      property :Extensions, required: false, from: :extensions, default: {}
+      property :ID, required: false, from: :id
+      property :NDC, required: false, from: :ndc, default: {}
+      property :OrderID, required: false, from: :order_id
+      property :OrderingProviders, required: false, from: :ordering_providers, default: []
+      property :Performers, required: false, from: :performers, default: []
+      property :Procedure, required: false, from: :procedure, default: {}
+      property :Type, required: false, from: :type
+
+      alias_method :chargeable, :Chargeable
+      alias_method :start, :DateTimeOfService
+      alias_method :department, :Department
+      alias_method :diagnoses, :Diagnoses
+      alias_method :end, :EndDateTime
+      alias_method :extensions, :Extensions
+      alias_method :id, :ID
+      alias_method :ndc, :NDC
+      alias_method :order_id, :OrderID
+      alias_method :ordering_providers, :OrderingProviders
+      alias_method :performers, :Performers
+      alias_method :procedure, :Procedure
+      alias_method :type, :Type
+
+      def add_medication(ndc_code: nil, quantity: nil, magnitude: nil, unit: nil, description: nil)
+        self[:NDC] = { Code: ndc_code, Description: description }
+        self[:Extensions] = {
+          'ndc-quantity' => {
+            integer: quantity&.to_s
+          },
+          'ndc-units-measure' => {
+            coding: {
+              code: magnitude&.to_s,
+              display: unit
+            }
+          }
+        }
+        self
+      end
+
+      def add_ordering_provider(**kwargs)
+        self[:OrderingProviders] ||= []
+        self[:OrderingProviders] << OrderingProvider.new(kwargs)
+        self
+      end
+
+      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
+
+        result
+      end
+
+      def as_json(args)
+        self.to_h
+      end
+    end
+  end
+end

data/lib/redox/models/visit.rb

@@ -0,0 +1,53 @@
+module Redox
+  module Models
+    class Visit < Model
+      DEFAULT_LOCATION = {
+        Department: nil,
+        Facility: nil
+      }
+
+      property :Insurances, from: :insurances, required: false, default: []
+      property :Location, from: :location, required: false, default: DEFAULT_LOCATION
+      property :VisitDateTime, from: :start, required: false
+      property :VisitNumber, from: :visit_number, required: false
+      property :AccountNumber, from: :account_number, required: false
+
+      alias_method :insurances, :Insurances
+      alias_method :start, :VisitDateTime
+
+      def department=(v)
+        self[:Location] ||= DEFAULT_LOCATION
+        self[:Location][:Department] = v
+        self
+      end
+
+      def facility=(v)
+        self[:Location] ||= DEFAULT_LOCATION
+        self[:Location][:Facility] = v
+        self
+      end
+
+      def insurances
+        self[:Insurances] = self[:Insurances].map {|ins| ins.is_a?(Redox::Models::Insurance) ? ins : Insurance.new(ins) }
+      end
+
+      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
+end

data/lib/redox/request/financial.rb

@@ -0,0 +1,12 @@
+module Redox
+  module Request
+    class Financial
+      TRANSACTION_META = Redox::Models::Meta.new(EventType: 'Transaction', DataModel: 'Financial')
+
+      def self.create(financial, meta: Redox::Models::Meta.new)
+        meta = TRANSACTION_META.merge(meta)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(financial, meta))))
+      end
+    end
+  end
+end

data/lib/redox/request/patient_admin.rb

@@ -4,20 +4,14 @@ module Redox
       CREATE_META    = Redox::Models::Meta.new(EventType: 'NewPatient', DataModel: 'PatientAdmin')
       UPDATE_META    = Redox::Models::Meta.new(EventType: 'PatientUpdate', DataModel: 'PatientAdmin')
 
-      def self.create(patient: p, meta: Redox::Models::Meta.new)
+      def self.create(patient: , meta: Redox::Models::Meta.new)
         meta = CREATE_META.merge(meta)
-        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request::PatientAdmin.build_body(p, meta))))
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(patient, meta))))
       end
 
-      def self.update(patient: p, meta: Redox::Models::Meta.new)
+      def self.update(patient: , meta: Redox::Models::Meta.new)
         meta = UPDATE_META.merge(meta)
-        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request::PatientAdmin.build_body(p, meta))))
-      end
-
-      def self.build_body(params, meta)
-        meta = Redox::Models::Meta.new.merge(meta)
-
-        return meta.to_h.merge(params.to_h)
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(patient, meta))))
       end
     end
   end

data/lib/redox/request/patient_search.rb

@@ -6,7 +6,7 @@ module Redox
 
       def self.query(params, meta: Redox::Models::Meta.new)
         meta = QUERY_META.merge(meta)
-        return Redox::Models::Model.from_response((RedoxClient.connection.request(endpoint: QUERY_ENDPOINT, body: Redox::Request::PatientAdmin.build_body(params, meta))))
+        return Redox::Models::Model.from_response((RedoxClient.connection.request(endpoint: QUERY_ENDPOINT, body: Redox::Request.build_body(params, meta))))
       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/request.rb

@@ -0,0 +1,9 @@
+module Redox
+  module Request
+    def self.build_body(params, meta)
+      meta = Redox::Models::Meta.new.merge(meta)
+
+      return meta.to_h.merge(params.to_h)
+    end
+  end
+end

data/lib/redox/version.rb

@@ -1,3 +1,3 @@
 module Redox
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/redox.gemspec

@@ -5,8 +5,8 @@ require 'redox/version'
 Gem::Specification.new do |spec|
   spec.name          = 'redox'
   spec.version       = Redox::VERSION
-  spec.authors       = ['Alexander Clark', 'Mike Crockett']
-  spec.email         = ['alexander.clark@weinfuse.com', 'mike.crockett@weinfuse.com']
+  spec.authors       = ['Alexander Clark', 'Mike Crockett', 'Mike Carr']
+  spec.email         = ['alexander.clark@weinfuse.com', 'mike.crockett@weinfuse.com', 'michael.carr@weinfuse.com']
 
   spec.summary       = 'Ruby wrapper for the Redox Engine API'
   spec.homepage      = 'https://github.com/WeInfuse/redox'
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.licenses      = ['MIT']
 
-  spec.add_dependency 'httparty', '~> 0.17'
+  spec.add_dependency 'httparty', '~> 0.18'
   spec.add_dependency 'hashie', '~> 3.5'
   spec.add_development_dependency 'bundler', '>=1', '<3'
   spec.add_development_dependency 'byebug', '~> 11'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: redox
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Alexander Clark
 - Mike Crockett
-autorequire: 
+- Mike Carr
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -17,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -129,10 +130,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: 
+description:
 email:
 - alexander.clark@weinfuse.com
 - mike.crockett@weinfuse.com
+- michael.carr@weinfuse.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -145,17 +147,25 @@ files:
 - lib/redox.rb
 - lib/redox/authentication.rb
 - lib/redox/connection.rb
+- 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/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/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/version.rb
 - redox.gemspec
 homepage: https://github.com/WeInfuse/redox
@@ -163,7 +173,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,9 +188,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for the Redox Engine API
 test_files: []