Merge pull request #1608 from IFRCGo/develop

Release 1.1.463

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.463
+
+### Added
+ - DREF Final report, v0.1
+ - Ops Update: optimistic lock
+ - Dropping non-used enum Choices
+ - Fix filter in DREF
+ - Admin page: search possibility of Admin2 countries
+
 ## 1.1.462
 
 ### Added
@@ -2105,7 +2114,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.462...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.463...HEAD
+[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
 [1.1.460]: https://github.com/IFRCGo/go-api/compare/1.1.459...1.1.460

README.md

@@ -225,7 +225,7 @@ The shapefile should have the following mandatory fields:
 * admin1_id (this is the ID of the GO district this admin2 belongs to)
 
 See [this ticket](https://github.com/IFRCGo/go-api/issues/1492#issuecomment-1284120696) for a full workflow of preparing the admin2 shapefiles.
-The above command will generate a list of missing admin2s in the database based on the code (we use pcodes) to a file called `missing-admin2.txt`
+The above command will generate a list of missing admin2-s in the database based on the code (we use pcodes) to a file called `missing-admin2.txt`
 
 ### Options available for the command
 * `--update-geom` -- updates the geometry for all admin2 matched in the shapefile.
@@ -237,13 +237,13 @@ The above command will generate a list of missing admin2s in the database based
 Run `python manage.py update-region-bbox` to update the bbox for each region in the database.
 
 ## Import FDRS codes
-Run `python manage.py import-fdrs iso-fdrs.csv` to update the countries table with FDRS codes. The csv should have `iso,fdrs` structure
+Run `python manage.py import-fdrs iso-fdrs.csv` to update the countries table with FDRS codes. The csv should have `iso, fdrs` structure
 
 ## Update sovereign state and disputed status
-Run ` python manage.py update-sovereign-and-disputed new_fields.csv` to update the countries table with sovereign states and disputed status. The CSV should have the `id,iso,name,sovereign_state,disputed` columns. The matching is based on iso and name. If iso is null, we fallback to name.
+Run ` python manage.py update-sovereign-and-disputed new_fields.csv` to update the countries table with sovereign states and disputed status. The CSV should have the `id,iso,name,sovereign_state,disputed` columns. The matching is based on iso and name. If iso is null, we fall back to name.
 
 ## Update Mapbox Tilesets
-To update GO countries and districts Mapbox tilesets, run the management command `python manage.py update-mapbox-tilesets`. This will export all country and district geometries to a GeoJSON file, and then upload them to Mapbox. The tilesets will take a while to process. The updated status can be viewed on the Mapbox Studio under tilesets. To run this management command, MAPBOX_ACCESS_TOKEN should be set in the environment.
+To update GO countries and districts Mapbox tilesets, run the management command `python manage.py update-mapbox-tilesets`. This will export all country and district geometries to a GeoJSON file, and then upload them to Mapbox. The tilesets will take a while to process. The updated status can be viewed on the Mapbox Studio under tilesets. To run this management command, MAPBOX_ACCESS_TOKEN should be set in the environment. The referred files are in ./mapbox/..., so you should **not** run this command from an arbitrary point of the vm's filesystem (e.g. from the location of shapefiles), but from Django root.
 
 ### Options available for the command
 * `--production` — update production tilesets. If this flag is not set, by default the script will only update staging tiles

api/admin.py

@@ -245,24 +245,6 @@ def field_reports(self, instance):
         return mark_safe('<span class="errors">No related field reports</span>')
     field_reports.short_description = 'Field Reports'
 
-# For multiple document fields inline. TO be FIXED: only the last one is saved. Change also tabular.html (DELETEME)
-#   def save_formset(self, request, form, formset, change):
-#       if hasattr(formset.model, 'document'): # SituationReports (or other similars)
-#           instances = formset.save(commit=False)
-#           for inst in formset.deleted_objects:
-#               inst.delete()
-#           for inst in formset.changed_objects:
-#               inst.save()
-#           for inst in formset.new_objects:
-#               for i,one_document in enumerate(request.FILES.getlist('documents_multiple')):
-#                   if i<30: # not letting tons of documents to be attached
-#                       inst.name     = inst.name if i == 0 else inst.name + '-' + str(i)
-#                       inst.document = one_document
-#                       inst.save()
-#           formset.save_m2m()
-#       else:
-#           formset.save()
-
 
 class GdacsAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):
     country_in = 'countries__pk__in'
@@ -550,10 +532,12 @@ class RegionAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAdm
     search_fields = ('name',)
     modifiable = True
 
+
 class Admin2Admin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAdmin):
-    search_fields = ('name',)
+    search_fields = ('name', 'admin1__country__name')
     modifiable = True
 
+
 class UserProfileAdmin(CompareVersionAdmin):
     search_fields = ('user__username', 'user__email', 'country__name',)
     list_filter = (

deployments/models.py

@@ -9,11 +9,9 @@
 from django.utils.hashable import make_hashable
 from django.utils.encoding import force_str
 from django.contrib.postgres.fields import ArrayField
-from django.contrib.gis.db import models as gid_models
 from django.db.models import Q
 from django.db.models import JSONField
 
-from main.enums import TextChoices
 from api.models import (
     District,
     Country,

dref/filter_set.py

@@ -14,7 +14,7 @@ class DrefFilter(filters.FilterSet):
         widget=filters.widgets.CSVWidget,
     )
     country = filters.ModelMultipleChoiceFilter(
-        field_name='drefcountrydistrict__country',
+        field_name='country',
         queryset=Country.objects.all()
     )
 

dref/models.py

@@ -689,7 +689,11 @@ def clone(self, user):
 
 class DrefOperationalUpdate(models.Model):
     created_at = models.DateTimeField(verbose_name=_('created at'), auto_now_add=True)
-    modified_at = models.DateTimeField(verbose_name=_('modified at'), auto_now=True)
+    modified_at = models.DateTimeField(
+        verbose_name=_('modified at'),
+        auto_now=True,
+        blank=True
+    )
     created_by = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         verbose_name=_('created by'),

dref/serializers.py

@@ -3,6 +3,7 @@
 
 from django.utils.translation import gettext
 from django.db import models, transaction
+from django.conf import settings
 
 from rest_framework import serializers
 
@@ -184,7 +185,6 @@ class DrefSerializer(
     ALLOWED_ASSESSMENT_REPORT_EXTENSIONS = ["pdf", "docx", "pptx"]
     MAX_OPERATION_TIMEFRAME = 30
     ASSESSMENT_REPORT_MAX_OPERATION_TIMEFRAME = 2
-    DREF_UPDATE_ERROR_MESSAGE = "OBSOLETE_PAYLOAD"
     national_society_actions = NationalSocietyActionSerializer(many=True, required=False)
     needs_identified = IdentifiedNeedSerializer(many=True, required=False)
     planned_interventions = PlannedInterventionSerializer(many=True, required=False)
@@ -349,7 +349,7 @@ def update(self, instance, validated_data):
         is_assessment_report = validated_data.get('is_assessment_report')
         modified_at = validated_data.pop('modified_at', None)
         if modified_at is None:
-            raise serializers.ValidationError({ 'modified_at': 'Modified At is required!' })
+            raise serializers.ValidationError({'modified_at': 'Modified At is required!'})
         if is_assessment_report:
             # Previous Operations
             validated_data['lessons_learned'] = None
@@ -383,7 +383,7 @@ def update(self, instance, validated_data):
         else:
             to = None
         if modified_at and instance.modified_at and modified_at < instance.modified_at:
-            raise serializers.ValidationError({ 'modified_at': self.DREF_UPDATE_ERROR_MESSAGE })
+            raise serializers.ValidationError({'modified_at': settings.DREF_OP_UPDATE_UPDATE_ERROR_MESSAGE})
         dref = super().update(instance, validated_data)
         if to:
             transaction.on_commit(
@@ -414,6 +414,7 @@ class DrefOperationalUpdateSerializer(
     district_details = MiniDistrictSerializer(source='district', read_only=True, many=True)
     assessment_report_file = DrefFileSerializer(source='assessment_report', required=False, allow_null=True)
     risk_security = RiskSecuritySerializer(many=True, required=False)
+    modified_at = serializers.DateTimeField(required=False)
 
     class Meta:
         model = DrefOperationalUpdate
@@ -656,6 +657,9 @@ def update(self, instance, validated_data):
         dref_target_population_of_operation = validated_data.get('dref', instance.dref).total_targeted_population
         dref_amount_requested = validated_data.get('dref', instance.dref).amount_requested
         dref_district = validated_data.get('dref', instance.dref).district.all()
+        modified_at = validated_data.pop('modified_at', None)
+        if modified_at is None:
+            raise serializers.ValidationError({'modified_at': 'Modified At is required!'})
 
         if (not changing_timeframe_operation) and total_operation_timeframe and dref_operation_timeframe and\
         total_operation_timeframe != dref_operation_timeframe:
@@ -682,6 +686,8 @@ def update(self, instance, validated_data):
         if changing_geographic_location and district and dref_district and set(district) == set(dref_district):
             raise serializers.ValidationError('Found same district for dref and operational update with changing set to true')
 
+        if modified_at and instance.modified_at and modified_at < instance.modified_at:
+            raise serializers.ValidationError({'modified_at': settings.DREF_OP_UPDATE_UPDATE_ERROR_MESSAGE})
         return super().update(instance, validated_data)
 
 

dref/test_views.py

@@ -426,6 +426,35 @@ def test_filter_dref_status(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 2)
 
+    def test_dref_country_filter(self):
+        country1 = Country.objects.create(name='country1')
+        country2 = Country.objects.create(name='country2')
+        DrefFactory.create(
+            title='test',
+            status=Dref.Status.COMPLETED,
+            created_by=self.user,
+            country=country1
+        )
+        DrefFactory.create(
+            status=Dref.Status.COMPLETED, created_by=self.user
+        )
+        DrefFactory.create(
+            status=Dref.Status.COMPLETED,
+            created_by=self.user,
+            country=country2
+        )
+        DrefFactory.create(
+            status=Dref.Status.IN_PROGRESS,
+            created_by=self.user,
+            country=country1
+        )
+        DrefFactory.create(status=Dref.Status.IN_PROGRESS, created_by=self.user)
+        url = f'/api/v2/dref/?country={country1.id}'
+        self.client.force_authenticate(self.user)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data['results']), 2)
+
     def test_dref_options(self):
         """
         Test for various dref attributes
@@ -591,6 +620,7 @@ def test_dref_operational_update_patch(self):
             'new_operational_end_date': '2022-10-10',
             'reporting_timeframe': '2022-10-16',
             'is_timeframe_extension_required': True,
+            'modified_at': datetime.now() + timedelta(days=12),
         }
         url = f'/api/v2/dref-op-update/{response_id}/'
         self.authenticate(user=user1)
@@ -891,3 +921,42 @@ def test_dref_latest_update(self):
         self.assertEqual(response.status_code, 200)
         # Title should be latest since modified_at is greater than modified_at in database
         self.assertEqual(response.data['title'], "New title")
+
+    def test_dref_op_update_locking(self):
+        user1, _ = UserFactory.create_batch(2)
+        dref = DrefFactory.create(
+            title='Test Title', created_by=user1,
+            is_published=True,
+        )
+        dref.users.add(user1)
+        DrefOperationalUpdateFactory.create(
+            dref=dref,
+            is_published=True,
+            operational_update_number=1,
+            modified_at=datetime.now()
+        )
+        url = '/api/v2/dref-op-update/'
+        data = {
+            'dref': dref.id,
+        }
+        self.authenticate(user=user1)
+        response = self.client.post(url, data=data)
+        self.assert_201(response)
+        response_id = response.data['id']
+
+        # without `modified_at`
+        data = {
+            'title': 'New Operation title',
+            'new_operational_end_date': '2022-10-10',
+            'reporting_timeframe': '2022-10-16',
+            'is_timeframe_extension_required': True,
+        }
+        url = f'/api/v2/dref-op-update/{response_id}/'
+        self.authenticate(user=user1)
+        response = self.client.patch(url, data)
+        self.assert_400(response)
+
+        # with `modified_at` less than instance `modified_at`
+        data['modified_at'] = datetime.now() - timedelta(days=2)
+        response = self.client.patch(url, data=data)
+        self.assertEqual(response.status_code, 400)

dref/views.py

@@ -32,7 +32,6 @@
     DrefFilter,
     DrefOperationalUpdateFilter
 )
-from dref.permissions import DrefOperationalUpdateCreatePermission
 
 
 class DrefViewSet(RevisionMixin, viewsets.ModelViewSet):
@@ -71,7 +70,7 @@ def get_published(self, request, pk=None, version=None):
 
 class DrefOperationalUpdateViewSet(RevisionMixin, viewsets.ModelViewSet):
     serializer_class = DrefOperationalUpdateSerializer
-    permission_classes = [permissions.IsAuthenticated, DrefOperationalUpdateCreatePermission]
+    permission_classes = [permissions.IsAuthenticated]
     filterset_class = DrefOperationalUpdateFilter
 
     def get_queryset(self):

eap/models.py

@@ -1,10 +1,6 @@
 from django.db import models
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
-
-from main.enums import TextChoices
-from deployments.models import Sectors
-from main.enums import IntegerChoices
 from api.models import (
     Country,
     District,
@@ -13,7 +9,7 @@
 
 
 class EarlyActionIndicator(models.Model):
-    class IndicatorChoices(TextChoices):  # TODO these indicator are yet to be provided by client.
+    class IndicatorChoices(models.TextChoices):  # TODO these indicator are yet to be provided by client.
         INDICATOR_1 = 'indicator_1', _('Indicator 1')
         INDICATOR_2 = 'indicator_2', _('Indicator 2')
 
@@ -32,7 +28,7 @@ def __str__(self):
 
 
 class EarlyAction(models.Model):
-    class Sector(IntegerChoices):
+    class Sector(models.IntegerChoices):
         SHELTER_HOUSING_AND_SETTLEMENTS = 0, _('Shelter, Housing And Settlements')
         LIVELIHOODS = 1, _('Livelihoods')
         MULTI_PURPOSE_CASH = 2, _('Multi-purpose Cash')
@@ -67,7 +63,7 @@ def __str__(self):
 
 
 class EAP(models.Model):
-    class Status(TextChoices):  # TODO some more status choices are to be expected by client.
+    class Status(models.TextChoices):  # TODO some more status choices are to be expected by client.
         APPROVED = 'approved', _('Approved')
         IN_PROCESS = 'in_process', _('In Process')