activerecord_sqlserver_crm 4.2.18 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44d87145cb383882cf73fd882d51f40bd4144c93
-  data.tar.gz: 2b65e1070504982b80264724bd631492fd423c46
+  metadata.gz: 5632b8f45c98560b213a941945be26caf7933396
+  data.tar.gz: 2b79f447a42186b1143f98d8e0f3e30fcba6911e
 SHA512:
-  metadata.gz: d0de2d50e18d03e4c583707c242bc160dd66b9d4e14df0ce49be6abde95721aa6685081ba5071c8a24e25bd73bec9f383b8c9e3f1c6050816321d42bc731b40e
-  data.tar.gz: d319a4a5d631a5564b345352ddd9bb9a5ba79287cccbe3db90512319e55e87cc1cf2666ff2c14ae2516d370907627c340ff0b8e4bea7c8079e7ef798cfe8bc1e
+  metadata.gz: 81567aa661188bacd4765591de49261aa900c6a94c1879fe99e18cb18798365c408ca20df536c13262cf941a1b1363b508e1b1f005e9b5186d9cb567529fb23f
+  data.tar.gz: fa2db689e0709d531eee6ce092e71a89dd7cdade0ec3e815ac2106579864128f08ffaa78a119c2ed09c648bcb404c4bfafad5be105918914c0a947ab6dc70e59

data/lib/active_record_extension.rb

@@ -41,7 +41,7 @@ module ActiveRecordExtension
     if has_errors
       raise_record_invalid
     else
-      reload
+      reload unless id.nil?
     end
     !has_errors
   end
@@ -101,6 +101,28 @@ module ActiveRecordExtension
       @many_to_many_associated_tables = value
     end
 
+    # Binding name is found in the metadata xml file. It will look something like (system users - opportunities):
+    # <EntitySet Name="systemusers" EntityType="Microsoft.Dynamics.CRM.systemuser">
+    #   <NavigationPropertyBinding Path="new_systemuser_opportunity" Target="opportunities"/>
+    # Its different for both entities, so this is a hash of tablename to binding name
+    def many_to_many_binding_name
+      @many_to_many_binding_name
+    end
+
+    def many_to_many_binding_name=(value)
+      @many_to_many_binding_name = value
+    end
+
+    # For some associations the new api does not work, notably the systemuser. But the old api does work.
+    # Hopefully in future releases Microsoft will fix the new apis.
+    def many_to_many_use_old_api
+      @many_to_many_use_old_api ||= false
+    end
+
+    def many_to_many_use_old_api=(value)
+      @many_to_many_use_old_api = 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.18"
+  VERSION = "4.3.0"
 end

data/lib/odata/create_operation.rb

@@ -8,8 +8,10 @@ module OData
         @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
+        # Associating record for many to many does not return any body, just a positive response code
+        # So look up id and save to attribute
+        id = saved_many_to_many_id
+        @ar.send("#{@ar.class.primary_key}=".to_sym, id)
       else
         @ar.errors[:base] << "Could not #{operation_callback_name} entity. [http code #{response.code}]" if @ar.id.nil?
       end
@@ -24,7 +26,11 @@ module OData
         if @ar.class.belongs_to_field?(field)
           belongs_to_field = @ar.class.belongs_to_field(field)
           if many_to_many_table?
-            body["@odata.id"] = "#{base_url}#{many_to_many_entity_name(1)}(#{many_to_many_entity_id(1)})"
+            if many_to_many_use_old_api?
+              body["uri"] = "#{old_base_url}#{many_to_many_associated_table_name(1)}Set(guid%27#{many_to_many_entity_id(1)}%27)"
+            else
+              body["@odata.id"] = "#{base_url}#{many_to_many_entity_name(1)}(#{many_to_many_entity_id(1)})"
+            end
           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]})"
@@ -42,9 +48,13 @@ module OData
     end
 
     def operation_url
+      # For many to many we associate
       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"
+        if many_to_many_use_old_api?
+          "#{old_base_url}#{many_to_many_associated_table_name(0)}Set(guid%27#{many_to_many_entity_id(0)}%27)/%24links/#{many_to_many_binding_name}"
+        else
+          "#{base_url}#{many_to_many_entity_name(0)}(#{many_to_many_entity_id(0)})/#{many_to_many_binding_name}/%24ref"
+        end
       else
         "#{base_url}#{entity_name}"
       end

data/lib/odata/delete_operation.rb

@@ -19,7 +19,19 @@ module OData
     end
 
     def operation_url
-      "#{base_url}#{entity_name}(#{@ar.id})"
+      # For many to many we disassociate
+      if many_to_many_table?
+        "#{old_base_url}#{many_to_many_associated_table_name(0)}Set(guid%27#{many_to_many_entity_id(0)}%27)/%24links/#{many_to_many_binding_name}(guid%27#{many_to_many_entity_id(1)}%27)"
+
+        # Some reason I cant get the new api to delete, so just using old for now.
+        # if many_to_many_use_old_api?
+        #   "#{old_base_url}#{many_to_many_associated_table_name(0)}Set(guid%27#{many_to_many_entity_id(0)}%27)/%24links/#{many_to_many_binding_name}(guid%27#{many_to_many_entity_id(1)}%27)"
+        # else
+        #   "#{base_url}#{many_to_many_entity_name(0)}(#{many_to_many_entity_id(0)})/#{many_to_many_binding_name}/%24ref%3F%24id=#{base_url}#{many_to_many_entity_name(1)}(#{many_to_many_entity_id(1)})"
+        # end
+      else
+        "#{base_url}#{entity_name}(#{@ar.id})"
+      end
     end
   end
 end

data/lib/odata/operation.rb

@@ -13,6 +13,10 @@ module OData
       OdataConfig.odata_config[Rails.env]['data_url']
     end
 
+    def old_base_url
+      OdataConfig.odata_config[Rails.env]['old_data_url']
+    end
+
     def check_response_errors(response)
       # Check for Http error
       if response.code.to_i >= 400
@@ -37,8 +41,16 @@ module OData
       @ar.class.many_to_many_associated_tables.present?
     end
 
+    def many_to_many_use_old_api?
+      @ar.class.many_to_many_use_old_api
+    end
+
+    def many_to_many_binding_name
+      @ar.class.many_to_many_binding_name || many_to_many_table_name
+    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
+      @ar.class.many_to_many_associated_tables[index].odata_table_reference || table_pluralize(many_to_many_associated_table_name(index)).downcase
     end
 
     def many_to_many_class_name(index)
@@ -54,7 +66,11 @@ module OData
     end
 
     def many_to_many_table_name
-      @ar.class.odata_table_reference || @ar.class.table_name.downcase
+      @ar.class.odata_table_reference || @ar.class.table_name
+    end
+
+    def many_to_many_associated_table_name(index)
+      @ar.class.many_to_many_associated_tables[index].table_name
     end
 
     def operation_body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_sqlserver_crm
 version: !ruby/object:Gem::Version
-  version: 4.2.18
+  version: 4.3.0
 platform: ruby
 authors:
 - Rolf Lawrenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails