Fix filteriong on zone vs zone_id internally in the Host model. (#574)

Author: terjekv

mreg/api/v1/filters.py

@@ -147,6 +147,9 @@ def filter_queryset(self, queryset):
 
 
 class HostFilterSet(filters.FilterSet):
+    zone = filters.NumberFilter(field_name="zone_id")
+    zone__name = filters.CharFilter(field_name="zone_id__name")
+
     class Meta:
         model = Host
         fields = {
@@ -186,8 +189,11 @@ class Meta:
             "srvs__weight": INT_OPERATORS,
             "srvs__port": INT_OPERATORS,
             "srvs__ttl": INT_OPERATORS,
-            "zone": INT_OPERATORS,
-            "zone__name": STRING_OPERATORS,
+            # These are relationships to Zone, which for some reason are named zone_id in the host _model_,
+            # even though the field in the ForwardZone model is named zone and the field returned to the
+            # user is called zone... 
+            "zone_id": INT_OPERATORS,
+            "zone_id__name": STRING_OPERATORS,
             **CREATED_UPDATED,
         }
 

mreg/api/v1/tests/tests_zones.py

@@ -233,6 +233,10 @@ def test_zones_404_not_found(self):
         """"Deleting a non-existing entry should return 404"""
         self.assert_delete_and_404(self.basepath + '1.11.in-addr.arpa')
 
+    def test_zone_by_host_200_ok_but_empty(self):
+        res = self.assert_get(f'/hosts/?zone={self.zone_one.pk}')
+        self.assertEqual(res.json()['count'], 0)
+
 
 class ZonesForwardDelegationTestCase(MregAPITestCase):
     """ This class defines test testsuite for api/zones/forward/<name>/delegations/