Merge pull request #1617 from IFRCGo/develop

Fix timeout in Surgealert: Export All

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.464
+
+### Added
+ - Fix timeout in Surgealert: Export All
+ - Bump up some packages
+ - Fix some settings
+
 ## 1.1.463
 
 ### Added
@@ -2114,7 +2121,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.463...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.464...HEAD
+[1.1.464]: https://github.com/IFRCGo/go-api/compare/1.1.463...1.1.464
 [1.1.463]: https://github.com/IFRCGo/go-api/compare/1.1.462...1.1.463
 [1.1.462]: https://github.com/IFRCGo/go-api/compare/1.1.461...1.1.462
 [1.1.461]: https://github.com/IFRCGo/go-api/compare/1.1.460...1.1.461

deployments/snapshots/snap_tests.py

@@ -24,7 +24,7 @@
     'ns_with_ongoing_activities': 16,
     'projects_per_programme_type': [
         {
-            'count': 8,
+            'count': 7,
             'programme_type': 0,
             'programme_type_display': 'Bilateral'
         },
@@ -34,7 +34,7 @@
             'programme_type_display': 'Multilateral'
         },
         {
-            'count': 4,
+            'count': 5,
             'programme_type': 2,
             'programme_type_display': 'Domestic'
         }
@@ -88,12 +88,17 @@
             'primary_sector_display': 'CEA'
         },
         {
-            'count': 2,
+            'count': 1,
             'primary_sector': 3,
             'primary_sector_display': 'Migration'
         },
         {
             'count': 2,
+            'primary_sector': 4,
+            'primary_sector_display': 'Health'
+        },
+        {
+            'count': 1,
             'primary_sector': 5,
             'primary_sector_display': 'DRR'
         },
@@ -433,10 +438,10 @@
             'target_total': 0
         },
         {
-            'budget_amount_total': 5220000,
+            'budget_amount_total': 4260000,
             'id': 33,
-            'iso3': 'hNK',
-            'name': 'country-lFoucligTrYZNfzfdSWfMLvoRjfavNEGPtQYlQIfZsPpOuhTPN',
+            'iso3': 'STh',
+            'name': 'country-GhslFoucligTrYZNfzfdSWfMLvoRjfavNEGPtQYlQIfZsPpOuh',
             'ongoing_projects': 1,
             'operation_types': [
                 1
@@ -447,18 +452,18 @@
             'projects_per_sector': [
                 {
                     'count': 1,
-                    'primary_sector': 5,
-                    'primary_sector_display': 'DRR'
+                    'primary_sector': 4,
+                    'primary_sector_display': 'Health'
                 }
             ],
-            'society_name': 'society-name-DMYIfFApbQgMPVWggwrZnUhBSCdfQshatRJHibAqQwyjPObObN',
+            'society_name': 'society-name-NKDMYIfFApbQgMPVWggwrZnUhBSCdfQshatRJHibAqQwyjPObO',
             'target_total': 0
         },
         {
-            'budget_amount_total': 3510000,
+            'budget_amount_total': 3040000,
             'id': 35,
-            'iso3': 'Bnz',
-            'name': 'country-NUBFklsXHvwhvOCcmqmsYKfCZeQddoPOvFOcvIoPoPYtLrpOFs',
+            'iso3': 'PYt',
+            'name': 'country-fdGdNQeaEPjKNUBFklsXHvwhvOCcmqmsYKfCZeQddoPOvFOcvI',
             'ongoing_projects': 1,
             'operation_types': [
                 1
@@ -469,11 +474,11 @@
             'projects_per_sector': [
                 {
                     'count': 1,
-                    'primary_sector': 3,
-                    'primary_sector_display': 'Migration'
+                    'primary_sector': 4,
+                    'primary_sector_display': 'Health'
                 }
             ],
-            'society_name': 'society-name-JvnKNSlGzUnyLPRoqRfeZxiwArYgPzwdBsnTobwsdWUzKBxgrG',
+            'society_name': 'society-name-LrpOFsFxdBnzJvnKNSlGzUnyLPRoqRfeZxiwArYgPzwdBsnTob',
             'target_total': 0
         }
     ]

main/__init__.py

@@ -3,4 +3,4 @@
 from .celery import app as celery_app
 
 __all__ = ['celery_app']
-__version__ = '1.1.463'
+__version__ = '1.1.464'

main/settings.py

@@ -6,10 +6,10 @@
 
 from django.utils.translation import gettext_lazy as _
 # from celery.schedules import crontab
-from requests.packages.urllib3.util.retry import Retry
+from urllib3.util.retry import Retry
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-DEFAULT_AUTO_FIELD='django.db.models.AutoField'
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 
 env = environ.Env(
     # Django
@@ -20,7 +20,7 @@
     DJANGO_MEDIA_ROOT=(str, os.path.join(BASE_DIR, 'media')),
     DJANGO_STATIC_URL=(str, '/static/'),
     DJANGO_STATIC_ROOT=(str, os.path.join(BASE_DIR, 'static')),
-    DJANGO_ADDITIONAL_ALLOWED_HOSTS=(list, []),  # Eg: api.go.ifrc.org,goadmin.ifrc.org,prddsgocdnapi.azureedge.net
+    DJANGO_ADDITIONAL_ALLOWED_HOSTS=(list, []),  # Eg: api.go.ifrc.org, goadmin.ifrc.org, dsgocdnapi.azureedge.net
     GO_ENVIRONMENT=(str, 'development'),  # staging, production
     #
     API_FQDN=str,  # sub-domain.domain.domain-extension
@@ -193,6 +193,7 @@
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.locale.LocaleMiddleware',
+    # 'middlewares.middlewares.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -247,10 +248,10 @@
 }
 
 AUTH_PASSWORD_VALIDATORS = [
-    {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',  },
-    {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',  },
-    {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',  },
-    {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',  },
+    {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', },
+    {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', },
+    {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', },
+    {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', },
     {'NAME': 'main.validators.NumberValidator', },
     {'NAME': 'main.validators.UppercaseValidator', },
     {'NAME': 'main.validators.LowercaseValidator', },

middlewares/middlewares.py

@@ -30,6 +30,7 @@ def get_username():
 
 
 class RequestMiddleware:
+
     def __init__(self, get_response):
         self.get_response = get_response
         # One-time configuration and initialization.
@@ -51,7 +52,8 @@ def __call__(self, request):
         setattr(_threadlocal, "request", request)
         return self.get_response(request)
 
-    def process_view(self, request, view_function, *args, **kwargs):
+    @staticmethod
+    def process_view(request, view_function, *args, **kwargs):
         # NOTE: For POST raise error on non default language
         request_match = request.resolver_match
         reject_the_request = (

notifications/drf_views.py

@@ -42,7 +42,9 @@ def get_queryset(self):
         limit = 14  # days
         cond1 = Q(is_stood_down=True)
         cond2 = Q(end__lt=datetime.utcnow().replace(tzinfo=timezone.utc)-timedelta(days=limit))
-        return SurgeAlert.objects.exclude(cond1 & cond2)
+        return super().get_queryset().\
+            select_related('country').\
+            exclude(cond1 & cond2)  # 'event' inclusion ^ to _related needs frontend change, otherwise the Position column shows garbage in /alerts/all
 
 
 class SubscriptionViewset(viewsets.ModelViewSet):

notifications/serializers.py

@@ -1,14 +1,14 @@
 from rest_framework import serializers
 
-from api.serializers import MiniEventSerializer, ListEventSerializer, MiniCountrySerializer
+from api.serializers import MiniEventSerializer, SurgeEventSerializer, MiniCountrySerializer
 from lang.serializers import ModelSerializer
 
 from .models import SurgeAlert, Subscription
 from deployments.serializers import MolnixTagSerializer
 
 
 class SurgeAlertSerializer(ModelSerializer):
-    event = ListEventSerializer()
+    event = SurgeEventSerializer()
     country = MiniCountrySerializer()
     atype_display = serializers.CharField(source='get_atype_display', read_only=True)
     category_display = serializers.CharField(source='get_category_display', read_only=True)