Merge pull request #1683 from IFRCGo/develop

DREF hotfix and some small fixes

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.471
+
+### Added
+ - Hotfix for DREF permissions
+
 ## 1.1.470
 
 ### Added
@@ -2158,7 +2163,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.470...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.471...HEAD
+[1.1.471]: https://github.com/IFRCGo/go-api/compare/1.1.470...1.1.471
 [1.1.470]: https://github.com/IFRCGo/go-api/compare/1.1.469...1.1.470
 [1.1.469]: https://github.com/IFRCGo/go-api/compare/1.1.468...1.1.469
 [1.1.468]: https://github.com/IFRCGo/go-api/compare/1.1.467...1.1.468

api/drf_views.py

@@ -1095,6 +1095,7 @@ class GoHistoricalViewSet(viewsets.ReadOnlyModelViewSet):
     def get_queryset(self):
         return Event.objects.filter(appeals__isnull=False)
 
+
 class CountryOfFieldReportToReviewViewset(viewsets.ReadOnlyModelViewSet):
     queryset = CountryOfFieldReportToReview.objects.order_by('country')
     serializer_class = CountryOfFieldReportToReviewSerializer

api/serializers.py

@@ -652,7 +652,7 @@ def get_organizations_from(obj):
         deployments = [d for d in obj.personneldeployment_set.all()]
         personnels = []
         for d in deployments:
-            for p in d.personnel_set.filter(end_date__gte=timezone.now(), is_active=True):
+            for p in d.personnel_set.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now(), is_active=True):
                 personnels.append(p)
         return list(set([p.country_from.society_name for p in personnels if p.country_from and p.country_from.society_name != '']))
 

dref/admin.py

@@ -12,63 +12,68 @@
 
 @admin.register(DrefFile)
 class DrefFileAdmin(admin.ModelAdmin):
-    search_fields = ('file',)
+    search_fields = ("file",)
 
 
 @admin.register(Dref)
 class DrefAdmin(CompareVersionAdmin, TranslationAdmin, admin.ModelAdmin):
-    search_fields = ('title',)
-    list_display = ('title', 'national_society', 'disaster_type',
-                    'ns_request_date', 'submission_to_geneva', 'status',)
+    search_fields = ("title",)
+    list_display = (
+        "title",
+        "national_society",
+        "disaster_type",
+        "ns_request_date",
+        "submission_to_geneva",
+        "status",
+    )
     autocomplete_fields = (
-        'national_society',
-        'disaster_type',
-        'users',
-        'event_map',
-        'images',
-        'budget_file',
-        'cover_image',
+        "national_society",
+        "disaster_type",
+        "users",
+        "event_map",
+        "images",
+        "budget_file",
+        "cover_image",
     )
 
     def get_queryset(self, request):
-        return super().get_queryset(request).prefetch_related(
-            'planned_interventions',
-            'needs_identified',
-            'national_society_actions',
-            'users'
+        return (
+            super()
+            .get_queryset(request)
+            .prefetch_related("planned_interventions", "needs_identified", "national_society_actions", "users")
         )
 
 
 @admin.register(DrefOperationalUpdate)
 class DrefOperationalUpdateAdmin(CompareVersionAdmin, admin.ModelAdmin):
-    list_display = ('title', 'national_society', 'disaster_type')
+    list_display = ("title", "national_society", "disaster_type")
     autocomplete_fields = (
-        'national_society',
-        'disaster_type',
-        'images',
-        'users',
-        'event_map',
-        'images',
-        'budget_file',
-        'cover_image',
+        "national_society",
+        "disaster_type",
+        "images",
+        "users",
+        "event_map",
+        "images",
+        "budget_file",
+        "cover_image",
     )
-    list_filter = ['dref']
+    list_filter = ["dref"]
 
     def get_queryset(self, request):
-        return super().get_queryset(request).prefetch_related(
-            'planned_interventions',
-            'needs_identified',
-            'national_society_actions',
-            'users'
+        return (
+            super()
+            .get_queryset(request)
+            .prefetch_related("planned_interventions", "needs_identified", "national_society_actions", "users")
         )
 
+
 @admin.register(DrefFinalReport)
 class DrefFinalReportAdmin(CompareVersionAdmin, admin.ModelAdmin):
-    list_display = ('title', 'national_society', 'disaster_type')
+    list_display = ("title", "national_society", "disaster_type")
     autocomplete_fields = (
-        'national_society',
-        'disaster_type',
-        'photos',
+        "national_society",
+        "disaster_type",
+        "photos",
     )
-    list_filter = ['dref']
-    search_fields = ['title', 'national_society__name']
+    list_filter = ["dref"]
+    search_fields = ["title", "national_society__name"]

dref/apps.py

@@ -3,5 +3,5 @@
 
 
 class DrefConfig(AppConfig):
-    name = 'dref'
-    verbose_name = _('dref')
+    name = "dref"
+    verbose_name = _("dref")

dref/factories/dref.py

@@ -12,15 +12,15 @@
     DrefFile,
     DrefOperationalUpdate,
     DrefFinalReport,
-    PlannedInterventionIndicators
+    PlannedInterventionIndicators,
 )
 
 
 class DrefFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Dref
 
-    title = fuzzy.FuzzyText(length=50, prefix='title-')
+    title = fuzzy.FuzzyText(length=50, prefix="title-")
     type_of_onset = fuzzy.FuzzyChoice(Dref.OnsetType)
     disaster_category = fuzzy.FuzzyChoice(Dref.DisasterCategory)
     status = fuzzy.FuzzyChoice(Dref.Status)
@@ -75,18 +75,15 @@ class Meta:
         model = DrefFile
 
     file = factory.LazyAttribute(
-        lambda _: ContentFile(
-            factory.django.ImageField()._make_data(
-                {'width': 1024, 'height': 768}
-            ), 'dref.jpg'
-        )
+        lambda _: ContentFile(factory.django.ImageField()._make_data({"width": 1024, "height": 768}), "dref.jpg")
     )
 
 
 class PlannedInterventionIndicatorsFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = PlannedInterventionIndicators
-    title = fuzzy.FuzzyText(length=50, prefix='title-')
+
+    title = fuzzy.FuzzyText(length=50, prefix="title-")
 
 
 class PlannedInterventionFactory(factory.django.DjangoModelFactory):
@@ -122,7 +119,8 @@ class Meta:
 class DrefOperationalUpdateFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = DrefOperationalUpdate
-    title = fuzzy.FuzzyText(length=50, prefix='title-')
+
+    title = fuzzy.FuzzyText(length=50, prefix="title-")
     type_of_onset = fuzzy.FuzzyChoice(Dref.OnsetType)
     disaster_category = fuzzy.FuzzyChoice(Dref.DisasterCategory)
     national_society = factory.SubFactory(CountryFactory)
@@ -159,7 +157,7 @@ class DrefFinalReportFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = DrefFinalReport
 
-    title = fuzzy.FuzzyText(length=50, prefix='Final-Report-')
+    title = fuzzy.FuzzyText(length=50, prefix="Final-Report-")
     type_of_onset = fuzzy.FuzzyChoice(Dref.OnsetType)
     disaster_category = fuzzy.FuzzyChoice(Dref.DisasterCategory)
     national_society = factory.SubFactory(CountryFactory)

dref/filter_set.py

@@ -1,34 +1,25 @@
 import django_filters as filters
 
-from dref.models import (
-    Dref,
-    DrefOperationalUpdate
-)
+from dref.models import Dref, DrefOperationalUpdate
 from api.models import Country
 
 
 class DrefFilter(filters.FilterSet):
     status = filters.MultipleChoiceFilter(
         choices=Dref.Status.choices,
-        lookup_expr='in',
+        lookup_expr="in",
         widget=filters.widgets.CSVWidget,
     )
-    country = filters.ModelMultipleChoiceFilter(
-        field_name='country',
-        queryset=Country.objects.all()
-    )
+    country = filters.ModelMultipleChoiceFilter(field_name="country", queryset=Country.objects.all())
 
     class Meta:
         model = Dref
-        fields = ['is_published']
+        fields = ["is_published"]
 
 
 class DrefOperationalUpdateFilter(filters.FilterSet):
-    dref = filters.ModelMultipleChoiceFilter(
-        field_name='dref',
-        queryset=Dref.objects.all().distinct()
-    )
+    dref = filters.ModelMultipleChoiceFilter(field_name="dref", queryset=Dref.objects.all().distinct())
 
     class Meta:
         model = DrefOperationalUpdate
-        fields = ['is_published']
+        fields = ["is_published"]