Merge pull request #2945 from unicef/staging

Staging

Author: ntrncic

Pipfile

@@ -19,69 +19,69 @@ sphinx = "*"
 vcrpy = "*"
 
 [packages]
-azure-common = "==1.1.23"
+azure-common = "==1.1.26"
 azure-storage-blob = "==2.1.0"
 azure-storage-common = "==2.1.0"
-carto = "==1.8.1"
-celery = "==4.3"
+carto = "==1.11.2"
+celery = "==5.0.5"
 dj-database-url = "==0.5"
 dj-static = "==0.0.6"
-Django = "==2.2.7"
-django-appconf = "==1.0.3"
-django_celery_beat = "==1.5"
-django-celery-email = "==2.0.2"
-django_celery_results = "==1.1.2"
-django-contrib-comments = "==1.9.1"
-django-cors-headers = "==3.1.1"
-django-debug-toolbar = "==2.1"
-django-extensions = "==2.2.5"
-django-easy-pdf = "==0.1.1"
-django-filter = "==2.2"
-django-fsm = "==2.6.1"
-django-import-export = "==1.2"
+Django = "<3.0"
+django-appconf = "==1.0.4"
+django_celery_beat = "==2.1"
+django-celery-email = "==3.0.0"
+django_celery_results = "==2.0.0"
+django-contrib-comments = "==2.0.0"
+django-cors-headers = "==3.6.0"
+django-debug-toolbar = "==3.2"
+django-extensions = "==3.1.0"
+django-easy-pdf = "==0.1.1"  # not maintained dj<3.0
+django-filter = "==2.4.0"
+django-fsm = "==2.7.1"
+django-import-export = "==2.5.0"
 django-js-asset = "==1.2.2"
-django-leaflet = "==0.25"
-django-logentry-admin = "==1.0.5"
-django-model-utils = "==3.2"
-django-ordered-model = "==3.3"
-django-post_office = "==3.2.1"
-django-redis-cache = "==2.1"
+django-leaflet = "==0.27.1"
+django-logentry-admin = "==1.0.6"
+django-model-utils = "==4.1.1"
+django-ordered-model = "==3.4.1"
+django-post_office = "==3.5.3"
+django-redis-cache = "==3.0"
 django-rest-swagger = "==2.2"
-django-storages = {extras = ["azure"],version = "==1.7.2"}
-django-tenants = "==2.2.3"
-django-timezone-field = "==3.1"
-django-waffle = "==0.18"
+django-storages = {extras = ["azure"],version = "==1.11.1"}
+django-tenants = "==3.2.1"
+django-timezone-field = "==4.1.1"
+django-waffle = "==2.0.0"
 djangorestframework-csv = "==2.1.0"
-djangorestframework-gis = "==0.14"
+djangorestframework-gis = "==0.16"
 djangorestframework-jwt = "==1.11.0"
 djangorestframework-recursive = "==0.1.2"
-djangorestframework-xml = "==1.4"
-djangorestframework = "==3.10.3"
-drf-nested-routers = "==0.91"
+djangorestframework-xml = "==2.0.0"
+djangorestframework = "==3.12.2"
+drf-nested-routers = "==0.92.5"
 drf-querystringfilter = "==1.0.0"
 etools-validator = "==0.3.4"
-flower = "==0.9.3"
+flower = "==0.9.5"  # issue when locking
 GDAL = "==3.0.2"
 gunicorn = "<20.0"
 newrelic = "*"
-Pillow = "==6.2.1"
-psycopg2-binary = "==2.8.4"
+Pillow = "==8.1.0"
+psycopg2-binary = "==2.8.6"
 sentry-sdk = "*"
-requests = "==2.22"
-social-auth-app-django = "==3.1"
-social-auth-core = {extras = ["azuread"],version = "==3.2"}
-tenant-schemas-celery = "==0.2.1"
+requests = "==2.25.1"
+social-auth-app-django = "==4.0"
+social-auth-core = {extras = ["azuread"],version = "==3.3.3"}
+tenant-schemas-celery = "==1.0.1"
 unicef_attachments = "==0.9.0"
 unicef-djangolib = "==0.5.4"
-unicef-locations = "==1.8"
+unicef-locations = "==1.9"
 unicef_notification = "==0.2.1"
-unicef_restlib = "==0.5"
+unicef_restlib = "==0.6.1"
 unicef_snapshot = "==0.2.3"
 unicef-rest-export = "==0.5.3"
-xhtml2pdf = "==0.2.3"
+xhtml2pdf = "==0.2.5"
 unicef-vision = "==0.6"
 etools-offline = "==0.1.0"
-openpyxl = "==3.0.1"  # need to be freeze
+openpyxl = "==3.0.5"
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils import Choices
 from model_utils.models import TimeStampedModel

src/etools/applications/action_points/categories/models.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from etools.applications.core.renderers import FriendlyCSVRenderer, ListSeperatorCSVRenderMixin
 

src/etools/applications/action_points/export/renderers.py

@@ -2,7 +2,7 @@
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.fields import GenericRelation
 from django.db import connection, models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_fsm import FSMField, transition
 from model_utils import Choices, FieldTracker

src/etools/applications/action_points/models.py

@@ -1,5 +1,5 @@
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_comments.models import Comment
 from rest_framework import serializers

src/etools/applications/action_points/serializers.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from etools.applications.audit.transitions.conditions import BaseTransitionCheck
 

src/etools/applications/action_points/transitions/conditions.py

@@ -1,7 +1,7 @@
 
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils.managers import InheritanceManager
 

src/etools/applications/activities/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from unicef_attachments.models import Attachment as NewAttachment
 

src/etools/applications/attachments/models.py

@@ -367,11 +367,11 @@ def assign_permissions(self):
             self.follow_up_page,
             condition=final_engagement_condition
         )
-        # self.add_permissions(
-        #     self.focal_point, 'edit',
-        #     self.follow_up_editable_page,
-        #     condition=final_engagement_condition
-        # )
+        self.add_permissions(
+            self.focal_point, 'edit',
+            self.follow_up_editable_page,
+            condition=final_engagement_condition
+        )
 
         # action points related permissions. editable by focal point, author, assignee and assigner
         opened_action_point_condition = self.action_point_status(EngagementActionPoint.STATUSES.open)

src/etools/applications/audit/management/commands/update_audit_permissions.py

@@ -7,7 +7,7 @@
 from django.db.transaction import atomic
 from django.utils import timezone
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_fsm import FSMField, transition
 from model_utils import Choices, FieldTracker

src/etools/applications/audit/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from model_utils.models import TimeStampedModel
 from unicef_notification.utils import send_notification_with_template

src/etools/applications/audit/purchase_order/models.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import get_user_model
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import serializers
 from unicef_restlib.fields import SeparatedReadWriteField

src/etools/applications/audit/serializers/auditor.py

@@ -1,6 +1,6 @@
 from copy import copy
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from rest_framework import serializers
 from unicef_attachments.fields import AttachmentSingleFileField, FileTypeModelChoiceField

src/etools/applications/audit/serializers/engagement.py

@@ -1,7 +1,7 @@
 import itertools
 from collections import OrderedDict
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import serializers
 from unicef_attachments.serializers import AttachmentPDFSerializer

src/etools/applications/audit/serializers/export.py

@@ -1,6 +1,6 @@
 
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import serializers
 

src/etools/applications/audit/serializers/mixins.py

@@ -1,7 +1,7 @@
 import itertools
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import serializers
 from unicef_restlib.fields import WriteListSerializeFriendlyRecursiveField

src/etools/applications/audit/serializers/risks.py

@@ -4,7 +4,7 @@
 from django.core.exceptions import FieldDoesNotExist
 from django.db import models
 from django.utils.decorators import classonlymethod
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from rest_framework.serializers import ValidationError
 

src/etools/applications/audit/transitions/conditions.py

@@ -3,7 +3,7 @@
 from django.db.models import Prefetch
 from django.http import Http404
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_filters.rest_framework import DjangoFilterBackend
 from easy_pdf.rendering import render_to_pdf_response

src/etools/applications/audit/views.py

@@ -70,7 +70,7 @@ def create_user(strategy, details, backend, user=None, *args, **kwargs):
     }
 
 
-def user_details(strategy, details, user=None, *args, **kwargs):
+def user_details(strategy, details, backend, user=None, *args, **kwargs):
     # This is where we update the user
     # see what the property to map by is here
     if user:
@@ -97,7 +97,7 @@ def user_details(strategy, details, user=None, *args, **kwargs):
         #         user.profile.country = country
         #         user.profile.save()
 
-    return social_core_user.user_details(strategy, details, user, *args, **kwargs)
+    return social_core_user.user_details(strategy, details, backend, user, *args, **kwargs)
 
 
 class CustomAzureADBBCOAuth2(AzureADB2COAuth2):

src/etools/applications/core/auth.py

@@ -81,11 +81,12 @@ def setUp(self):
 
     def test_no_user(self):
         with patch(SOCIAL_USER_PATH, self.mock_social):
-            r = auth.user_details("strategy", self.details, None)
+            r = auth.user_details("strategy", self.details, None, None)
         self.assertEqual(r, "Returned")
         self.mock_social.user_details.assert_called_with(
             "strategy",
             self.details,
+            None,
             None
         )
 
@@ -96,11 +97,12 @@ def test_no_update(self):
         )
         self.details["business_area_code"] = user.profile.country.business_area_code
         with patch(SOCIAL_USER_PATH, self.mock_social):
-            r = auth.user_details("strategy", self.details, user)
+            r = auth.user_details("strategy", self.details, None, user)
         self.assertEqual(r, "Returned")
         self.mock_social.user_details.assert_called_with(
             "strategy",
             self.details,
+            None,
             user
         )
 
@@ -115,11 +117,12 @@ def test_no_profile_country(self):
         user.profile.save()
         self.assertIsNone(user.profile.country)
         with patch(SOCIAL_USER_PATH, self.mock_social):
-            r = auth.user_details("strategy", self.details, user)
+            r = auth.user_details("strategy", self.details, None, user)
         self.assertEqual(r, "Returned")
         self.mock_social.user_details.assert_called_with(
             "strategy",
             self.details,
+            None,
             user
         )
         user_updated = get_user_model().objects.get(pk=user.pk)
@@ -137,11 +140,12 @@ def test_is_staff_update(self):
         self.details["idp"] = "UNICEF Azure AD"
         self.assertFalse(user.is_staff)
         with patch(SOCIAL_USER_PATH, self.mock_social):
-            r = auth.user_details("strategy", self.details, user)
+            r = auth.user_details("strategy", self.details, None, user)
         self.assertEqual(r, "Returned")
         self.mock_social.user_details.assert_called_with(
             "strategy",
             self.details,
+            None,
             user
         )
         user_updated = get_user_model().objects.get(pk=user.pk)

src/etools/applications/core/tests/test_auth.py

@@ -5,7 +5,7 @@
 from django.contrib.auth.models import Group
 from django.db import connection, models
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from waffle import managers
 from waffle.models import BaseModel, CACHE_EMPTY, set_flag

src/etools/applications/environment/models.py

@@ -37,7 +37,7 @@ class Meta:
         ]
 
     def get_planned_visits(self, obj):
-        return 0
+        return obj.hact_values["programmatic_visits"]["planned"]["total"] or 0
 
     def get_days_since_visit(self, obj):
         return get_days_since_last_visit(obj)