move append_association to Hubspot::Association

captaincontrat · Nov 21, 2024 · bde22b7 · bde22b7
1 parent 1db62ca
commit bde22b7
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 41 deletions.
diff --git a/lib/hubspot/association.rb b/lib/hubspot/association.rb
@@ -75,6 +75,17 @@ def all(object_type, object_id, to_object_type)
       response['results'].map { |result| klass.find(result["toObjectId"]) }
     end
 
+    # Utility function to build the association list required by some API endpoints
+    def append_association(association_list, origin, associated, associated_id)
+      return unless associated_id.present?
+
+      association_list << {
+        "to": { "id": associated_id },
+        "types": [{ "associationCategory": 'HUBSPOT_DEFINED',
+                    "associationTypeId": Hubspot::Association::ASSOCIATION_DEFINITIONS[origin][associated] }]
+      }
+    end
+
     private
 
     def build_create_association_body(association, definition_id)

diff --git a/lib/hubspot/task.rb b/lib/hubspot/task.rb
@@ -22,10 +22,10 @@ def initialize(response_hash)
     class << self
       def create!(params = {}, ticket_id: nil, contact_id: nil, company_id: nil, deal_id: nil)
         associations_hash = { 'associations' => [] }
-        Hubspot::Utils.append_association(associations_hash['associations'], 'Task', 'Ticket', ticket_id)
-        Hubspot::Utils.append_association(associations_hash['associations'], 'Task', 'Contact', contact_id)
-        Hubspot::Utils.append_association(associations_hash['associations'], 'Task', 'Company', company_id)
-        Hubspot::Utils.append_association(associations_hash['associations'], 'Task', 'Deal', deal_id)
+        Hubspot::Association.append_association(associations_hash['associations'], 'Task', 'Ticket', ticket_id)
+        Hubspot::Association.append_association(associations_hash['associations'], 'Task', 'Contact', contact_id)
+        Hubspot::Association.append_association(associations_hash['associations'], 'Task', 'Company', company_id)
+        Hubspot::Association.append_association(associations_hash['associations'], 'Task', 'Deal', deal_id)
         properties = { hs_task_status: 'NOT_STARTED', hs_task_type: 'TODO' }.merge(params)
         post_data = associations_hash.merge({ properties: properties })
 

diff --git a/lib/hubspot/ticket.rb b/lib/hubspot/ticket.rb
@@ -22,9 +22,9 @@ def initialize(response_hash)
     class << self
       def create!(params = {}, contact_id: nil, company_id: nil, deal_id: nil)
         associations_hash = { 'associations' => [] }
-        Hubspot::Utils.append_association(associations_hash['associations'], 'Ticket', 'Contact', contact_id)
-        Hubspot::Utils.append_association(associations_hash['associations'], 'Ticket', 'Company', company_id)
-        Hubspot::Utils.append_association(associations_hash['associations'], 'Ticket', 'Deal', deal_id)
+        Hubspot::Association.append_association(associations_hash['associations'], 'Ticket', 'Contact', contact_id)
+        Hubspot::Association.append_association(associations_hash['associations'], 'Ticket', 'Company', company_id)
+        Hubspot::Association.append_association(associations_hash['associations'], 'Ticket', 'Deal', deal_id)
         post_data = associations_hash.merge({ properties: params })
         response = Hubspot::Connection.post_json(TICKETS_PATH, params: {}, body: post_data)
         new(response)

diff --git a/lib/hubspot/utils.rb b/lib/hubspot/utils.rb
@@ -87,16 +87,6 @@ def compare_property_lists(klass, source, target)
         [skip, new_groups.to_a, new_props, update_props]
       end
 
-      def append_association(association_list, origin, associated, associated_id)
-        return unless associated_id.present?
-
-        association_list << {
-          "to": { "id": associated_id },
-          "types": [{ "associationCategory": 'HUBSPOT_DEFINED',
-                      "associationTypeId": Hubspot::Association::ASSOCIATION_DEFINITIONS[origin][associated] }]
-        }
-      end
-
       private
 
       def find_by_name(name, set)

diff --git a/spec/lib/hubspot/association_spec.rb b/spec/lib/hubspot/association_spec.rb
@@ -162,4 +162,28 @@
       end
     end
   end
+
+  describe '.append_association' do
+    it 'adds proper association hash to target list' do
+      associations_hash = { 'associations' => [] }
+      described_class.append_association(associations_hash['associations'], 'Ticket', 'Company', 1337)
+      expect(associations_hash).to eq(
+        {
+          'associations' => [
+            "to": { "id": 1337 },
+            "types": [{ "associationCategory": 'HUBSPOT_DEFINED',
+                        "associationTypeId": 339 }]
+          ]
+        }
+      )
+    end
+
+    context 'when no associated_id' do
+      it 'does not change the list' do
+        associations_hash = { 'associations' => [] }
+        described_class.append_association(associations_hash['associations'], 'Ticket', 'Company', nil)
+        expect(associations_hash).to eq({ 'associations' => [] })
+      end
+    end
+  end
 end
diff --git a/spec/lib/hubspot/utils_spec.rb b/spec/lib/hubspot/utils_spec.rb
@@ -128,28 +128,4 @@
       end
     end
   end
-
-  describe '.append_association' do
-    it 'adds proper association hash to target list' do
-      associations_hash = { 'associations' => [] }
-      described_class.append_association(associations_hash['associations'], 'Ticket', 'Company', 1337)
-      expect(associations_hash).to eq(
-        {
-          'associations' => [
-            "to": { "id": 1337 },
-            "types": [{ "associationCategory": 'HUBSPOT_DEFINED',
-                        "associationTypeId": 339 }]
-          ]
-        }
-      )
-    end
-
-    context 'when no associated_id' do
-      it 'does not change the list' do
-        associations_hash = { 'associations' => [] }
-        described_class.append_association(associations_hash['associations'], 'Ticket', 'Company', nil)
-        expect(associations_hash).to eq({ 'associations' => [] })
-      end
-    end
-  end
 end