Merge pull request #1845 from IFRCGo/develop

Release 1.1.483 (July 2023)

Author: szabozoltan69

.circleci/config.yml

@@ -26,7 +26,7 @@ jobs:
       - run:
           name: Run tests
           command: |
-            docker-compose run --rm serve ./manage.py test --keepdb -v 2 --pattern="test_fake.py" &&
+            time docker-compose run --rm serve ./manage.py test --keepdb -v 2 --pattern="test_fake.py" &&
             docker-compose run --rm serve pytest --reuse-db --durations=10
       - run:
           name: Push image to Docker Hub

CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.483
+
+### Added
+ - Add global endpoint for fetching enums
+ - Update logic for new translation API
+ - Replace old doc page with redoc (OpenAPI)
+ - Add OpenAPI endpoint using drf_yasg
+ - Rename DREF serializer to active
+ - Fix Project CSV importing
+
 ## 1.1.482
  - Add more columns to AppealDocument Admin list
  - Put back caching
@@ -2252,7 +2262,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.482...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.483...HEAD
+[1.1.483]: https://github.com/IFRCGo/go-api/compare/1.1.482...1.1.483
 [1.1.482]: https://github.com/IFRCGo/go-api/compare/1.1.481...1.1.482
 [1.1.481]: https://github.com/IFRCGo/go-api/compare/1.1.480...1.1.481
 [1.1.480]: https://github.com/IFRCGo/go-api/compare/1.1.479...1.1.480

api/drf_views.py

@@ -2,6 +2,7 @@
 from pytz import utc
 from rest_framework.status import HTTP_201_CREATED, HTTP_200_OK
 from rest_framework.generics import GenericAPIView, CreateAPIView, UpdateAPIView
+from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework.authentication import TokenAuthentication
 from rest_framework.permissions import IsAuthenticated
@@ -13,8 +14,12 @@
 from django.db import models
 from django.db.models import Prefetch, Count, Q, OuterRef
 from django.utils import timezone
+from django.utils.translation import get_language as django_get_language
+from drf_spectacular.utils import extend_schema
 
 from main.utils import is_tableau
+from main.enums import GlobalEnumSerializer, get_enum_values
+from main.translation import TRANSLATOR_ORIGINAL_LANGUAGE_FIELD_NAME
 from deployments.models import Personnel
 from databank.serializers import CountryOverviewSerializer
 
@@ -1000,7 +1005,9 @@ def save_meta(self, fieldreport, meta, is_update=False):
             for action_taken in meta["actions_taken"]:
                 actions = action_taken["actions"]
                 del action_taken["actions"]
+                action_taken[TRANSLATOR_ORIGINAL_LANGUAGE_FIELD_NAME] = django_get_language()
                 actions_taken = ActionsTaken.objects.create(field_report=fieldreport, **action_taken)
+                CreateFieldReportSerializer.trigger_field_translation(actions_taken)
                 actions_taken.actions.add(*actions)
 
         if "contacts" in meta:
@@ -1030,7 +1037,9 @@ def create_event(self, report):
             auto_generated=True,
             auto_generated_source=SOURCES["new_report"],
             visibility=report.visibility,
+            **{TRANSLATOR_ORIGINAL_LANGUAGE_FIELD_NAME: django_get_language()},
         )
+        CreateFieldReportSerializer.trigger_field_translation(event)
         report.event = event
         report.save()
         return event
@@ -1049,7 +1058,10 @@ def create(self, request, *args, **kwargs):
 
         try:
             # TODO: Use serializer to create fieldreport
-            fieldreport = FieldReport.objects.create(**data)
+            data[TRANSLATOR_ORIGINAL_LANGUAGE_FIELD_NAME] = django_get_language()
+            fieldreport = FieldReport.objects.create(
+                **data,
+            )
             CreateFieldReportSerializer.trigger_field_translation(fieldreport)
         except Exception as e:
             try:
@@ -1185,3 +1197,16 @@ class UsersViewset(viewsets.ReadOnlyModelViewSet):
 
     def get_queryset(self):
         return User.objects.filter(is_active=True)
+
+
+class GlobalEnumView(APIView):
+    """
+    Provide a single endpoint to fetch enum metadata
+    """
+
+    @extend_schema(responses=GlobalEnumSerializer)
+    def get(self, _):
+        """
+        Return a list of all enums.
+        """
+        return Response(get_enum_values())

api/enums.py

@@ -0,0 +1,21 @@
+from . import models
+
+enum_register = {
+    'region_name': models.RegionName,
+    'country_type': models.CountryType,
+    'visibility_choices': models.VisibilityChoices,
+    'visibility_char_choices': models.VisibilityCharChoices,
+    'position_type': models.PositionType,
+    'tab_number': models.TabNumber,
+    'alert_level': models.AlertLevel,
+    'appeal_type': models.AppealType,
+    'appeal_status': models.AppealStatus,
+    'request_choices': models.RequestChoices,
+    'episource_choices': models.EPISourceChoices,
+    'field_report_status': models.FieldReport.Status,
+    'field_report_recent_affected': models.FieldReport.RecentAffected,
+    'action_org': models.ActionOrg,
+    'action_type': models.ActionType,
+    'action_category': models.ActionCategory,
+    'profile_org_types': models.Profile.OrgTypes,
+}

api/management/commands/index_and_notify.py

@@ -609,6 +609,7 @@ def construct_template_record(self, rtype, record):
             }
         elif rtype == RecordType.WEEKLY_DIGEST:
             rec_obj = {
+                'resource_uri': settings.FRONTEND_URL,
                 'active_dref': self.get_weekly_digest_data('dref'),
                 'active_ea': self.get_weekly_digest_data('ea'),
                 'funding_coverage': self.get_weekly_digest_data('fund'),
@@ -647,7 +648,7 @@ def notify(self, records, rtype, stype, uid=None):
 
         # Decide if it is a personal notification or batch
         if uid is None:
-            emails = self.gather_subscribers(records, rtype, stype)
+            emails = list(set(self.gather_subscribers(records, rtype, stype)))
             if not len(emails):
                 return
         else: