Merge pull request #1600 from IFRCGo/develop

Introducing Country Plans

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.461
+
+### Added
+ - Introducing COUNTRY PLANs
+ - Only active users to be shown in DREF forms (for sharing)
+ - Add centroid processing for Admin2
+ - DREF Ops Update validation fixes
+ - Update snapshottest to 0.6.0 (and other small modules)
+
 ## 1.1.460
 
 ### Added
@@ -2090,7 +2099,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.460...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.461...HEAD
+[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
 [1.1.459]: https://github.com/IFRCGo/go-api/compare/1.1.458...1.1.459
 [1.1.458]: https://github.com/IFRCGo/go-api/compare/1.1.457...1.1.458

README.md

@@ -250,7 +250,7 @@ To update GO countries and districts Mapbox tilesets, run the management command
 * `--update-countries` — update tileset for countries, including labels
 * `--update-districts` — update tileset for districts, including labels
 * `--update-all` — update all countries and districts tilesets
-* `--create-and-update-admin2 <ISO3>` — if a new admin2 tileset should be created, use this argument. It will create a new source on Mapbox and then register a tileset. Ensure that a recipe is create in `mapbox/admin2/` directory. For example, see `mapbox/admin2/COL.json`. To run `python manage.py update-mapbox-tilesets --create-and-update-admin2 COL`
+* `--create-and-update-admin2 <ISO3>` — if a new admin2 tileset should be created, use this argument. It will create a new source on Mapbox and then register a tileset. Ensure that recipes are create in `mapbox/admin2/` directory. For example, see `mapbox/admin2/COL.json` and `mapbox/admin2/COL-centroids.json`. A recipe for polygons and centroids are required. For centroids, we don't need to create a staging recipe.  To run `python manage.py update-mapbox-tilesets --create-and-update-admin2 COL`
 * `--update-admin2 <ISO3>` — use this to update an existing admin2 tileset. For example, `python manage.py update-mapbox-tilesets --update-admin2 COL`
 
 ## Import GEC codes

api/admin.py

@@ -526,7 +526,7 @@ class DistrictAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedA
 
 class CountryAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):
     country_in = 'pk__in'
-    list_display = ('__str__', 'record_type')
+    list_display = ('__str__', 'record_type', 'iso3')
     region_in = 'region__pk__in'
     list_editable = ('record_type',)
     search_fields = ('name',)

api/drf_views.py

@@ -11,7 +11,7 @@
 from django_filters import rest_framework as filters
 from django.contrib.auth.models import User
 from django.db import models
-from django.db.models import Prefetch, Count, Q
+from django.db.models import Prefetch, Count, Q, OuterRef
 from django.utils import timezone
 
 from main.utils import is_tableau
@@ -61,6 +61,8 @@
     CountryOfFieldReportToReview,
 )
 
+from country_plan.models import CountryPlan
+
 from .serializers import (
     ActionSerializer,
     DisasterTypeSerializer,
@@ -167,7 +169,11 @@ class DisasterTypeViewset(viewsets.ReadOnlyModelViewSet):
 
 
 class RegionViewset(viewsets.ReadOnlyModelViewSet):
-    queryset = Region.objects.all()
+    queryset = Region.objects.annotate(
+        country_plan_count=Count(
+            'country__country_plan', filter=Q(country__country_plan__is_publish=True)
+        )
+    )
 
     def get_serializer_class(self):
         if self.action == 'list':
@@ -185,17 +191,20 @@ class Meta:
 
 
 class CountryViewset(viewsets.ReadOnlyModelViewSet):
-    queryset = Country.objects.filter(is_deprecated=False)
+    queryset = Country.objects.filter(is_deprecated=False).annotate(
+        has_country_plan=models.Exists(CountryPlan.objects.filter(country=OuterRef('pk'), is_publish=True))
+    )
     filterset_class = CountryFilter
     search_fields = ('name',)  # for /docs
 
     def get_object(self):
         pk = self.kwargs['pk']
+        qs = self.get_queryset()
         try:
-            return Country.objects.get(pk=int(pk))
+            return qs.get(pk=int(pk))
         except ValueError:
             # NOTE: If pk is not integer try searching for name or iso
-            country = Country.objects.filter(
+            country = qs.filter(
                 models.Q(name__iexact=str(pk)) | models.Q(iso__iexact=str(pk))
             )
             if country.exists():

api/management/commands/update-mapbox-tilesets.py

@@ -206,28 +206,40 @@ def create_and_update_admin2(self, iso, staging=True):
     if (status):
       update_status = self.update_admin2(iso, staging)
       if (update_status):
-        tileset_name = f'go-ifrc.go-admin2-{iso}-staging'
-        recipe_name = f'mapbox/admin2/{iso}-staging.json'
+        polygon_tileset_name = f'go-ifrc.go-admin2-{iso}-staging'
+        polygon_recipe_name = f'mapbox/admin2/{iso}-staging.json'
+        centroids_tileset_name = f'go-ifrc.go-admin2-{iso}-centroids'
+        centroids_recipe_name = f'mapbox/admin2/{iso}-centroids.json'
         if not staging:
-          tileset_name = f'go-ifrc.go-admin2-{iso}'
-          recipe_name = f'mapbox/admin2/{iso}.json'
+          polygon_tileset_name = f'go-ifrc.go-admin2-{iso}'
+          polygon_recipe_name = f'mapbox/admin2/{iso}.json'
+
+        create_status = subprocess.run(['tilesets', 'create', polygon_tileset_name, '--recipe', polygon_recipe_name, '--name', f'GO Admin2 {iso}'])
+
+        if create_status:
+          create_status = subprocess.run(['tilesets', 'create', centroids_tileset_name, '--recipe', centroids_recipe_name, '--name', f'GO Admin2 {iso} Centroids'])
 
-        create_status = subprocess.run(['tilesets', 'create', tileset_name, '--recipe', recipe_name, '--name', f'GO Admin2 {iso}'])
         if create_status:
           publish_status = self.publish_admin2(iso, staging, create=True)
         return publish_status
 
   def update_admin2(self, iso, staging=True):
     # update tileset source
     # update tileset and publish
-    tileset_source__name = f'go-admin2-{iso}-src-staging'
+    polygon_tileset_source__name = f'go-admin2-{iso}-src-staging'
+    centroids_tileset_source_name = f'go-admin2-{iso}-centroids-src'
     if not staging:
-      tileset_source__name = f'go-admin2-{iso}-src'
+      polygon_tileset_source__name = f'go-admin2-{iso}-src'
 
-    print('Tileset source', tileset_source__name)
+    print('Tileset source', polygon_tileset_source__name)
+    print('Tileset source centroids', centroids_tileset_source_name)
     status = self.prepare_admin2_geojson(iso)
     if status:
-      status = subprocess.run(['tilesets', 'upload-source', '--replace', 'go-ifrc', tileset_source__name, f'/tmp/{iso}.geojson'])
+      status = subprocess.run(['tilesets', 'upload-source', '--replace', 'go-ifrc', polygon_tileset_source__name, f'/tmp/{iso}.geojson'])
+
+    if status:
+      status = subprocess.run(['tilesets', 'upload-source', '--replace', 'go-ifrc', centroids_tileset_source_name, f'/tmp/{iso}-centroids.geojson'])
+
     return True if status.returncode == 0 else False
 
   def publish_admin2(self, iso, staging=True, create=False):
@@ -237,11 +249,13 @@ def publish_admin2(self, iso, staging=True, create=False):
       update_status = True
 
     if update_status:
-      tileset_name = f'go-ifrc.go-admin2-{iso}-staging'
+      polygon_tileset_name = f'go-ifrc.go-admin2-{iso}-staging'
+      centroids_tileset_name = f'go-ifrc.go-admin2-{iso}-centroids'
       if not staging:
-        tileset_name = f'go-ifrc.go-admin2-{iso}'
+        polygon_tileset_name = f'go-ifrc.go-admin2-{iso}'
 
-      publish_status = subprocess.run(['tilesets', 'publish', tileset_name])
+      publish_status = subprocess.run(['tilesets', 'publish', polygon_tileset_name])
+      publish_status = subprocess.run(['tilesets', 'publish', centroids_tileset_name])
       return True if publish_status.returncode == 0 else False
     else:
       return False
@@ -254,5 +268,7 @@ def prepare_admin2_geojson(self, iso):
       pass
 
     status = subprocess.run(['ogr2ogr', '-f', 'GeoJSON', f'/tmp/{iso}.geojson', self.connection_string, '-sql', f'select d.id as admin1_id, d.name as admin1_name, ad.name, ad.id, adg.geom from api_country as c, api_district as d, api_admin2 as ad, api_admin2geoms as adg where c.id=d.country_id and c.iso3=\'{iso}\' and ad.admin1_id=d.id and adg.admin2_id = ad.id'])
+    if status:
+      status = subprocess.run(['ogr2ogr', '-f', 'GeoJSON', f'/tmp/{iso}-centroids.geojson', self.connection_string, '-sql', f'select d.id as admin1_id, d.name as admin1_name, ad.name, ad.id, ad.centroid from api_country as c, api_district as d, api_admin2 as ad where c.id=d.country_id and c.iso3=\'{iso}\' and ad.admin1_id=d.id'])
 
     return True if status.returncode == 0 else False

api/serializers.py

@@ -357,6 +357,7 @@ class RegionRelationSerializer(ModelSerializer):
     preparedness_snippets = RegionPreparednessSnippetSerializer(many=True, read_only=True)
     national_society_count = serializers.SerializerMethodField()
     country_cluster_count = serializers.SerializerMethodField()
+    country_plan_count = serializers.IntegerField(read_only=True)
 
     @staticmethod
     def get_national_society_count(obj):
@@ -370,13 +371,14 @@ class Meta:
         model = Region
         fields = ('links', 'contacts', 'snippets', 'emergency_snippets',
                   'profile_snippets', 'preparedness_snippets', 'name',
-                  'region_name', 'id', 'additional_tab_name',
+                  'region_name', 'id', 'additional_tab_name', 'country_plan_count',
                   'national_society_count', 'country_cluster_count',)
 
 
 class CountryRelationSerializer(ModelSerializer):
     links = CountryLinkSerializer(many=True, read_only=True)
     contacts = CountryContactSerializer(many=True, read_only=True)
+    has_country_plan = serializers.BooleanField(read_only=True)
 
     class Meta:
         model = Country
@@ -387,7 +389,7 @@ class Meta:
             'nsi_trained_in_first_aid', 'nsi_gov_financial_support', 'nsi_domestically_generated_income',
             'nsi_annual_fdrs_reporting', 'nsi_policy_implementation', 'nsi_risk_management_framework',
             'nsi_cmc_dashboard_compliance', 'wash_kit2', 'wash_kit5', 'wash_kit10', 'wash_staff_at_hq',
-            'wash_staff_at_branch', 'wash_ndrt_trained', 'wash_rdrt_trained',
+            'wash_staff_at_branch', 'wash_ndrt_trained', 'wash_rdrt_trained', 'has_country_plan',
         )
 
 

country_plan/__init__.py

@@ -0,0 +1,33 @@
+from django.contrib import admin
+
+from country_plan.models import (
+    CountryPlan,
+    DataImport,
+    StrategicPriority,
+    MembershipCoordination
+)
+
+
+@admin.register(DataImport)
+class DataImportAdmin(admin.ModelAdmin):
+    readonly_fields = ('errors',)
+
+
+@admin.register(CountryPlan)
+class CountryPlanAdmin(admin.ModelAdmin):
+    autocomplete_fields = ('country',)
+    search_fields = ('country__name',)
+    list_filter = ('is_publish',)
+
+
+@admin.register(StrategicPriority)
+class StrategicPriorityAdmin(admin.ModelAdmin):
+    list_display = ('country_plan', 'type', 'people_targeted')
+    autocomplete_fields = ('country_plan',)
+
+
+@admin.register(MembershipCoordination)
+class MembershipCoordinationAdmin(admin.ModelAdmin):
+    list_display = ('country_plan', 'national_society', 'sector')
+    search_fields = ('sector',)
+    autocomplete_fields = ('national_society', 'country_plan')

country_plan/admin.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class CountryPlanConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'country_plan'

country_plan/apps.py

@@ -0,0 +1,18 @@
+from rest_framework import mixins, viewsets
+from django.db import models
+
+from .models import CountryPlan, MembershipCoordination
+from .serializers import CountryPlanSerializer
+
+
+class CountryPlanViewset(mixins.RetrieveModelMixin, viewsets.GenericViewSet):
+    serializer_class = CountryPlanSerializer
+    queryset = CountryPlan.objects.prefetch_related(
+        'country_plan_sp',
+        models.Prefetch(
+            'country_plan_mc',
+            queryset=MembershipCoordination.objects.annotate(
+                national_society_name=models.F('national_society__society_name'),
+            ),
+        ),
+    ).filter(is_publish=True)