activerecord_sqlserver_crm 4.2.5 → 4.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04c61257ab2299b47f3e71dfc4e0967dc0dd82c3
-  data.tar.gz: 4335bc027dbba84fae3db4769696bd5217428bf6
+  metadata.gz: f60deb0c4b8b3d968d6a9beffce6a21186a91c3c
+  data.tar.gz: bbd7a7947fb944d16878bc52b8a6cd1f87c78d24
 SHA512:
-  metadata.gz: 92c6fa1ea3379529feab1dbc5fb9bbcf112a53f96b8339eab27a15312749302e8f080d967b876f0d32e78ec357d66e5978b5b8c8cd574b93c6adcd0fa77441c5
-  data.tar.gz: 09e4ee73ea5d37e3e0dcd6f05ce11e1b1049573440cab4c3d198b366a91951f5bc0b45b7e87766c2f6e124d78c8177d350e8b238669558ce737e618907dbfe2e
+  metadata.gz: 8c744ec6364c6093220bd1e9d07e41ff41428c2507f19dceada6bd003421c10b62ab9ca95d0787d61c601ac5f9c8b87050f09938bee6b7b223704b6a4a5642fb
+  data.tar.gz: d9365320580a729353d27c5d97a91b5e62ea1afacce39f234ac2d9c8fa51b198d8ee9feb4fc9c0a05bcafee9e2f693afbda3a5e9ec7af8e67eb6311ea9cd7a11

data/lib/active_record_extension.rb

@@ -69,6 +69,11 @@ module ActiveRecordExtension
       @belongs_to_fields.select{|f| f.foreign_key == field}.first
     end
 
+    def belongs_to_field_by_name(name)
+      @belongs_to_fields ||= belongs_to_fields
+      @belongs_to_fields.select{|f| f.name.to_s == name}.first
+    end
+
     def belongs_to_fields
       associations = reflect_on_all_associations
       associations.select { |a| a.macro == :belongs_to }
@@ -83,6 +88,17 @@ module ActiveRecordExtension
       @odata_table_reference = value
     end
 
+    # OData does not allow creating an entry for a table that is used in a many to many joining table. You must
+    # associate tables together. If a table uses this field, it indicates its a joining many to many table.
+    # An array of the 2 associated tables, eg [Table1, Table2]
+    def many_to_many_associated_tables
+      @many_to_many_associated_tables
+    end
+
+    def many_to_many_associated_tables=(value)
+      @many_to_many_associated_tables = value
+    end
+
     # In some cases the odata field name is different than the database field name. This method is used for this mapping
     def odata_field(field, options)
       @odata_property_key ||= {}

data/lib/activerecord_sqlserver_crm/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordSqlserverCrm
-  VERSION = "4.2.5"
+  VERSION = "4.2.6"
 end

data/lib/odata/create_operation.rb

@@ -7,6 +7,9 @@ module OData
         id = response.headers['OData-EntityId'].scan(/\(([\w-]*)\)/)
         @ar.id = id[0][0] unless id.nil? || id[0].nil?
         @ar.errors[:base] << "Failed to #{operation_callback_name} entity. [http code #{response.code}]" if @ar.id.nil?
+      elsif response.code >= 200 && response.code < 300
+        # Associating record does not return any body, just a positive response code
+        @ar.id = saved_many_to_many_id
       else
         @ar.errors[:base] << "Could not #{operation_callback_name} entity. [http code #{response.code}]" if @ar.id.nil?
       end
@@ -20,8 +23,12 @@ module OData
         # If a belongs to field, add association the way OData wants it
         if @ar.class.belongs_to_field?(field)
           belongs_to_field = @ar.class.belongs_to_field(field)
-          odata_table_ref = @ar.class.odata_table_reference || table_pluralize(belongs_to_field.table_name).downcase
-          body["#{belongs_to_field.options[:crm_key]}@odata.bind"] = "/#{odata_table_ref}(#{values[1]})"
+          if many_to_many_table?
+            body["@odata.id"] = "#{base_url}#{many_to_many_entity_name(1)}(#{many_to_many_entity_id(1)})"
+          else
+            odata_table_ref = @ar.class.odata_table_reference || table_pluralize(belongs_to_field.table_name).downcase
+            body["#{belongs_to_field.options[:crm_key]}@odata.bind"] = "/#{odata_table_ref}(#{values[1]})"
+          end
         else
           key = @ar.class.odata_field_value(field.to_sym) || field.downcase
           body[key] = values[1]
@@ -35,7 +42,12 @@ module OData
     end
 
     def operation_url
-      "#{base_url}#{entity_name}"
+      if many_to_many_table?
+        # In the form "/table1s(00000000-0000-0000-0000-000000000002)/table2s/$ref"
+        "#{base_url}#{many_to_many_entity_name(0)}(#{many_to_many_entity_id(0)})/#{many_to_many_table_name}/$ref"
+      else
+        "#{base_url}#{entity_name}"
+      end
     end
 
     def operation_callback_name

data/lib/odata/operation.rb

@@ -26,13 +26,37 @@ module OData
     end
 
     def entity_name
-      table_pluralize(@ar.class.table_name).downcase
+      @ar.class.odata_table_reference || table_pluralize(@ar.class.table_name).downcase
     end
 
     def handle_operation_response(response)
       raise NotImplementedError
     end
 
+    def many_to_many_table?
+      @ar.class.many_to_many_associated_tables.present?
+    end
+
+    def many_to_many_entity_name(index)
+      @ar.class.many_to_many_associated_tables[index].odata_table_reference || table_pluralize(@ar.class.many_to_many_associated_tables[index].table_name).downcase
+    end
+
+    def many_to_many_class_name(index)
+      @ar.class.many_to_many_associated_tables[index].name.demodulize.underscore
+    end
+
+    def many_to_many_entity_id(index)
+      @ar.send(many_to_many_class_name(index)).id
+    end
+
+    def many_to_many_foreign_key(index)
+      @ar.class.belongs_to_field_by_name(many_to_many_class_name(index)).foreign_key
+    end
+
+    def many_to_many_table_name
+      @ar.class.odata_table_reference || @ar.class.table_name.downcase
+    end
+
     def operation_body
       nil
     end
@@ -44,7 +68,9 @@ module OData
     def operation_headers
       {
           'Accept' => 'application/json',
-          'Content-Type' => 'application/json; charset=utf-8'
+          'Content-Type' => 'application/json; charset=utf-8',
+          'OData-MaxVersion' => '4.0',
+          'OData-Version' => '4.0'
       }
     end
 
@@ -73,9 +99,13 @@ module OData
       handle_operation_response(response)
     end
 
+    def saved_many_to_many_id
+      @ar.class.where("#{many_to_many_foreign_key(0)} = '#{many_to_many_entity_id(0)}' AND #{many_to_many_foreign_key(1)} = '#{many_to_many_entity_id(1)}'").first.id
+    end
+
     def send_odata
       @ar.run_callbacks operation_callback_name do
-        if Rails.env.development?
+        if Rails.env.development? || Rails.env.test?
           Rails.logger.debug "SEND_ODATA URL: #{operation_url}"
           Rails.logger.debug "SEND_ODATA METHOD: #{operation_method}"
           Rails.logger.debug "SEND_ODATA BODY: #{operation_body}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_sqlserver_crm
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.2.6
 platform: ruby
 authors:
 - Rolf Lawrenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails