Fixes cases where we do not have reward or project_account for mixpan…

…el observer and project analytics json
catarse · Mar 31, 2015 · f0f9de9 · f0f9de9
1 parent 4e31ab3
commit f0f9de9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -243,9 +243,9 @@ def to_analytics_json
       project_goal: self.goal,
       project_online_date: self.online_date,
       project_expires_at: self.expires_at,
-      project_address_city: self.account.address_city,
-      project_address_state: self.account.address_state,
-      account_entity_type: self.account.entity_type
+      project_address_city: self.account.try(:address_city),
+      project_address_state: self.account.try(:address_state),
+      account_entity_type: self.account.try(:entity_type)
     }.to_json
   end
 

diff --git a/app/observers/mixpanel_observer.rb b/app/observers/mixpanel_observer.rb
@@ -14,10 +14,10 @@ def from_waiting_confirmation_to_confirmed(contribution)
       project_online_date: contribution.project.online_date,
       project_expires_at: contribution.project.expires_at,
       reward_id: contribution.reward_id,
-      reward_value: contribution.reward.minimum_value,
-      project_address_city: contribution.project.account.address_city,
-      project_address_state: contribution.project.account.address_state,
-      account_entity_type: contribution.project.account.entity_type
+      reward_value: contribution.reward.try(:minimum_value),
+      project_address_city: contribution.project.account.try(:address_city),
+      project_address_state: contribution.project.account.try(:address_state),
+      account_entity_type: contribution.project.account.try(:entity_type)
     })
     track_event(contribution.user, "Engaged with Catarse", properties.merge(action: 'contribution confirmed'))
     track_event(contribution.user, "Contribution confirmed", properties)

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
@@ -527,9 +527,9 @@
         project_goal: project.goal,
         project_online_date: project.online_date,
         project_expires_at: project.expires_at,
-        project_address_city: project.account.address_city,
-        project_address_state: project.account.address_state,
-        account_entity_type: project.account.entity_type
+        project_address_city: project.account.try(:address_city),
+        project_address_state: project.account.try(:address_state),
+        account_entity_type: project.account.try(:entity_type)
       }.to_json)
     end
   end

diff --git a/spec/observers/mixpanel_observer_spec.rb b/spec/observers/mixpanel_observer_spec.rb
@@ -25,9 +25,9 @@
       project_expires_at: contribution.project.expires_at,
       reward_id: contribution.reward_id,
       reward_value: contribution.reward.try(:minimum_value),
-      project_address_city: contribution.project.account.address_city,
-      project_address_state: contribution.project.account.address_state,
-      account_entity_type: contribution.project.account.entity_type
+      project_address_city: contribution.project.account.try(:address_city),
+      project_address_state: contribution.project.account.try(:address_state),
+      account_entity_type: contribution.project.account.try(:entity_type)
     }
   end