primary_connect_client 1.4.0 → 1.5.1

data/lib/primary_connect_client/models/order_order.rb

@@ -49,6 +49,9 @@ module PrimaryConnectClient
 
     attr_accessor :procedure
 
+    # Array of Procedures ordered
+    attr_accessor :procedures
+
     attr_accessor :ordering_provider
 
     # Array of providers to be copied on the results
@@ -119,6 +122,7 @@ module PrimaryConnectClient
         :'specimen' => :'specimen',
         :'medication_administrations' => :'medicationAdministrations',
         :'procedure' => :'procedure',
+        :'procedures' => :'procedures',
         :'ordering_provider' => :'orderingProvider',
         :'result_copy_providers' => :'resultCopyProviders',
         :'ordering_facility' => :'orderingFacility',
@@ -154,6 +158,7 @@ module PrimaryConnectClient
         :'specimen' => :'Specimen',
         :'medication_administrations' => :'Array<MedicationAdministration>',
         :'procedure' => :'CodedValue',
+        :'procedures' => :'Array<CodedValue>',
         :'ordering_provider' => :'Provider',
         :'result_copy_providers' => :'Array<Provider>',
         :'ordering_facility' => :'OrderOrderOrderingFacility',
@@ -240,6 +245,12 @@ module PrimaryConnectClient
         self.procedure = attributes[:'procedure']
       end
 
+      if attributes.key?(:'procedures')
+        if (value = attributes[:'procedures']).is_a?(Array)
+          self.procedures = value
+        end
+      end
+
       if attributes.key?(:'ordering_provider')
         self.ordering_provider = attributes[:'ordering_provider']
       end
@@ -379,6 +390,7 @@ module PrimaryConnectClient
           specimen == o.specimen &&
           medication_administrations == o.medication_administrations &&
           procedure == o.procedure &&
+          procedures == o.procedures &&
           ordering_provider == o.ordering_provider &&
           result_copy_providers == o.result_copy_providers &&
           ordering_facility == o.ordering_facility &&
@@ -402,7 +414,7 @@ module PrimaryConnectClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, application_order_id, status, transaction_date_time, collection_date_time, collection_start_date_time, completion_date_time, accession_date_time, expiration_date, specimen, medication_administrations, procedure, ordering_provider, result_copy_providers, ordering_facility, priority, diagnoses, clinical_comments, notes, clinical_info, results_status, response_flag, external_ids, results].hash
+      [id, application_order_id, status, transaction_date_time, collection_date_time, collection_start_date_time, completion_date_time, accession_date_time, expiration_date, specimen, medication_administrations, procedure, procedures, ordering_provider, result_copy_providers, ordering_facility, priority, diagnoses, clinical_comments, notes, clinical_info, results_status, response_flag, external_ids, results].hash
     end
 
     # Builds the object from hash

data/lib/primary_connect_client/models/subject.rb

@@ -14,92 +14,214 @@ require 'date'
 require 'time'
 
 module PrimaryConnectClient
-  module Subject
-    class << self
-      # List of class defined in oneOf (OpenAPI v3)
-      def openapi_one_of
-        [
-          :'SubjectOneOf',
-          :'SubjectOneOf1'
-        ]
+  class Subject
+    attr_accessor :patient
+
+    attr_accessor :device
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'patient' => :'patient',
+        :'device' => :'device'
+      }
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :'patient' => :'Patient',
+        :'device' => :'Device'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PrimaryConnectClient::Subject` initialize method"
       end
 
-      # Builds the object
-      # @param [Mixed] Data to be matched against the list of oneOf items
-      # @return [Object] Returns the model or the data itself
-      def build(data)
-        # Go through the list of oneOf items and attempt to identify the appropriate one.
-        # Note:
-        # - We do not attempt to check whether exactly one item matches.
-        # - No advanced validation of types in some cases (e.g. "x: { type: string }" will happily match { x: 123 })
-        #   due to the way the deserialization is made in the base_object template (it just casts without verifying).
-        # - TODO: scalar values are de facto behaving as if they were nullable.
-        # - TODO: logging when debugging is set.
-        openapi_one_of.each do |klass|
-          begin
-            next if klass == :AnyType # "nullable: true"
-            typed_data = find_and_cast_into_type(klass, data)
-            return typed_data if typed_data
-          rescue # rescue all errors so we keep iterating even if the current item lookup raises
-          end
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PrimaryConnectClient::Subject`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
+        h[k.to_sym] = v
+      }
 
-        openapi_one_of.include?(:AnyType) ? data : nil
+      if attributes.key?(:'patient')
+        self.patient = attributes[:'patient']
       end
 
-      private
-
-      SchemaMismatchError = Class.new(StandardError)
-
-      # Note: 'File' is missing here because in the regular case we get the data _after_ a call to JSON.parse.
-      def find_and_cast_into_type(klass, data)
-        return if data.nil?
-
-        case klass.to_s
-        when 'Boolean'
-          return data if data.instance_of?(TrueClass) || data.instance_of?(FalseClass)
-        when 'Float'
-          return data if data.instance_of?(Float)
-        when 'Integer'
-          return data if data.instance_of?(Integer)
-        when 'Time'
-          return Time.parse(data)
-        when 'Date'
-          return Date.parse(data)
-        when 'String'
-          return data if data.instance_of?(String)
-        when 'Object' # "type: object"
-          return data if data.instance_of?(Hash)
-        when /\AArray<(?<sub_type>.+)>\z/ # "type: array"
-          if data.instance_of?(Array)
-            sub_type = Regexp.last_match[:sub_type]
-            return data.map { |item| find_and_cast_into_type(sub_type, item) }
-          end
-        when /\AHash<String, (?<sub_type>.+)>\z/ # "type: object" with "additionalProperties: { ... }"
-          if data.instance_of?(Hash) && data.keys.all? { |k| k.instance_of?(Symbol) || k.instance_of?(String) }
-            sub_type = Regexp.last_match[:sub_type]
-            return data.each_with_object({}) { |(k, v), hsh| hsh[k] = find_and_cast_into_type(sub_type, v) }
+      if attributes.key?(:'device')
+        self.device = attributes[:'device']
+      end
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          patient == o.patient &&
+          device == o.device
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [patient, device].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.openapi_types.each_pair do |key, type|
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
-        else # model
-          const = PrimaryConnectClient.const_get(klass)
-          if const
-            if const.respond_to?(:openapi_one_of) # nested oneOf model
-              model = const.build(data)
-              return model if model
-            else
-              # raise if data contains keys that are not known to the model
-              raise unless (data.keys - const.acceptable_attributes).empty?
-              model = const.build_from_hash(data)
-              return model if model && model.valid?
-            end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :Time
+        Time.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
           end
         end
+      else # model
+        # models (e.g. Pet) or oneOf
+        klass = PrimaryConnectClient.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+      end
+    end
 
-        raise # if no match by now, raise
-      rescue
-        raise SchemaMismatchError, "#{data} doesn't match the #{klass} type"
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
       end
+      hash
     end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
   end
 
 end

data/lib/primary_connect_client/version.rb

@@ -11,5 +11,5 @@ OpenAPI Generator version: 5.3.0
 =end
 
 module PrimaryConnectClient
-  VERSION = '1.4.0'
+  VERSION = '1.5.1'
 end

data/lib/primary_connect_client.rb

@@ -28,7 +28,9 @@ require 'primary_connect_client/models/error'
 require 'primary_connect_client/models/event'
 require 'primary_connect_client/models/events'
 require 'primary_connect_client/models/identifier'
+require 'primary_connect_client/models/ids'
 require 'primary_connect_client/models/location'
+require 'primary_connect_client/models/measurement'
 require 'primary_connect_client/models/medication'
 require 'primary_connect_client/models/medication_administration'
 require 'primary_connect_client/models/meta'
@@ -57,8 +59,6 @@ require 'primary_connect_client/models/result_report'
 require 'primary_connect_client/models/results'
 require 'primary_connect_client/models/specimen'
 require 'primary_connect_client/models/subject'
-require 'primary_connect_client/models/subject_one_of'
-require 'primary_connect_client/models/subject_one_of1'
 require 'primary_connect_client/models/v2_device'
 require 'primary_connect_client/models/v2_dosage'
 require 'primary_connect_client/models/v2_medication'

data/primary_connect_client.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.4"
 
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
+  s.add_runtime_dependency 'primary_connect_proto', '~> 0.17.0', '>= 0.17.0'
 
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
 

data/spec/api/default_api_spec.rb

@@ -67,6 +67,16 @@ describe 'DefaultApi' do
     end
   end
 
+  # unit tests for create_measurement
+  # create Measurement
+  # @param [Hash] opts the optional parameters
+  # @return [Ids]
+  describe 'create_measurement test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
   # unit tests for create_order
   # create order
   # @param [Hash] opts the optional parameters
@@ -101,6 +111,17 @@ describe 'DefaultApi' do
     end
   end
 
+  # unit tests for get_measurement
+  # show measurement
+  # @param id Measurement ID
+  # @param [Hash] opts the optional parameters
+  # @return [Measurement]
+  describe 'get_measurement test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
   # unit tests for get_order
   # show order
   # @param id Order ID

data/spec/models/ids_spec.rb

@@ -0,0 +1,34 @@
+=begin
+#Primary Connect API V1
+
+#Client Library to interface with Primary Connect
+
+The version of the OpenAPI document: v1
+
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.3.0
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for PrimaryConnectClient::Ids
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe PrimaryConnectClient::Ids do
+  let(:instance) { PrimaryConnectClient::Ids.new }
+
+  describe 'test an instance of Ids' do
+    it 'should create an instance of Ids' do
+      expect(instance).to be_instance_of(PrimaryConnectClient::Ids)
+    end
+  end
+  describe 'test attribute "ids"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+end

data/spec/models/measurement_spec.rb

@@ -0,0 +1,46 @@
+=begin
+#Primary Connect API V1
+
+#Client Library to interface with Primary Connect
+
+The version of the OpenAPI document: v1
+
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.3.0
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for PrimaryConnectClient::Measurement
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe PrimaryConnectClient::Measurement do
+  let(:instance) { PrimaryConnectClient::Measurement.new }
+
+  describe 'test an instance of Measurement' do
+    it 'should create an instance of Measurement' do
+      expect(instance).to be_instance_of(PrimaryConnectClient::Measurement)
+    end
+  end
+  describe 'test attribute "meta"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  describe 'test attribute "subject"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  describe 'test attribute "metrics"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+end

data/spec/models/order_order_spec.rb

@@ -101,6 +101,12 @@ describe PrimaryConnectClient::OrderOrder do
     end
   end
 
+  describe 'test attribute "procedures"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
   describe 'test attribute "ordering_provider"' do
     it 'should work' do
       # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers

data/spec/models/subject_spec.rb

@@ -18,14 +18,23 @@ require 'date'
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
 describe PrimaryConnectClient::Subject do
-  describe '.openapi_one_of' do
-    it 'lists the items referenced in the oneOf array' do
-      expect(described_class.openapi_one_of).to_not be_empty
+  let(:instance) { PrimaryConnectClient::Subject.new }
+
+  describe 'test an instance of Subject' do
+    it 'should create an instance of Subject' do
+      expect(instance).to be_instance_of(PrimaryConnectClient::Subject)
+    end
+  end
+  describe 'test attribute "patient"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
     end
   end
 
-  describe '.build' do
-    it 'returns the correct model' do
+  describe 'test attribute "device"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
     end
   end
+
 end