Merge pull request #3032 from unicef/develop

Develop

Author: robertavram

src/etools/applications/field_monitoring/data_collection/offline/synchronizer.py

@@ -7,6 +7,7 @@
 from django.urls import reverse
 
 from etools_offline import OfflineCollect
+from sentry_sdk import capture_exception
 from simplejson import JSONDecodeError
 
 from etools.applications.environment.helpers import tenant_switch_is_active
@@ -46,33 +47,39 @@ def initialize_blueprints(self) -> None:
 
         for method in self.activity.methods:
             blueprint = get_blueprint_for_activity_and_method(self.activity, method)
-            OfflineCollect().add(data={
-                "is_active": True,
-                "code": blueprint.code,
-                "form_title": blueprint.title,
-                "form_instructions": json.dumps(blueprint.to_dict(), indent=2),
-                "accessible_by": self._get_data_collectors(),
-                "api_response_url": urljoin(
-                    host,
-                    '{}?workspace={}'.format(
-                        reverse(
-                            'field_monitoring_data_collection:activities-offline',
-                            args=[self.activity.id, method.id]
-                        ),
-                        connection.tenant.schema_name or ''
+            try:
+                OfflineCollect().add(data={
+                    "is_active": True,
+                    "code": blueprint.code,
+                    "form_title": blueprint.title,
+                    "form_instructions": json.dumps(blueprint.to_dict(), indent=2),
+                    "accessible_by": self._get_data_collectors(),
+                    "api_response_url": urljoin(
+                        host,
+                        '{}?workspace={}'.format(
+                            reverse(
+                                'field_monitoring_data_collection:activities-offline',
+                                args=[self.activity.id, method.id]
+                            ),
+                            connection.tenant.schema_name or ''
+                        )
                     )
-                )
-            })
+                })
+            except JSONDecodeError:
+                capture_exception()
 
     def update_data_collectors_list(self) -> None:
         if not self.enabled:
             return
 
         for method in self.activity.methods:
-            OfflineCollect().update(
-                get_blueprint_code(self.activity, method),
-                accessible_by=self._get_data_collectors()
-            )
+            try:
+                OfflineCollect().update(
+                    get_blueprint_code(self.activity, method),
+                    accessible_by=self._get_data_collectors()
+                )
+            except JSONDecodeError:
+                capture_exception()
 
     def close_blueprints(self) -> None:
         if not self.enabled:
@@ -85,4 +92,4 @@ def close_blueprints(self) -> None:
             try:
                 OfflineCollect().delete(code)
             except JSONDecodeError:
-                pass
+                capture_exception()

src/etools/applications/field_monitoring/data_collection/tests/test_offline.py

@@ -2,6 +2,7 @@
 from django.db import connection
 from django.test import override_settings
 
+import simplejson
 from mock import patch
 from rest_framework import status
 
@@ -280,6 +281,60 @@ def test_tenant_switch_missing_but_api_not_configured(self, add_mock):
         self._test_update(self.fm_user, activity, {'status': 'assigned'})
         add_mock.assert_not_called()
 
+    @override_settings(ETOOLS_OFFLINE_API='http://example.com/b/api/remote/blueprint/', SENTRY_DSN='https://test.dns')
+    @patch('sentry_sdk.api.Hub.current.capture_exception')
+    @patch('etools.applications.field_monitoring.data_collection.offline.synchronizer.OfflineCollect.add')
+    def test_add_offline_backend_unavailable(self, add_mock, capture_event_mock):
+        def communication_failure(*args, **kwargs):
+            return 502, simplejson.loads(
+                '<html>\r\n<head><title>502 Bad Gateway</title></head>\r\n<body bgcolor="white">\r\n<center>'
+                '<h1>502 Bad Gateway</h1></center>\r\n<hr><center>nginx/1.13.12</center>\r\n</body>\r\n</html>\r\n'
+            )
+
+        add_mock.side_effect = communication_failure
+
+        activity = MonitoringActivityFactory(status='pre_assigned', partners=[PartnerFactory()])
+        ActivityQuestionFactory(monitoring_activity=activity, is_enabled=True, question__methods=[MethodFactory()])
+
+        self._test_update(self.fm_user, activity, {'status': 'assigned'})
+        capture_event_mock.assert_called()
+
+    @override_settings(ETOOLS_OFFLINE_API='http://example.com/b/api/remote/blueprint/', SENTRY_DSN='https://test.dns')
+    @patch('sentry_sdk.api.Hub.current.capture_exception')
+    @patch('etools.applications.field_monitoring.data_collection.offline.synchronizer.OfflineCollect.update')
+    def test_update_offline_backend_unavailable(self, update_mock, capture_event_mock):
+        def communication_failure(*args, **kwargs):
+            return 502, simplejson.loads(
+                '<html>\r\n<head><title>502 Bad Gateway</title></head>\r\n<body bgcolor="white">\r\n<center>'
+                '<h1>502 Bad Gateway</h1></center>\r\n<hr><center>nginx/1.13.12</center>\r\n</body>\r\n</html>\r\n'
+            )
+
+        update_mock.side_effect = communication_failure
+
+        activity = MonitoringActivityFactory(status='data_collection', partners=[PartnerFactory()])
+        ActivityQuestionFactory(monitoring_activity=activity, is_enabled=True, question__methods=[MethodFactory()])
+
+        activity.team_members.remove(activity.team_members.first())
+        capture_event_mock.assert_called()
+
+    @override_settings(ETOOLS_OFFLINE_API='http://example.com/b/api/remote/blueprint/', SENTRY_DSN='https://test.dns')
+    @patch('sentry_sdk.api.Hub.current.capture_exception')
+    @patch('etools.applications.field_monitoring.data_collection.offline.synchronizer.OfflineCollect.delete')
+    def test_delete_offline_backend_unavailable(self, delete_mock, capture_event_mock):
+        def communication_failure(*args, **kwargs):
+            return 502, simplejson.loads(
+                '<html>\r\n<head><title>502 Bad Gateway</title></head>\r\n<body bgcolor="white">\r\n<center>'
+                '<h1>502 Bad Gateway</h1></center>\r\n<hr><center>nginx/1.13.12</center>\r\n</body>\r\n</html>\r\n'
+            )
+
+        delete_mock.side_effect = communication_failure
+
+        activity = MonitoringActivityFactory(status='data_collection', partners=[PartnerFactory()])
+        ActivityQuestionFactory(monitoring_activity=activity, is_enabled=True, question__methods=[MethodFactory()])
+
+        self._test_update(self.fm_user, activity, {'status': 'cancelled', 'cancel_reason': 'For testing purposes'})
+        capture_event_mock.assert_called()
+
 
 class MonitoringActivityOfflineValuesTestCase(APIViewSetTestCase, BaseTenantTestCase):
     base_view = 'field_monitoring_data_collection:activities'

src/etools/applications/partners/serializers/interventions_v2.py

@@ -329,7 +329,7 @@ class InterventionResultNestedSerializer(serializers.ModelSerializer):
     ll_results = LowerResultSerializer(many=True, read_only=True)
 
     def get_ram_indicator_names(self, obj):
-        return [i.name for i in obj.ram_indicators.all()]
+        return [i.light_repr for i in obj.ram_indicators.all()]
 
     class Meta:
         model = InterventionResultLink