Merge pull request #654 from unfoldingWord-dev/develop

Update from Develop

Author: vleong2332

td/receivers.py

@@ -28,11 +28,12 @@ def handle_wa_region_delete(sender, instance=None, **kwargs):
 @receiver(post_save, sender=TempLanguage)
 def handle_templanguage_save(sender, instance, **kwargs):
     if kwargs["created"]:
-        lang = Language.objects.create(code=instance.code)
-        lang.name = instance.name
-        lang.direction = instance.direction
-        lang.country = instance.country
-        lang.save()
+        lang = Language.objects.create(
+            code=instance.code,
+            name=instance.name,
+            direction=instance.direction,
+            country=instance.country,
+        )
         instance.lang_assigned = lang
         instance.save()
         notify_templanguage_created(instance, lang)

td/tasks.py

@@ -267,22 +267,25 @@ def notify_external_apps(action="", instance=None):
             url += "?key=" + key if key is not None else ""
         headers = {'Content-Type': 'application/json'}
 
-        post_to_ext_apps.delay(url, json.dumps(data), headers)
+        post_to_ext_app.delay(url, json.dumps(data), headers)
 
     task_status.success = True
     return task_status
 
 
 @task()
-def post_to_ext_apps(url, data, headers):
+def post_to_ext_app(url, data, headers):
     response = requests.post(url, data=data, headers=headers)
-    if response.status_code == 202 and response.content == "":
-        return
-    else:
-        message = "POST to %s has failed with code: %s and message: %s" % (url, response.status_code, response.content)
+    if response.status_code != 202 or response.content != "":
+        message = "POST to %s has failed." % url
+        message += "\n"
+        message += "\nsite_id: %s" % settings.SITE_ID
+        message += "\ncontent: %s" % response.content
+        message += "\ndata: %s" % data
+        message += "\nstatus_code: %s" % response.status_code
         send_mail(
-            "Ops CRM shim rejects POST",
+            "PORT shim rejects POST",
             message,
             "admin@unfoldingword.org",
-            ["vleong2332@gmail.com"],
+            ["vicky_leong@wycliffeassociates.org"],
         )

td/templates/resources/language_list.html

@@ -27,5 +27,5 @@ <h2>Languages</h2>
         <tbody>
         </tbody>
     </table>
-{#    <p>If you don't see a language you expect to see it probably isn't in our database. You can request its creation <a href="{% url "templanguage_create" %}">here</a></p>#}
+    <p>If you don't see a language you expect to see it probably isn't in our database. You can request its creation <a href="{% url "templanguage_create" %}">here</a></p>
 {% endblock %}

td/tests/test_tasks.py

@@ -3,7 +3,7 @@
 from mock import patch, Mock
 
 from td.models import Language, JSONData
-from td.tasks import reset_langnames_cache, update_langnames_data, post_to_ext_apps, notify_external_apps
+from td.tasks import reset_langnames_cache, update_langnames_data, post_to_ext_app, notify_external_apps
 from td.tests.models import NoSignalTestCase
 
 
@@ -99,7 +99,7 @@ def test_update_langnames_data(self):
         self.assertIn("ld", json)
 
 
-class PostToExtAppsTestCase(TestCase):
+class PostToExtAppTestCase(TestCase):
     def setUp(self):
         self.patcher_post = patch("td.tasks.requests.post")
         self.patcher_send_mail = patch("td.tasks.send_mail")
@@ -119,7 +119,7 @@ def test_accepted_with_no_message(self):
         response = {"status_code": 202, "content": ""}
         self.mock_response.configure_mock(**response)
 
-        post_to_ext_apps("fake_url", "fake_data", "fake_headers")
+        post_to_ext_app("fake_url", "fake_data", "fake_headers")
 
         self.mock_post.assert_called_once_with("fake_url", data="fake_data", headers="fake_headers")
         self.assertFalse(self.mock_send_mail.called)
@@ -131,7 +131,7 @@ def test_accepted_with_message(self):
         response = {"status_code": 202, "content": "something's wrong"}
         self.mock_response.configure_mock(**response)
 
-        post_to_ext_apps("fake_url", "fake_data", "fake_headers")
+        post_to_ext_app("fake_url", "fake_data", "fake_headers")
 
         self.mock_post.assert_called_once_with("fake_url", data="fake_data", headers="fake_headers")
         self.assertEqual(self.mock_send_mail.call_count, 1)
@@ -143,7 +143,7 @@ def test_not_accepted(self):
         response = {"status_code": 403}
         self.mock_response.configure_mock(**response)
 
-        post_to_ext_apps("fake_url", "fake_data", "fake_headers")
+        post_to_ext_app("fake_url", "fake_data", "fake_headers")
 
         self.mock_post.assert_called_once_with("fake_url", data="fake_data", headers="fake_headers")
         self.assertEqual(self.mock_send_mail.call_count, 1)
@@ -283,7 +283,7 @@ def test_bad_ext_app_setting(self, mock_settings):
         self.assertGreater(len(status.message), 0)
 
     @patch("td.tasks.settings")
-    @patch("td.tasks.post_to_ext_apps.delay")
+    @patch("td.tasks.post_to_ext_app.delay")
     def test_no_ext_apps(self, mock_async_post, mock_settings):
         """
         If called with the right arguments but no ext apps, function should return success status and post should
@@ -297,7 +297,7 @@ def test_no_ext_apps(self, mock_async_post, mock_settings):
         self.assertFalse(mock_async_post.called)
 
     @patch("td.tasks.settings")
-    @patch("td.tasks.post_to_ext_apps.delay")
+    @patch("td.tasks.post_to_ext_app.delay")
     def test_with_ext_apps(self, mock_async_post, mock_settings):
         """
         If called with the right arguments and ext app settings, function should return success status, no message

td/tests/test_views.py

@@ -177,8 +177,7 @@ def test_get_with_user(self):
         Requesting temporary language creation form should return a success response
         """
         response = TempLanguageWizardView.as_view()(self.request)
-        # self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.status_code, 200)
 
     def test_init(self):
         """

td/views.py

@@ -669,9 +669,6 @@ class TempLanguageWizardView(LoginRequiredMixin, SessionWizardView):
     form_list = [forms.Form]
     template_name = "resources/templanguage_wizard_form.html"
 
-    def get(self, request, *args, **kwargs):
-        return redirect("home")
-
     def __init__(self, *args, **kwargs):
         super(TempLanguageWizardView, self).__init__(*args, **kwargs)
         self.questionnaire = Questionnaire.objects.latest('created_at')