redox 1.8.5 → 1.8.7

data/lib/redox/models/note.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Note < AbstractModel
@@ -7,11 +9,11 @@ module Redox
       property :Provider, required: false, from: :provider, default: {}
       property :Components, required: false, from: :components, default: []
 
-      alias_method :content_type, :ContentType
-      alias_method :document_type, :DocumentType
-      alias_method :document_id, :DocumentID
-      alias_method :provider, :Provider
-      alias_method :components, :Components
+      alias content_type ContentType
+      alias document_type DocumentType
+      alias document_id DocumentID
+      alias provider Provider
+      alias components Components
     end
   end
 end

data/lib/redox/models/notes.rb

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Notes < AbstractModel
       property :Note, from: :note, required: false
 
-      alias_method :note, :Note
-
       def note
-         self[:Note] = Note.new(self[:Note]) unless self[:Note].is_a?(Redox::Models::Note)
-         self[:Note] ||= Note.new
+        self[:Note] = Note.new(self[:Note]) unless self[:Note].is_a?(Redox::Models::Note)
+        self[:Note] ||= Note.new
       end
     end
   end

data/lib/redox/models/ordering_provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class OrderingProvider < AbstractModel
@@ -6,10 +8,10 @@ module Redox
       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
+      alias first_name FirstName
+      alias last_name LastName
+      alias id ID
+      alias id_type IDType
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Contact < AbstractModel
@@ -10,11 +12,11 @@ module Redox
       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
+      alias first_name FirstName
+      alias middle_name MiddleName
+      alias last_name LastName
+      alias address Address
+      alias phone_number PhoneNumber
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Demographics < AbstractModel
@@ -18,17 +20,17 @@ module Redox
       property :Address, required: false, default: {}
       property :PhoneNumber, required: false, default: {}
 
-      alias_method :first_name, :FirstName
-      alias_method :middle_name, :MiddleName
-      alias_method :last_name, :LastName
-      alias_method :dob, :DOB
-      alias_method :ssn, :SSN
-      alias_method :sex, :Sex
-      alias_method :race, :Race
-      alias_method :marital_status, :MaritalStatus
-      alias_method :language, :Language
-      alias_method :address, :Address
-      alias_method :phone_number, :PhoneNumber
+      alias first_name FirstName
+      alias middle_name MiddleName
+      alias last_name LastName
+      alias dob DOB
+      alias ssn SSN
+      alias sex Sex
+      alias race Race
+      alias marital_status MaritalStatus
+      alias language Language
+      alias address Address
+      alias phone_number PhoneNumber
     end
   end
 end

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

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Identifier < AbstractModel
       property :ID, from: :id
       property :IDType, from: :id_type
 
-      alias_method :id, :ID
-      alias_method :id_type, :IDType
+      alias id ID
+      alias id_type IDType
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Insurance < Model
@@ -13,17 +15,17 @@ module Redox
       property :CoverageType, required: false, from: :coverage_type
       property :Insured, required: false, from: :insured, default: {}
 
-      alias_method :plan, :Plan
-      alias_method :member_number, :MemberNumber
-      alias_method :company, :Company
-      alias_method :group_number, :GroupNumber
-      alias_method :group_name, :GroupName
-      alias_method :effective_date, :EffectiveDate
-      alias_method :expiration_date, :ExpirationDate
-      alias_method :policy_number, :PolicyNumber
-      alias_method :agreement_type, :AgreementType
-      alias_method :coverage_type, :CoverageType
-      alias_method :insured, :Insured
+      alias plan Plan
+      alias member_number MemberNumber
+      alias company Company
+      alias group_number GroupNumber
+      alias group_name GroupName
+      alias effective_date EffectiveDate
+      alias expiration_date ExpirationDate
+      alias policy_number PolicyNumber
+      alias agreement_type AgreementType
+      alias coverage_type CoverageType
+      alias insured Insured
     end
   end
 end

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class PCP < OrderingProvider
       property :NPI, from: :npi
 
-      alias_method :npi, :NPI
+      alias npi NPI
     end
   end
 end

data/lib/redox/models/patient.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Patient < Model
@@ -7,9 +9,7 @@ module Redox
       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
+      alias identifiers Identifiers
 
       def demographics
         self[:Demographics] = Demographics.new(self[:Demographics]) unless self[:Demographics].is_a?(Redox::Models::Demographics)
@@ -17,7 +17,9 @@ module Redox
       end
 
       def insurances
-        self[:Insurances] = self[:Insurances].map {|ins| ins.is_a?(Redox::Models::Insurance) ? ins : Insurance.new(ins) }
+        self[:Insurances] = self[:Insurances].map do |ins|
+          ins.is_a?(Redox::Models::Insurance) ? ins : Insurance.new(ins)
+        end
       end
 
       def primary_care_provider
@@ -25,19 +27,21 @@ module Redox
       end
 
       def contacts
-        self[:Contacts] = self[:Contacts].map {|contact| contact.is_a?(Redox::Models::Contact) ? contact : Contact.new(contact)}
+        self[:Contacts] = self[:Contacts].map do |contact|
+          contact.is_a?(Redox::Models::Contact) ? contact : Contact.new(contact)
+        end
       end
 
-      def add_identifier(type: , value: )
-        self[:Identifiers] << Identifier.new({'ID' => value, 'IDType' => type})
+      def add_identifier(type:, value:)
+        self[:Identifiers] << Identifier.new({ 'ID' => value, 'IDType' => type })
 
-        return self
+        self
       end
 
       def add_insurance(data = {})
         self[:Insurances] << Insurance.new(data)
 
-        return self
+        self
       end
 
       def update(meta: Meta.new)
@@ -50,7 +54,7 @@ module Redox
 
       class << self
         def query(params, meta: Meta.new)
-          return Redox::Request::PatientSearch.query(params, meta: meta)
+          Redox::Request::PatientSearch.query(params, meta: meta)
         end
       end
     end

data/lib/redox/models/potential_matches.rb

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

data/lib/redox/models/provider.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Provider < Model
       property :Identifiers, from: :identifiers, required: false, default: []
       property :Demographics, from: :demographics, required: false
 
-      alias_method :identifiers, :Identifiers
+      alias 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})
+      def add_identifier(type:, value:)
+        self[:Identifiers] << Identifier.new({ 'ID' => value, 'IDType' => type })
 
-        return self
+        self
       end
     end
   end

data/lib/redox/models/scheduling.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Scheduling < AbstractModel
@@ -5,9 +7,9 @@ module Redox
       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
+      alias patient Patient
+      alias visit Visit
+      alias appointment_info AppointmentInfo
 
       def add_appointment_info(code: nil, codeset: nil, description: nil, value: nil)
         self[:AppointmentInfo] << {

data/lib/redox/models/transaction.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Models
     class Transaction < AbstractModel
@@ -15,19 +17,19 @@ module Redox
       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
+      alias chargeable Chargeable
+      alias start DateTimeOfService
+      alias department Department
+      alias diagnoses Diagnoses
+      alias end EndDateTime
+      alias extensions Extensions
+      alias id ID
+      alias ndc NDC
+      alias order_id OrderID
+      alias ordering_providers OrderingProviders
+      alias performers Performers
+      alias procedure Procedure
+      alias type Type
 
       def add_medication(ndc_code: nil, quantity: nil, magnitude: nil, unit: nil, description: nil)
         self[:NDC] = { Code: ndc_code, Description: description }
@@ -67,8 +69,8 @@ module Redox
         result
       end
 
-      def as_json(args)
-        self.to_h
+      def as_json(_args)
+        to_h
       end
     end
   end

data/lib/redox/models/visit.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
+# rubocop:disable Naming/MethodParameterName
 module Redox
   module Models
     class Visit < Model
       DEFAULT_LOCATION = {
         Department: nil,
         Facility: nil
-      }
+      }.freeze
       DEFAULT_REFERRING_PROVIDER = {
         ID: nil,
         IDType: nil,
         FirstName: nil,
         LastName: nil
-      }
+      }.freeze
       DEFAULT_ATTENDING_PROVIDER = {
         ID: nil,
         IDType: nil,
         FirstName: nil,
         LastName: nil
-      }
+      }.freeze
 
       property :Insurances, from: :insurances, required: false, default: []
       property :Location, from: :location, required: false, default: DEFAULT_LOCATION
@@ -33,22 +36,19 @@ module Redox
       property :ReferringProvider, from: :referring_provider, required: false, default: DEFAULT_REFERRING_PROVIDER
       property :AttendingProvider, from: :attending_provider, required: false, default: DEFAULT_ATTENDING_PROVIDER
 
-      alias_method :insurances, :Insurances
-      alias_method :start, :VisitDateTime
-      alias_method :end, :DischargeDateTime
-      alias_method :referring_provider, :ReferringProvider
-      alias_method :attending_provider, :AttendingProvider
+      alias start VisitDateTime
+      alias end DischargeDateTime
+      alias referring_provider ReferringProvider
+      alias attending_provider AttendingProvider
 
       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 attending_provider_id=(v)
@@ -98,7 +98,9 @@ module Redox
       end
 
       def insurances
-        self[:Insurances] = self[:Insurances].map {|ins| ins.is_a?(Redox::Models::Insurance) ? ins : Insurance.new(ins) }
+        self[:Insurances] = self[:Insurances].map do |ins|
+          ins.is_a?(Redox::Models::Insurance) ? ins : Insurance.new(ins)
+        end
       end
 
       def to_h
@@ -111,13 +113,14 @@ module Redox
         result
       end
 
-      def to_json(args = {})
-        self.to_h.to_json
+      def to_json(_args = {})
+        to_h.to_json
       end
 
-      def as_json(args = {})
-        self.to_h.dig('Visit')
+      def as_json(_args = {})
+        to_h['Visit']
       end
     end
   end
 end
+# rubocop:enable Naming/MethodParameterName

data/lib/redox/redox_exception.rb

@@ -1,23 +1,27 @@
+# frozen_string_literal: true
+
 module Redox
-  class RedoxException < Exception
+  class RedoxException < StandardError
     def self.from_response(response, msg: nil)
-      exception_msg = "Failed #{msg}:"
-      exception_msg << " HTTP code: #{response&.code} MSG: "
+      error_msg = nil
 
       begin
-        error_response = response.parsed_response
-        error_list = error_response&.[]('Meta')&.[]('Errors')
-
-        if error_list
-          exception_msg << error_list.map {|el| el['Text'] || el.to_s }.join('|')
-        else
-          exception_msg << error_response.to_s
-        end
+        error_msg = parse_error_msg(response.parsed_response)
       rescue JSON::ParserError
-        exception_msg << response.body
+        error_msg = response.body
       end
 
-      return RedoxException.new(exception_msg)
+      RedoxException.new("Failed #{msg}: HTTP code: #{response&.code} MSG: #{error_msg}")
+    end
+
+    def self.parse_error_msg(error_response)
+      error_list = error_response&.[]('Meta')&.[]('Errors')
+
+      if error_list
+        error_list.map { |el| el['Text'] || el.to_s }.join('|')
+      else
+        error_response.to_s
+      end
     end
   end
 end

data/lib/redox/request/financial.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Request
     class Financial
@@ -5,7 +7,9 @@ module Redox
 
       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))))
+        Redox::Models::Model.from_response(RedoxClient.connection.request(body: Redox::Request.build_body(
+          financial, meta
+        )))
       end
     end
   end

data/lib/redox/request/media.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Request
     class Media
@@ -5,7 +7,9 @@ module Redox
 
       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))))
+        Redox::Models::Model.from_response(RedoxClient.connection.request(body: Redox::Request.build_body(
+          model, meta
+        )))
       end
     end
   end

data/lib/redox/request/medications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Request
     class Medications
@@ -5,7 +7,9 @@ module Redox
 
       def self.administration(model, meta: Redox::Models::Meta.new)
         meta = ADMINISTRATION_META.merge(meta)
-        return Redox::Models::Model.from_response((RedoxClient.connection.request(body: Redox::Request.build_body(model, meta))))
+        Redox::Models::Model.from_response(RedoxClient.connection.request(body: Redox::Request.build_body(
+          model, meta
+        )))
       end
     end
   end

data/lib/redox/request/notes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Request
     class Notes
@@ -5,7 +7,9 @@ module Redox
 
       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))))
+        Redox::Models::Model.from_response(RedoxClient.connection.request(body: Redox::Request.build_body(
+          model, meta
+        )))
       end
     end
   end

data/lib/redox/request/patient_admin.rb

@@ -1,17 +1,23 @@
+# frozen_string_literal: true
+
 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)
+      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))))
+        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)
+      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))))
+        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

@@ -1,12 +1,17 @@
+# frozen_string_literal: true
+
 module Redox
   module Request
     class PatientSearch
-      QUERY_ENDPOINT = '/query'.freeze
+      QUERY_ENDPOINT = '/query'
       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))))
+        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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Redox
   module Request
     class Provider
@@ -5,7 +7,9 @@ module Redox
 
       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))))
+        Redox::Models::Model.from_response_inflected(RedoxClient.connection.request(body: Redox::Request.build_body(
+          provider, meta
+        )))
       end
     end
   end

data/lib/redox/request/request.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 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)
+      meta.to_h.merge(params.to_h)
     end
   end
 end