Merge pull request #1539 from akatsoulas/unsubscribe-task-traceback

[bug 1291239] Unsubscribe users only if there are newsletters.

mozillians/users/tasks.py

@@ -123,7 +123,7 @@ def subscribe_user_task(self, result, email='', newsletters=[], sync='N', trigge
 
 @shared_task(bind=True, base=DebugBasketTask, default_retry_delay=BASKET_TASK_RETRY_DELAY,
              max_retries=BASKET_TASK_MAX_RETRIES)
-def unsubscribe_user_task(self, result, newsletters=[], optout=False):
+def unsubscribe_user_task(self, result, newsletters=[], optout='N'):
     """Removes a user from the Basket subscription."""
 
     if not result:
@@ -141,7 +141,8 @@ def unsubscribe_user_task(self, result, newsletters=[], optout=False):
             newsletters_to_unsubscribe = list(set(MOZILLIANS_NEWSLETTERS)
                                               .intersection(result['newsletters']))
 
-        # Unsubscribe the calculated newsletters
+    # Unsubscribe the calculated newsletters
+    if newsletters_to_unsubscribe:
         try:
             unsubscribe_result = basket.unsubscribe(token=token,
                                                     email=email,

mozillians/users/tests/test_tasks.py

@@ -292,7 +292,7 @@ def test_unsubscribe_user_task_success_no_newsletters(self, unsubscribe_mock):
 
         unsubscribe_user_task(result)
         unsubscribe_mock.assert_called_with(token='token', email='result_email@example.com',
-                                            newsletters=['mozilla-phone'], optout=False)
+                                            newsletters=['mozilla-phone'], optout='N')
 
     @patch('mozillians.users.tasks.basket.unsubscribe')
     def test_unsubscribe_user_task_success(self, unsubscribe_mock):
@@ -305,7 +305,7 @@ def test_unsubscribe_user_task_success(self, unsubscribe_mock):
 
         unsubscribe_user_task(result, newsletters=['foo', 'bar'])
         unsubscribe_mock.assert_called_with(token='token', email='result_email@example.com',
-                                            newsletters=['foo', 'bar'], optout=False)
+                                            newsletters=['foo', 'bar'], optout='N')
 
     @patch('mozillians.users.tasks.unsubscribe_user_task.retry')
     @patch('mozillians.users.tasks.basket.unsubscribe')

requirements/prod.txt

@@ -172,20 +172,38 @@ sorl-thumbnail==11.12.1b \
     --hash=sha256:fe6e832952365c5cd98dfb84f44fce5a34db66eebb053ac4ba6502cc2ab694d0
 anyjson==0.3.3 \
     --hash=sha256:37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba
-bcrypt==2.0.0 \
-    --hash=sha256:453bc7cc2d8d808d8ef06bfeca6db230e4de975d7df17d43cc5f8a738ac89691 \
-    --hash=sha256:5c78e0416f6372722314aa33bbf944d361aef37870bf57f757960846b52d0fb7 \
-    --hash=sha256:42e39d6dd11b961856d431006f09f66f00af856bfc9cc50269e8bdd6af4586a3 \
-    --hash=sha256:c512747c10873976e5ebf9419a76bf5be76ff0e4a624e31ca0d4daa0e9348f33 \
-    --hash=sha256:75bb8083bc6f32f05a4fe8b0393874f6801b6a3f366fbf8bc03387a0baedc04e \
-    --hash=sha256:01ae55ea4b8430567662906561cc7d5605dc0d0230a71f9e5d34ce1c91dab9b4 \
-    --hash=sha256:2d602d691811458f6fd97096aed5537ccd0029e13220afcc2c767db84502adfe \
-    --hash=sha256:e597c26011b144c5fd7ad6bdc560241195f95f86d589abe9833a2d4bd9a66a69 \
-    --hash=sha256:c37f46a59d448b18cea4a96d16f37e38ca4ca5724c277e658f367c2bcbbf3484 \
-    --hash=sha256:dde11b4c211338af1c515e22e6f8a6358a188568d6ce92c4cbf4ded584c80bc7 \
-    --hash=sha256:5c5215bbe772b8c308cf12e555230d0ab5e25a3c17e451839e426415b724dfcc \
-    --hash=sha256:562d1198237756ebf02e08861157aeb8e5500458e11580227360e8b4a7ab0e98 \
-    --hash=sha256:8b2d197ef220d10eb74625dde7af3b10daa973ae9a1eadd6366f763fad4387fa
+bcrypt==3.1.1 \
+    --hash=sha256:56b690ab4cbedc2186654551922718ca184ba54fd354106a7e94325e9a55e512 \
+    --hash=sha256:4ac1bdaa7e98d6f1ce70fc513f68e6bcfc9fa12a20db71e350871cfb4c39233e \
+    --hash=sha256:269e038b50f85b8bf51b5a84652961bc4c620f605bb28c60a35a91faf97d2c0e \
+    --hash=sha256:6562416a08f6a46c7172a1abb9cb6ecd781a47bfaa9761fc530a8daefd765390 \
+    --hash=sha256:e669cc920fb8abfedbffde1dd1d5cc5be1dd613826072a5be28b2cd483707b78 \
+    --hash=sha256:337a4cdb08aff784e17595af51366a6bd83d3efd8debd248524557883f707f83 \
+    --hash=sha256:f8416594fa2de4df8425a0de5d26b0ae4a6cddd8309ccf0e4ab110f1544ad7a2 \
+    --hash=sha256:2095bac2c4d23b9d000c387ec9bdce7d06e4c6411fea8395d6a57b93b1b0001e \
+    --hash=sha256:47c102a33602099cc15a76c95867b6b94ae46e9aa989506005f3a6c75cdcdb32 \
+    --hash=sha256:1a55d8e1a1d02d8d257c25fc28560d6c70d0a0492bf8cb0d12e1e63f54c5529b \
+    --hash=sha256:074dac33bcf378c5119f2fba6ea8314a4f0cfa1a760fefe805ed1794449ce23b \
+    --hash=sha256:9239887e0610f65a5f08c7d53e9216d449599fe5c3ce3a5fb203e07a7134e16e \
+    --hash=sha256:df31359f24a5bcdbe30093236d84d068670aaa0fc4d84a3c95a16486bc0a01b3 \
+    --hash=sha256:5dfdfef5159fdc71e3f037d3ba6118a1be99d19ca5d1ba6922318de986a7cb89 \
+    --hash=sha256:4e74f8274cdcf2e1b446d575619013a25dce65be91279a78d1dbebce8ce4a4c1 \
+    --hash=sha256:9a94f7b85d5864c353eb335face2a7ddb71bf88faf73e7c10fd7092074d84b75 \
+    --hash=sha256:3e113d2e92d6e98f92d20b25404eefb044ea9e7702f59adfe91ebad0726c54bf \
+    --hash=sha256:36b81bbd27cdf0f9d2e7fbba78401ec957a5a8aba026930ab42354f1babcd317 \
+    --hash=sha256:8a441813b66b775d4bff836de8530c78e9587c1b5f268dea3d0f678a2d158b4b \
+    --hash=sha256:7f81002e04fed377f3c4384bf44d977270e309e41b1641f525d286e816056cba \
+    --hash=sha256:801bcc7d816c20f622879c8f8c5c6d82155b3473b77c6d8d72c76dd86e7255ae \
+    --hash=sha256:9fd61a51543eeecaf9c433a4b0218a3a4f4d6833a84b087fc7e51fc0c9968aae \
+    --hash=sha256:9bc3e8e5129ff550237f4f29af919550bbfc90e6cc03447f9677750a7ce68038 \
+    --hash=sha256:27a0277839fa306d553a741ac67c7e8c03b7001c29e9ed43ac28da7c70347045 \
+    --hash=sha256:4f31f5f78dd651992a0b6e3914c125e0091306ac474bbe4f49a5e0bef923894c \
+    --hash=sha256:928ea84056f474f28c91d66b3ee44d0ce7394da9fd2a8dd8b884c9805ffdeb1b \
+    --hash=sha256:56f71e96041d3f06ed49873fb6d0da748a1a66470461da39de20f2cdc8a79efd \
+    --hash=sha256:d9c74dae4be3600851fa1872ab2be318f93ba259d18118b3533aa43db4ebe2cc \
+    --hash=sha256:7a2342ef781df6a05e9d56192d96278ab1a48188bce77e145182ed0e9ab48795 \
+    --hash=sha256:f4511ad380fce708d679009b2f49ef76fe5548167b7baf80b1a451ad24ff25a2 \
+    --hash=sha256:0309a4a72bd1dc314279cf1ee14e277227732f14c9b63ab96715654e13fe9321
 cffi==1.5.0 \
     --hash=sha256:fef577b70055c46a7f2b95b6dc2fbf886e6ca7d6600a1a2b40719b3badcbf605 \
     --hash=sha256:512d076b5c1b95508ba0a36aa535f42c5317d03d655a7b7f803768a6ceee1320 \
@@ -245,8 +263,8 @@ raven==5.12.0 \
     --hash=sha256:45645ea7fce8a37bd581b0a661cdc0889f7f12ce837dff5d9211ccae1bc56210
 django-nocaptcha-recaptcha==0.0.19 \
     --hash=sha256:d2512d5035d5f62aba5009082db28b28995a7e6f4a46713292e0f4f350f337da
-pycparser==2.14 \
-    --hash=sha256:7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73
+pycparser==2.15 \
+    --hash=sha256:457393eb49a0cc1099e67097f3bd73d28f63e76f032dc9eef9d79780120b1b8d
 boto==2.42.0 \
     --hash=sha256:ef345a9c5f5961c481cf986d755d33470f43452192fbc0ca978f8abe2a31992a \
     --hash=sha256:dcf140d4ce535bb8f5266d1750c16def4d50f6c46eff27fab38b55d0d74d5ac7