Merge pull request #1747 from IFRCGo/feature/admin2-can-be-deprecated

Admin2 area can be deprecated

Author: szabozoltan69

api/drf_views.py

@@ -346,7 +346,10 @@ class Meta:
 
 
 class DistrictViewset(viewsets.ReadOnlyModelViewSet):
-    queryset = District.objects.select_related('country').filter(is_deprecated=False)
+    queryset = District.objects.\
+        select_related('country').\
+        filter(country__is_deprecated=False).\
+        filter(is_deprecated=False)
     filterset_class = DistrictFilter
     search_fields = ('name', 'country__name',)  # for /docs
 
@@ -360,11 +363,15 @@ def get_serializer_class(self):
 class Admin2Filter(filters.FilterSet):
     class Meta:
         model = Admin2
-        fields = ('admin1',)
+        fields = ('admin1', 'admin1__country', 'admin1__country__iso3')
 
 
 class Admin2Viewset(viewsets.ReadOnlyModelViewSet):
-    queryset = Admin2.objects.all()
+    queryset = Admin2.objects.\
+        select_related('admin1').\
+        filter(admin1__country__is_deprecated=False).\
+        filter(admin1__is_deprecated=False).\
+        filter(is_deprecated=False)
     filterset_class = Admin2Filter
     search_fields = ('name', 'district__name', 'district__country__name')
     serializer_class = Admin2Serializer

api/migrations/0163_admin2_is_deprecated.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2023-04-12 17:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0162_admin2_created_at'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='admin2',
+            name='is_deprecated',
+            field=models.BooleanField(default=False, help_text='Is this a deprecated area?'),
+        ),
+    ]

api/models.py

@@ -273,6 +273,7 @@ class Admin2(models.Model):
     local_name_code = models.CharField(verbose_name=_('Local Name Language Code'), max_length=10, blank=True, null=True)
     alternate_name = models.CharField(verbose_name=_('Alternate Name'), max_length=100, blank=True, null=True)
     alternate_name_code = models.CharField(verbose_name=_('Alternate Name Language Code'), max_length=10, blank=True, null=True)
+    is_deprecated = models.BooleanField(default=False, help_text=_('Is this a deprecated area?'))
     created_at = models.DateTimeField(verbose_name=_('Created at'), auto_now_add=True)
 
     class Meta:

api/serializers.py

@@ -211,15 +211,14 @@ class Meta:
 
 
 
-
 class Admin2Serializer(GeoSerializerMixin, ModelSerializer):
     bbox = serializers.SerializerMethodField()
     centroid = serializers.SerializerMethodField()
     district_id = serializers.IntegerField(source='admin1.id', read_only=True)
 
     class Meta:
         model = Admin2
-        fields = ('district_id', 'name', 'code', 'bbox', 'centroid',)
+        fields = ('district_id', 'name', 'code', 'bbox', 'centroid', 'is_deprecated',)
 
 
 class MiniDistrictSerializer(ModelSerializer):