Merge pull request #1635 from IFRCGo/develop

Release 1.1.466

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.466
+
+### Added
+ - DREF Final Report finalization + new features
+ - LocalUnits – first steps
+ - Event visibility fix
+
 ## 1.1.465
 
 ### Added
@@ -2126,7 +2133,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.465...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.466...HEAD
+[1.1.466]: https://github.com/IFRCGo/go-api/compare/1.1.465...1.1.466
 [1.1.465]: https://github.com/IFRCGo/go-api/compare/1.1.464...1.1.465
 [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

api/drf_views.py

@@ -18,6 +18,7 @@
 from deployments.models import Personnel
 from databank.serializers import CountryOverviewSerializer
 
+from .utils import is_user_ifrc
 from .event_sources import SOURCES
 from .exceptions import BadRequest
 from .view_filters import ListFilter
@@ -437,10 +438,20 @@ def retrieve(self, request, pk=None, *args, **kwargs):
         if pk:
             try:
                 if self.request.user.is_authenticated:
-                    if self.request.user.is_superuser:
+                    if is_user_ifrc(self.request.user):
                         instance = Event.objects.get(pk=pk)
                     else:
-                        instance = Event.objects.exclude(visibility=VisibilityChoices.IFRC).exclude(Q(visibility=VisibilityChoices.IFRC_NS) & ~Q(countries__id__in=UserCountry.objects.filter(user=self.request.user.id).values_list('country',flat=True).union(Profile.objects.filter(user=self.request.user.id).values_list('country',flat=True)))).get(pk=pk)
+                        user_countries = UserCountry.objects\
+                            .filter(user=request.user.id).values('country')\
+                            .union(
+                                Profile.objects.filter(user=request.user.id).values('country')
+                            )
+                        instance = Event.objects\
+                            .exclude(
+                                visibility=VisibilityChoices.IFRC)\
+                            .exclude(
+                                Q(visibility=VisibilityChoices.IFRC_NS) & ~Q(countries__id__in=user_countries))\
+                            .get(pk=pk)
                 else:
                     instance = Event.objects.filter(visibility=VisibilityChoices.PUBLIC).get(pk=pk)
                 # instance = Event.get_for(request.user).get(pk=pk)

api/management/commands/index_and_notify.py

@@ -479,11 +479,11 @@ def construct_template_record(self, rtype, record):
                 'gov_assistance': 'Yes' if record.request_assistance else 'No',
                 'ns_assistance': 'Yes' if record.ns_request_assistance else 'No',
                 'dtype_id': record.dtype_id,
-                'visibility': record.visibility,
+                'visibility': record.get_visibility_display(),
                 'other_fields': {
-                    'appeal': record.appeal,
+                    'appeal': record.get_appeal_display(),
                     'appeal_amount': record.appeal_amount,
-                    'bulletin': record.bulletin,
+                    'bulletin': record.get_bulletin_display(),
                     'countries': ', '.join(i.name for i in record.countries.all()),
                     'contacts': [{'ctype': c.ctype,
                                   'name': c.name,
@@ -492,59 +492,59 @@ def construct_template_record(self, rtype, record):
                                   'phone': c.phone} for c in record.contacts.all()[::-1]],
                     #not used this way, but shortened: 'description': record.description,
                     'districts': ', '.join(i.name for i in record.districts.all()),
-                    'dref': record.dref,
+                    'dref': record.get_dref_display(),
                     'dref_amount': record.dref_amount,
                     'epi_cases_since_last_fr': record.epi_cases_since_last_fr,
                     'epi_deaths_since_last_fr': record.epi_deaths_since_last_fr,
                     'epi_notes_since_last_fr': record.epi_notes_since_last_fr.split("\n") if record.epi_notes_since_last_fr else None,
-                    'eru_base_camp': record.eru_base_camp,
+                    'eru_base_camp': record.get_eru_base_camp_display(),
                     'eru_base_camp_units': record.eru_base_camp_units,
-                    'eru_basic_health_care': record.eru_basic_health_care,
+                    'eru_basic_health_care': record.get_eru_basic_health_care_display(),
                     'eru_basic_health_care_units': record.eru_basic_health_care_units,
-                    'eru_deployment_hospital': record.eru_deployment_hospital,
+                    'eru_deployment_hospital': record.get_eru_deployment_hospital_display(),
                     'eru_deployment_hospital_units': record.eru_deployment_hospital_units,
-                    'eru_it_telecom': record.eru_it_telecom,
+                    'eru_it_telecom': record.get_eru_it_telecom_display(),
                     'eru_it_telecom_units': record.eru_it_telecom_units,
-                    'eru_logistics': record.eru_logistics,
+                    'eru_logistics': record.get_eru_logistics_display(),
                     'eru_logistics_units': record.eru_logistics_units,
-                    'eru_referral_hospital': record.eru_referral_hospital,
+                    'eru_referral_hospital': record.get_eru_referral_hospital_display(),
                     'eru_referral_hospital_units': record.eru_referral_hospital_units,
-                    'eru_relief': record.eru_relief,
+                    'eru_relief': record.get_eru_relief_display(),
                     'eru_relief_units': record.eru_relief_units,
-                    'eru_water_sanitation_15': record.eru_water_sanitation_15,
+                    'eru_water_sanitation_15': record.get_eru_water_sanitation_15_display(),
                     'eru_water_sanitation_15_units': record.eru_water_sanitation_15_units,
-                    'eru_water_sanitation_20': record.eru_water_sanitation_20,
+                    'eru_water_sanitation_20': record.get_eru_water_sanitation_20_display(),
                     'eru_water_sanitation_20_units': record.eru_water_sanitation_20_units,
-                    'eru_water_sanitation_40': record.eru_water_sanitation_40,
+                    'eru_water_sanitation_40': record.get_eru_water_sanitation_40_display(),
                     'eru_water_sanitation_40_units': record.eru_water_sanitation_40_units,
                     'event': record.event,
                     'external_partners': ', '.join(i.name for i in record.external_partners.all()),
-                    'forecast_based_action': record.forecast_based_action,
+                    'forecast_based_action': record.get_forecast_based_action_display(),
                     'forecast_based_action_amount': record.forecast_based_action_amount,
-                    'imminent_dref': record.imminent_dref,
+                    'imminent_dref': record.get_imminent_dref_display(),
                     'imminent_dref_amount': record.imminent_dref_amount,
                     'notes_health': record.notes_health,
                     'notes_ns': record.notes_ns,
                     'notes_socioeco': record.notes_socioeco,
                     'other_sources': record.other_sources.split("\n") if record.other_sources else None,
                     'start_date': record.start_date,
                     'supported_activities': ', '.join(i.name for i in record.supported_activities.all()),
-                    # not used: 'fact': record.fact,
+                    # not used: 'fact': record.fact, !get_..._display!
                     # not used: 'affected_pop_centres': record.affected_pop_centres,
                     # not used: 'gov_affected_pop_centres': record.gov_affected_pop_centres,
                     # not used: 'gov_num_highest_risk': record.gov_num_highest_risk,
                     # not used: 'gov_num_potentially_affected': record.gov_num_potentially_affected,
                     # not used: 'health_min_num_assisted': record.health_min_num_assisted,
                     # not used: 'who_num_assisted': record.who_num_assisted,
-                    # not used: 'ifrc_staff': record.ifrc_staff,
+                    # not used: 'ifrc_staff': record.ifrc_staff, !get_..._display!
                     # not used: 'is_covid_report': record.is_covid_report,
                     # not used: 'num_expats_delegates': record.num_expats_delegates,
                     # not used: 'num_fact': record.num_fact,
                     # not used: 'num_highest_risk': record.num_highest_risk,
                     # not used: 'num_ifrc_staff': record.num_ifrc_staff,
                     # not used: 'num_localstaff': record.num_localstaff,
                     # not used: 'num_potentially_affected': record.num_potentially_affected,
-                    # not used: 'rdrt': record.rdrt,
+                    # not used: 'rdrt': record.rdrt, !get_..._display!
                     # not used: 'num_rdrt': record.num_rdrt,
                     # not used: 'num_volunteers': record.num_volunteers,
                     # not used: 'other_affected_pop_centres': record.other_affected_pop_centres,
@@ -727,7 +727,7 @@ def notify(self, records, rtype, stype, uid=None):
             # Handle Visibility for Field Reports
             if rtype == RecordType.FIELD_REPORT:
                 rtype_of_subscr, stype = self.fix_types_for_subs(rtype, stype)
-                non_ifrc_records = [rec for rec in record_entries if int(rec['visibility']) != 2]
+                non_ifrc_records = [rec for rec in record_entries if rec['visibility'] != 'IFRC Only']
                 if non_ifrc_records:
                     non_ifrc_filters = (Q(subscription__rtype=rtype_of_subscr) &
                                         Q(subscription__stype=stype) &

main/__init__.py

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

mapbox/admin2/COL-centroids.json

@@ -4,7 +4,7 @@
       "go-admin2-COL-centroids": {
         "source": "mapbox://tileset-source/go-ifrc/go-admin2-COL-centroids-src",
         "minzoom": 5,
-        "maxzoom": 14
+        "maxzoom": 10
       }
     }
   }

mapbox/admin2/COL-staging.json

@@ -4,7 +4,7 @@
       "go-admin2-COL-staging": {
         "source": "mapbox://tileset-source/go-ifrc/go-admin2-COL-src-staging",
         "minzoom": 5,
-        "maxzoom": 14
+        "maxzoom": 10
       }
     }
   }

mapbox/admin2/COL.json

@@ -4,7 +4,7 @@
       "go-admin2-COL": {
         "source": "mapbox://tileset-source/go-ifrc/go-admin2-COL-src",
         "minzoom": 5,
-        "maxzoom": 14
+        "maxzoom": 10
       }
     }
   }

mapbox/admin2/GTM-centroids.json

@@ -4,7 +4,7 @@
       "go-admin2-GTM-centroids": {
         "source": "mapbox://tileset-source/go-ifrc/go-admin2-GTM-centroids-src",
         "minzoom": 5,
-        "maxzoom": 14
+        "maxzoom": 10
       }
     }
   }

mapbox/admin2/GTM-staging.json

@@ -4,7 +4,7 @@
       "go-admin2-GTM-staging": {
         "source": "mapbox://tileset-source/go-ifrc/go-admin2-GTM-src-staging",
         "minzoom": 5,
-        "maxzoom": 14
+        "maxzoom": 10
       }
     }
   }

mapbox/admin2/GTM.json

@@ -4,7 +4,7 @@
       "go-admin2-GTM": {
         "source": "mapbox://tileset-source/go-ifrc/go-admin2-GTM-src",
         "minzoom": 5,
-        "maxzoom": 14
+        "maxzoom": 10
       }
     }
   }