activerecord_sqlserver_crm 4.2.16 → 4.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eab31a448120bf7fc5683cc65291b53f63f8e06a
-  data.tar.gz: fe70d8ad786ff21e68f91d0f2aaa10d22f2d7ee7
+  metadata.gz: 93c0eff44335f7842dde181e98c5e9426de30a49
+  data.tar.gz: d19ca3cb0226bf278dc369015b8b9852bea58ae6
 SHA512:
-  metadata.gz: 8edcd95e314c5e1fd3b1de4399d7f640def39075a4b676cb0362a4e7e327d6337e9f883c030f933f9e7763d6068e34eb68d8916175ab592d7c56f38a504650fe
-  data.tar.gz: 4d5c9f2d1c0611517a084121f2f68473f004d469c9238d4acded057797abed9bc22b201f925a4bd4de3b0e0e0a92413b5be8600e213e51d45a4b45752da85c96
+  metadata.gz: ec1a7212f1b7b5de08c16e9e5556fc5a879d76e48141608452d19e66f2db571321a53fe4891a15d590894bc6ee73c8bdaf31a1d03826ece51d424d20ac55ee87
+  data.tar.gz: 6db9fcdd432ddac99002d602f9a4a6faadec9d7af6a5f338feb736f9642222226acaa779d7510c1e2302371000665e88f4837f414419463d6d51c7f4ab0751d3

data/app/models/crm/account.rb

@@ -3,7 +3,7 @@ module Crm
     self.table_name = "Account"
     self.primary_key = "AccountId"
 
-    has_many :notes, foreign_key: 'ObjectId'
+    has_many :notes, foreign_key: 'ObjectId', class_name: "Crm::AccountNote"
     has_many :cases, foreign_key: 'AccountId'
 
     validates :Name, presence: true

data/app/models/crm/account_note.rb

@@ -0,0 +1,5 @@
+module Crm
+  class AccountNote < Note
+    belongs_to :account, foreign_key: 'ObjectId', crm_key: 'objectid_account'
+  end
+end

data/app/models/crm/campaign.rb

@@ -5,7 +5,7 @@ module Crm
 
     belongs_to :currency, foreign_key: 'TransactionCurrencyId', crm_key: 'transactioncurrencyid'
 
-    has_many :notes, foreign_key: 'ObjectId'
+    has_many :notes, foreign_key: 'ObjectId', class_name: "Crm::CampaignNote"
     has_many :campaign_responses, foreign_key: 'RegardingObjectId'
 
     validates :Name, presence: true

data/app/models/crm/campaign_note.rb

@@ -0,0 +1,5 @@
+module Crm
+  class CampaignNote < Note
+    belongs_to :campaign, foreign_key: 'ObjectId', crm_key: 'objectid_campaign'
+  end
+end

data/app/models/crm/campaign_response.rb

@@ -5,7 +5,7 @@ module Crm
 
     belongs_to :campaign, foreign_key: 'RegardingObjectId', crm_key: 'regardingobjectid_campaign_campaignresponse'
 
-    has_many :notes, foreign_key: 'ObjectId'
+    has_many :notes, foreign_key: 'ObjectId', class_name: "Crm::CampaignResponseNote"
 
     validates :Subject, presence: true
     validates :campaign, presence: true

data/app/models/crm/campaign_response_note.rb

@@ -0,0 +1,5 @@
+module Crm
+  class CampaignResponseNote < Note
+    belongs_to :campaign_response, foreign_key: 'ObjectId', crm_key: 'objectid_campaignresponse'
+  end
+end

data/app/models/crm/case.rb

@@ -6,7 +6,7 @@ module Crm
     belongs_to :contact, foreign_key: 'ContactId', crm_key: 'customerid_contact'
     belongs_to :account, foreign_key: 'AccountId', crm_key: 'customerid_account'
 
-    has_many :notes, foreign_key: 'ObjectId'
+    has_many :notes, foreign_key: 'ObjectId', class_name: "Crm::CaseNote"
 
     validates :Title, presence: true
     validate :contact_xor_account

data/app/models/crm/case_note.rb

@@ -0,0 +1,5 @@
+module Crm
+  class CaseNote < Note
+    belongs_to :case, foreign_key: 'ObjectId', crm_key: 'objectid_case'
+  end
+end

data/app/models/crm/contact.rb

@@ -5,7 +5,7 @@ module Crm
 
     has_many :cases, foreign_key: 'ContactId'
     has_many :invoices, foreign_key: 'ContactId'
-    has_many :notes, foreign_key: 'ObjectId'
+    has_many :notes, foreign_key: 'ObjectId', class_name: "Crm::ContactNote"
 
     validates :FirstName, presence: true
     validates :LastName, presence: true

data/app/models/crm/contact_note.rb

@@ -0,0 +1,5 @@
+module Crm
+  class ContactNote < Note
+    belongs_to :contact, foreign_key: 'ObjectId', crm_key: 'objectid_contact'
+  end
+end

data/app/models/crm/invoice.rb

@@ -10,7 +10,7 @@ module Crm
     belongs_to :currency, foreign_key: 'TransactionCurrencyId', crm_key: 'transactioncurrencyid'
 
     has_many :invoice_products, foreign_key: 'InvoiceId'
-    has_many :notes, foreign_key: 'ObjectId'
+    has_many :notes, foreign_key: 'ObjectId', class_name: "Crm::InvoiceNote"
 
     validates :Name, presence: true
     validates :price_list, presence: true

data/app/models/crm/invoice_note.rb

@@ -0,0 +1,5 @@
+module Crm
+  class InvoiceNote < Note
+    belongs_to :invoice, foreign_key: 'ObjectId', crm_key: 'objectid_invoice'
+  end
+end

data/app/models/crm/note.rb

@@ -1,15 +1,12 @@
+# This is treated as an abstract class. We cant use the same objectId as a foreign key for each Entity Type.
+# To get around this issue we create a Note type for each Entity type. Each EntityNote contains only a single
+# entry for the ObjectId.
 module Crm
   class Note < ActiveRecord::Base
     self.table_name = "Annotation"
     self.primary_key = "AnnotationId"
 
-    belongs_to :account, foreign_key: 'ObjectId', crm_key: 'objectid_account'
-    belongs_to :campaign, foreign_key: 'ObjectId', crm_key: 'objectid_campaign'
-    belongs_to :campaign_response, foreign_key: 'ObjectId', crm_key: 'objectid_campaignresponse'
-    belongs_to :case, foreign_key: 'ObjectId', crm_key: 'objectid_case'
-    belongs_to :contact, foreign_key: 'ObjectId', crm_key: 'objectid_contact'
-    belongs_to :invoice, foreign_key: 'ObjectId', crm_key: 'objectid_invoice'
-    belongs_to :opportunity, foreign_key: 'ObjectId', crm_key: 'objectid_opportunity'
+    # *** Dont add ObjectIds here. Foreign Keys must be unique
 
     validates :Subject, presence: true
 

data/app/models/crm/opportunity.rb

@@ -10,7 +10,7 @@ module Crm
     belongs_to :parent_contact, foreign_key: 'ParentContactId', crm_key: 'parentcontactid', class_name: 'Crm::Contact'
 
     has_many :invoices, foreign_key: 'OpportunityId'
-    has_many :notes, foreign_key: 'ObjectId'
+    has_many :notes, foreign_key: 'ObjectId', class_name: "Crm::OpportunityNote"
 
   end
 end

data/app/models/crm/opportunity_note.rb

@@ -0,0 +1,5 @@
+module Crm
+  class OpportunityNote < Note
+    belongs_to :opportunity, foreign_key: 'ObjectId', crm_key: 'objectid_opportunity'
+  end
+end

data/lib/active_record_extension.rb

@@ -67,7 +67,9 @@ module ActiveRecordExtension
 
     def belongs_to_field(field)
       @belongs_to_fields ||= belongs_to_fields
-      @belongs_to_fields.select{|f| f.foreign_key == field}.first
+      matching_fields = @belongs_to_fields.select{|f| f.foreign_key == field}
+      raise "Multiple matching foreign_keys. Only unique foreign keys allowed [#{field}]" if matching_fields.count > 1
+      matching_fields.first
     end
 
     def belongs_to_field_by_name(name)
@@ -76,8 +78,7 @@ module ActiveRecordExtension
     end
 
     def belongs_to_fields
-      associations = reflect_on_all_associations
-      associations.select { |a| a.macro == :belongs_to }
+      reflect_on_all_associations(:belongs_to)
     end
 
     # If odata refers to table differently than table name when using associations, you can use this method

data/lib/activerecord_sqlserver_crm/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordSqlserverCrm
-  VERSION = "4.2.16"
+  VERSION = "4.2.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_sqlserver_crm
 version: !ruby/object:Gem::Version
-  version: 4.2.16
+  version: 4.2.17
 platform: ruby
 authors:
 - Rolf Lawrenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,15 +136,22 @@ files:
 - README.rdoc
 - Rakefile
 - app/models/crm/account.rb
+- app/models/crm/account_note.rb
 - app/models/crm/campaign.rb
+- app/models/crm/campaign_note.rb
 - app/models/crm/campaign_response.rb
+- app/models/crm/campaign_response_note.rb
 - app/models/crm/case.rb
+- app/models/crm/case_note.rb
 - app/models/crm/contact.rb
+- app/models/crm/contact_note.rb
 - app/models/crm/currency.rb
 - app/models/crm/invoice.rb
+- app/models/crm/invoice_note.rb
 - app/models/crm/invoice_product.rb
 - app/models/crm/note.rb
 - app/models/crm/opportunity.rb
+- app/models/crm/opportunity_note.rb
 - app/models/crm/price_list.rb
 - app/models/crm/price_list_item.rb
 - app/models/crm/product.rb