redox 1.0.2 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 723ef1a6761a8bc29b184b6ce436cab1efd9bc397bc51b7907fa8692421ba8ba
-  data.tar.gz: e45806f7bd77025ee3d060ee4c4663aa462cc0b2554042b33110f1df76f85b27
+  metadata.gz: 740cc0762bcf54c65c0767f1e6254aa304a193b493babdd5993859866911a7c2
+  data.tar.gz: df1e7871ffde6efcd565255ea17ad05a5940fa951879e30db4e152c9c78679ae
 SHA512:
-  metadata.gz: ea1863fe78f915a3ae082963dbd56dbb2501759e2f2a0ab99b622b7925febe209f33a212a700c0a48415b1464b46715941d8f95869c6811fc0cb1fddceb7ddb2
-  data.tar.gz: d4ed45942181735d43c458193a5cc39890d222f07168cbeec593531b0b7647c3c222686f1f738c4d80b5d091f3aa4c6a1df16186d22662bec6e951f650dca092
+  metadata.gz: f49cff5f2b525ff29499104f008ca393d1676d8a0963fad72154f8a8bfd0cd807fafc9017606d7d3d45c4ed81e8598d06843096b731699f972ed3143e147ad37
+  data.tar.gz: 3dd1d039480dc5573df999aa9f74f44e6a63acef237dc8257e4bdc22f073033d75b7be6b1d9617e26dcbac22e8f6d199f5d995e019bd73e3c866cde98c9acd62

data/CHANGELOG.md

@@ -4,11 +4,35 @@ 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.x.x] - UNRELEASED
+## [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
-- None
+- 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)
+- Added potential matches to responses and implemented for patient search
+
+=======
+### Added
+- PotentialMatches class
 
-## [1.0.2] - UNRELEASED
+## [1.0.2] - 2019-06-04
 ### Changed
 - Added Extensions to all Redox models
 - Fixed warnings in gemspec
@@ -89,7 +113,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial Release
 
-[Unreleased]: https://github.com/WeInfuse/redox/compare/v1.0.2...HEAD
+[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
 [1.0.0]: https://github.com/WeInfuse/redox/compare/v0.1.6...v1.0.0

data/lib/redox.rb

@@ -7,10 +7,18 @@ require 'redox/authentication'
 require 'redox/models/model'
 require 'redox/models/meta'
 require 'redox/models/patient'
+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'
 
 module Redox
   class Configuration

data/lib/redox/models/financial.rb

@@ -0,0 +1,16 @@
+module Redox
+  module Models
+    class Financial < Hashie::Trash
+      include Hashie::Extensions::IgnoreUndeclared
+      include Hashie::Extensions::IndifferentAccess
+
+      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,15 +1,27 @@
 module Redox
   module Models
+    def self.format_datetime(d)
+      if d.respond_to?(:strftime)
+        d.strftime(Redox::Models::Meta::TO_DATETIME_FORMAT)
+      else
+        d
+      end
+    end
+
     class Model < Hashie::Trash
       include Hashie::Extensions::IgnoreUndeclared
       include Hashie::Extensions::IndifferentAccess
 
       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 initialize(data = {})
@@ -28,16 +40,20 @@ module Redox
         return { key => super.to_h }
       end
 
-      def to_json
+      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].each do |k|
+          %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

data/lib/redox/models/patient.rb

@@ -1,11 +1,6 @@
 module Redox
   module Models
     class Patient < Model
-      QUERY_ENDPOINT = '/query'.freeze
-      QUERY_META     = Meta.new(EventType: 'Query', DataModel: 'PatientSearch')
-      CREATE_META    = Meta.new(EventType: 'NewPatient', DataModel: 'PatientAdmin')
-      UPDATE_META    = Meta.new(EventType: 'PatientUpdate', DataModel: 'PatientAdmin')
-
       property :Identifiers, from: :identifiers, required: false, default: []
       property :Insurances, from: :insurances, required: false, default: []
       property :Demographics, from: :demographics, required: false
@@ -40,25 +35,16 @@ module Redox
       end
 
       def update(meta: Meta.new)
-        meta = UPDATE_META.merge(meta)
-        return Model.from_response((RedoxClient.connection.request(body: Patient.body(self, meta))))
+        Redox::Request::PatientAdmin.update(patient: self, meta: meta)
       end
 
       def create(meta: Meta.new)
-        meta = CREATE_META.merge(meta)
-        return Model.from_response((RedoxClient.connection.request(body: Patient.body(self, meta))))
+        Redox::Request::PatientAdmin.create(patient: self, meta: meta)
       end
 
       class << self
         def query(params, meta: Meta.new)
-          meta = QUERY_META.merge(meta)
-          return Model.from_response((RedoxClient.connection.request(endpoint: QUERY_ENDPOINT, body: Patient.body(params, meta))))
-        end
-
-        def body(params, meta)
-          meta = Meta.new.merge(meta)
-
-          return meta.to_h.merge(params.to_h)
+          return Redox::Request::PatientSearch.query(params, meta: meta)
         end
       end
     end

data/lib/redox/models/potential_matches.rb

@@ -0,0 +1,13 @@
+module Redox
+  module Models
+    class PotentialMatches < Array
+      def initialize(data = [])
+        if false == data.nil?
+          super(data.map {|patient| Redox::Models::Patient.new(patient) })
+        else
+          super([])
+        end
+      end
+    end
+  end
+end

data/lib/redox/models/transaction.rb

@@ -0,0 +1,66 @@
+module Redox
+  module Models
+    class Transaction < Hashie::Trash
+      include Hashie::Extensions::IgnoreUndeclared
+      include Hashie::Extensions::IndifferentAccess
+
+      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 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

@@ -0,0 +1,18 @@
+module Redox
+  module Request
+    class PatientAdmin
+      CREATE_META    = Redox::Models::Meta.new(EventType: 'NewPatient', DataModel: 'PatientAdmin')
+      UPDATE_META    = Redox::Models::Meta.new(EventType: 'PatientUpdate', DataModel: 'PatientAdmin')
+
+      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.build_body(patient, meta))))
+      end
+
+      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.build_body(patient, meta))))
+      end
+    end
+  end
+end

data/lib/redox/request/patient_search.rb

@@ -0,0 +1,13 @@
+module Redox
+  module Request
+    class PatientSearch
+      QUERY_ENDPOINT = '/query'.freeze
+      QUERY_META     = Redox::Models::Meta.new(EventType: 'Query', DataModel: 'PatientSearch')
+
+      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.build_body(params, 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.0.2'.freeze
+  VERSION = '1.3.1'.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.0.2
+  version: 1.3.1
 platform: ruby
 authors:
 - Alexander Clark
 - Mike Crockett
-autorequire: 
+- Mike Carr
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2020-10-02 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,6 +147,7 @@ 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/patient.rb
@@ -152,7 +155,14 @@ files:
 - 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/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/request.rb
 - lib/redox/version.rb
 - redox.gemspec
 homepage: https://github.com/WeInfuse/redox
@@ -160,7 +170,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,9 +185,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: []