add in some CEF logging (bug 707288)

Andy McKay · Andy McKay · commit 0890b4b9132e · 2011-12-20T11:40:09.000-08:00
diff --git a/apps/addons/views.py b/apps/addons/views.py
@@ -526,6 +526,9 @@ def purchase(request, addon):
                     slug=slug,
                     uuid=uuid_))
     except:
+        paypal.paypal_log_cef(request, addon, uuid_,
+                              'PayKey Failure', 'PAYKEYFAIL',
+                              'There was an error getting the paykey')
         log.error('Error getting paykey, purchase of addon: %s' % addon.pk,
                   exc_info=True)
         error = _('There was an error communicating with PayPal.')
@@ -540,6 +543,10 @@ def purchase(request, addon):
         # If this was a pre-approval, it's completed already, we'll
         # double check this with PayPal, just to be sure nothing went wrong.
         if status == 'COMPLETED':
+            paypal.paypal_log_cef(request, addon, uuid_,
+                                  'Purchase', 'PURCHASE',
+                                  'A user purchased using pre-approval')
+
             log.debug('Status is completed for uuid: %s' % uuid_)
             if paypal.check_purchase(paykey) == 'COMPLETED':
                 log.debug('Check purchase is completed for uuid: %s' % uuid_)
@@ -596,8 +603,14 @@ def purchase_complete(request, addon, status):
         try:
             result = paypal.check_purchase(con.paykey)
             if result == 'ERROR':
+                paypal.paypal_log_cef(request, addon, uuid_,
+                              'Purchase Fail', 'PURCHASEFAIL',
+                              'Checking purchase state returned error')
                 raise
         except:
+            paypal.paypal_log_cef(request, addon, uuid_,
+                              'Purchase Fail', 'PURCHASEFAIL',
+                              'There was an error checking purchase state')
             log.error('Check purchase paypal addon: %s, user: %s, paykey: %s'
                       % (addon.pk, request.amo_user.pk, con.paykey[:10]),
                       exc_info=True)
@@ -684,6 +697,9 @@ def contribute(request, addon):
                             slug=addon.slug,
                             uuid=contribution_uuid))
     except:
+        paypal.paypal_log_cef(request, addon, contribution_uuid,
+                              'PayKey Failure', 'PAYKEYFAIL',
+                              'There was an error getting the paykey')
         log.error('Error getting paykey, contribution for addon: %s'
                   % addon.pk, exc_info=True)
         error = _('There was an error communicating with PayPal.')
@@ -702,8 +718,6 @@ def contribute(request, addon):
                            paykey=paykey)
         contrib.save()
 
-    assert settings.PAYPAL_FLOW_URL, 'settings.PAYPAL_FLOW_URL is not defined'
-
     url = '%s?paykey=%s' % (settings.PAYPAL_FLOW_URL, paykey)
     if request.GET.get('result_type') == 'json' or request.is_ajax():
         # If there was an error getting the paykey, then JSON will
diff --git a/apps/paypal/__init__.py b/apps/paypal/__init__.py
@@ -14,6 +14,7 @@
 
 from amo.helpers import absolutify, urlparams
 from amo.urlresolvers import reverse
+from amo.utils import log_cef
 
 
 class PaypalError(Exception):
@@ -384,3 +385,11 @@ def socket_timeout(timeout):
         yield
     finally:
         socket.setdefaulttimeout(old)
+
+
+def paypal_log_cef(request, addon, uuid, msg, caps, longer):
+    log_cef('Paypal %s' % msg, 5, request,
+            username=request.amo_user,
+            signature='PAYPAL%s' % caps,
+            msg=longer, cs2=addon.name, cs2Label='PaypalTransaction',
+            cs4=uuid, cs4Label='TxID')
diff --git a/apps/paypal/views.py b/apps/paypal/views.py
@@ -14,6 +14,7 @@
 
 import amo
 from amo.decorators import no_login_required, post_required, write
+from paypal import paypal_log_cef
 from stats.db import StatsDictField
 from stats.models import Contribution, ContributionError, SubscriptionEvent
 
@@ -208,6 +209,11 @@ def paypal_refunded(request, post, transaction):
         post_data=php.serialize(post)
     )
     paypal_log.info('Refund successfully processed')
+
+    paypal_log_cef(request, original.addon, post['txn_id'],
+                   'Refund', 'REFUND',
+                   'A paypal refund was processed')
+
     return http.HttpResponse('Success!')
 
 
@@ -235,6 +241,11 @@ def paypal_reversal(request, post, transaction):
         post_data=php.serialize(post)
     )
     refund.mail_chargeback()
+
+    paypal_log_cef(request, original.addon, post['txn_id'],
+                   'Chargeback', 'CHARGEBACK',
+                   'A paypal chargeback was processed')
+
     return http.HttpResponse('Success!')
 
 
@@ -271,5 +282,8 @@ def paypal_completed(request, post, transaction):
         # A failed thankyou email is not a show stopper, but is good to know.
         paypal_log.error('Thankyou note email failed with error: %s' % e)
 
+    paypal_log_cef(request, original.addon, post['txn_id'],
+                   'Purchase', 'PURCHASE',
+                   'A user purchased or contributed to an addon')
     paypal_log.info('Completed successfully processed')
     return http.HttpResponse('Success!')
