Corrected filtering out Null values in 'api' endpoints

smash/web/api_views.py

@@ -4,35 +4,35 @@ from .forms import *
 from django.http import JsonResponse
 
 def cities(request):
-    X = Subject.objects.all().values_list('city').distinct()
+    X = Subject.objects.filter(city__isnull=False).values_list('city').distinct()
     return JsonResponse({
-        "cities" : [x[0] for x in X if len(x) > 0]
+        "cities" : [x[0] for x in X]
     })
 
 
 def countries(request):
-    X = Subject.objects.all().values_list('country').distinct()
+    X = Subject.objects.filter(country__isnull=False).values_list('country').distinct()
     return JsonResponse({
-        "countries" : [x[0] for x in X if len(x) > 0]
+        "countries" : [x[0] for x in X]
     })
 
 
 def referrals(request):
-    X = Subject.objects.all().values_list('referral').distinct()
+    X = Subject.objects.filter(referral__isnull=False).values_list('referral').distinct()
     return JsonResponse({
-        "referrals" : [x[0] for x in X if len(x) > 0]
+        "referrals" : [x[0] for x in X]
     })
 
 
 def specializations(request):
-    X = Worker.objects.all().values_list('specialization').distinct()
+    X = Worker.objects.filter(specialization__isnull=False).values_list('specialization').distinct()
     return JsonResponse({
-        "specializations" : [x[0] for x in X if len(x) > 0]
+        "specializations" : [x[0] for x in X]
     })
 
 
 def units(request):
-    X = Worker.objects.all().values_list('unit').distinct()
+    X = Worker.objects.filter(unit__isnull=False).values_list('unit').distinct()
     return JsonResponse({
-        "units" : [x[0] for x in X if len(x) > 0]
+        "units" : [x[0] for x in X]
     })