Fix: failures in unit tests

Author: andrea-chirillano

api/serializers.py

@@ -1,3 +1,12 @@
+"""
+Provides serialization for API responses.
+
+See `DRF serializer documentation  <http://www.django-rest-framework.org/api-guide/serializers/>`_
+Used by the View classes api/views.py to serialize API responses as JSON or HTML.
+See DEFAULT_RENDERER_CLASSES setting in core.settings.contrib for the enabled renderers.
+"""
+
+# -*- coding: utf-8 -*-
 import logging
 
 import django.core.exceptions
@@ -9,26 +18,16 @@
     SavedFeatureSelection,
     validate_aoi,
     validate_mbtiles,
-    normalize_not_in,
     PartnerExportRegion,
 )
 from rest_framework import serializers
 from rest_framework_gis import serializers as geo_serializers
 from tasks.models import ExportRun, ExportTask
 
+# Get an instance of a logger
 LOG = logging.getLogger(__name__)
 
 
-def _slice_dict(in_dict, wanted_keys):
-    return {k: in_dict[k] for k in wanted_keys if k in in_dict}
-
-
-def _update_attrs(model, v_data, keys):
-    for key in keys:
-        if key in v_data:
-            setattr(model, key, v_data[key])
-
-
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
@@ -74,23 +73,11 @@ class Meta:
 
 class ConfigurationSerializer(serializers.ModelSerializer):
     user = UserSerializer(read_only=True, default=serializers.CurrentUserDefault())
-    # Override to bypass model-level validators; normalization + validation run in validate_yaml.
-    yaml = serializers.CharField(validators=[])
 
     class Meta:
         model = SavedFeatureSelection
         fields = ("uid", "name", "description", "yaml", "public", "user", "pinned")
 
-    def validate_yaml(self, value):
-        from django.core.exceptions import ValidationError as DjangoValidationError
-        from jobs.models import validate_feature_selection
-        normalized = normalize_not_in(value)
-        try:
-            validate_feature_selection(normalized)
-        except DjangoValidationError as e:
-            raise serializers.ValidationError(e.messages)
-        return normalized
-
 
 class JobGeomSerializer(serializers.ModelSerializer):
     """Since Job Geoms can be large, these are serialized separately,
@@ -102,8 +89,7 @@ class Meta:
 
 
 class JobSerializer(serializers.ModelSerializer):
-    user = UserSerializer(read_only=True)
-    feature_selection = serializers.CharField(validators=[])
+    user = UserSerializer(default=serializers.CurrentUserDefault())
 
     class Meta:
         model = Job
@@ -135,9 +121,6 @@ class Meta:
             "simplified_geom": {"read_only": True},
         }
 
-    def validate_feature_selection(self, value):
-        return _validate_and_normalize_feature_selection(value)
-
     def validate(self, data):
         try:
             validate_aoi(data["the_geom"])
@@ -159,17 +142,6 @@ def validate_model(model):
         raise serializers.ValidationError(e.message_dict)
 
 
-def _validate_and_normalize_feature_selection(value):
-    from django.core.exceptions import ValidationError as DjangoValidationError
-    from jobs.models import validate_feature_selection as _validate_fs
-    normalized = normalize_not_in(value)
-    try:
-        _validate_fs(normalized)
-    except DjangoValidationError as e:
-        raise serializers.ValidationError(e.messages)
-    return normalized
-
-
 class PartnerExportRegionListSerializer(serializers.ModelSerializer):
     export_formats = serializers.ListField()
     feature_selection = serializers.CharField()
@@ -203,9 +175,6 @@ class PartnerExportRegionSerializer(serializers.ModelSerializer):  # noqa
     event = serializers.CharField()
     description = serializers.CharField()
 
-    def validate_feature_selection(self, value):
-        return _validate_and_normalize_feature_selection(value)
-
     class Meta:  # noqa
         model = PartnerExportRegion
         fields = (
@@ -232,7 +201,10 @@ class Meta:  # noqa
         }
 
     def create(self, validated_data):  # noqa
-        job_dict = _slice_dict(
+        def slice_dict(in_dict, wanted_keys):
+            return dict((k, in_dict[k]) for k in wanted_keys if k in in_dict)
+
+        job_dict = slice_dict(
             validated_data,
             [
                 "the_geom",
@@ -245,7 +217,7 @@ def create(self, validated_data):  # noqa
         job_dict["event"] = validated_data.get("event") or ""
         job_dict["description"] = validated_data.get("description") or ""
 
-        region_dict = _slice_dict(
+        region_dict = slice_dict(
             validated_data,
             [
                 "schedule_period",
@@ -279,6 +251,12 @@ def create(self, validated_data):  # noqa
         return region
 
     def update(self, instance, validated_data):  # noqa
+        def update_attrs(model, v_data, keys):
+            for key in keys:
+                if key in v_data:
+                    setattr(model, key, v_data[key])
+
+        # if re-assigning, check group membership
         if (
             not self.context["request"]
             .user.groups.filter(name=validated_data["group"].name)
@@ -289,15 +267,15 @@ def update(self, instance, validated_data):  # noqa
             )
 
         job = instance.job
-        _update_attrs(
+        update_attrs(
             job, validated_data, ["the_geom", "export_formats", "feature_selection"]
         )
         job.name = validated_data.get("name")
         job.event = validated_data.get("event") or ""
         job.description = validated_data.get("description") or ""
 
         validate_model(job)
-        _update_attrs(
+        update_attrs(
             instance,
             validated_data,
             [
@@ -363,9 +341,6 @@ class HDXExportRegionSerializer(serializers.ModelSerializer):  # noqa
     name = serializers.CharField()
     buffer_aoi = serializers.BooleanField()
 
-    def validate_feature_selection(self, value):
-        return _validate_and_normalize_feature_selection(value)
-
     def validate(self, data):
         """
         Check for export formats for country exports.
@@ -407,15 +382,18 @@ class Meta:  # noqa
         }
 
     def create(self, validated_data):  # noqa
-        job_dict = _slice_dict(
+        def slice_dict(in_dict, wanted_keys):
+            return dict((k, in_dict[k]) for k in wanted_keys if k in in_dict)
+
+        job_dict = slice_dict(
             validated_data,
             ["the_geom", "export_formats", "feature_selection", "buffer_aoi"],
         )
         job_dict["user"] = self.context["request"].user
         job_dict["name"] = validated_data.get("dataset_prefix")
         job_dict["description"] = validated_data.get("name")
 
-        region_dict = _slice_dict(
+        region_dict = slice_dict(
             validated_data,
             [
                 "extra_notes",
@@ -441,8 +419,13 @@ def create(self, validated_data):  # noqa
         return region
 
     def update(self, instance, validated_data):  # noqa
+        def update_attrs(model, v_data, keys):
+            for key in keys:
+                if key in v_data:
+                    setattr(model, key, v_data[key])
+
         job = instance.job
-        _update_attrs(
+        update_attrs(
             job,
             validated_data,
             ["the_geom", "export_formats", "feature_selection", "buffer_aoi"],
@@ -451,7 +434,7 @@ def update(self, instance, validated_data):  # noqa
         job.description = validated_data.get("name")
 
         validate_model(job)
-        _update_attrs(
+        update_attrs(
             instance,
             validated_data,
             [

api/validators.py

@@ -34,3 +34,49 @@ def validate_search_bbox(extents):
             raise serializers.ValidationError(detail)
     except GEOSException:
         raise serializers.ValidationError(detail)
+
+
+def validate_bbox_params(data):
+    """
+    Validates the bounding box parameters supplied during form sumission.
+
+    Args:
+        the data supplied during form submission.
+
+    Returns:
+        a tuple containing the validated extents in the form (xmin,ymin,xmax,ymax).
+
+    Raises:
+        ValidationError: if the extents are invalid.
+    """
+    detail = OrderedDict()
+
+    # test for number
+    lon_coords = [float(data['xmin']), float(data['xmax'])]
+    lat_coords = [float(data['ymin']), float(data['ymax'])]
+    # test lat long value order
+    if ((lon_coords[0] >= 0 and lon_coords[0] > lon_coords[1]) or
+            (lon_coords[0] < 0 and lon_coords[0] > lon_coords[1])):
+        detail['id'] = _('inverted_coordinates')
+        detail['message'] = _('xmin greater than xmax.')
+        raise serializers.ValidationError(detail)
+
+    if ((lat_coords[0] >= 0 and lat_coords[0] > lat_coords[1]) or
+            (lat_coords[0] < 0 and lat_coords[0] > lat_coords[1])):
+        detail['id'] = _('inverted_coordinates')
+        detail['message'] = _('ymin greater than ymax.')
+        raise serializers.ValidationError(detail)
+
+    # test lat long extents
+    for lon in lon_coords:
+        if (lon < -180 or lon > 180):
+            detail['id'] = _('invalid_longitude')
+            detail['message'] = _('Invalid longitude coordinate: %(lon)s') % {'lon': lon}
+            raise serializers.ValidationError(detail)
+    for lat in lat_coords:
+        if (lat < -90 and lat > 90):
+            detail['id'] = _('invalid_latitude')
+            detail['message'] = _('Invalid latitude coordinate: %(lat)s') % {'lat': lat}
+            raise serializers.ValidationError(detail)
+
+    return (data['xmin'], data['ymin'], data['xmax'], data['ymax'])

api/views.py

@@ -1,5 +1,6 @@
 """Provides classes for handling API requests."""
 
+# -*- coding: utf-8 -*-
 from distutils.util import strtobool
 import itertools
 from itertools import chain
@@ -297,14 +298,14 @@ def perform_create(self, serializer):
         if settings.SYNC_TO_HDX:
             sync_region(serializer.instance)
         else:
-            LOG.debug("Stubbing interaction with HDX API.")
+            print("Stubbing interaction with HDX API.")
 
     def perform_update(self, serializer):
         serializer.save()
         if settings.SYNC_TO_HDX:
             sync_region(serializer.instance)
         else:
-            LOG.debug("Stubbing interaction with HDX API.")
+            print("Stubbing interaction with HDX API.")
 
 
 class PartnerExportRegionViewSet(viewsets.ModelViewSet):
@@ -347,19 +348,6 @@ def permalink(request, uid):
         return HttpResponseNotFound()
 
 
-def _period_week(dt):
-    sunday = dt.strftime("%Y-%U-0")
-    return datetime.strptime(sunday, "%Y-%U-%w").strftime("%Y-%m-%d")
-
-
-def _period_day(dt):
-    return dt.strftime("%Y-%m-%d")
-
-
-def _period_month(dt):
-    return dt.strftime("%Y-%m")
-
-
 def _is_superuser(request):
     """Check if the current user is a superuser (works with both auth providers)."""
     if getattr(settings, 'AUTH_PROVIDER', 'legacy') == 'hanko':
@@ -380,12 +368,22 @@ def stats(request):
     period = request.GET.get("period", "day")
     is_csv = request.GET.get("csv", False) == "true"
 
+    def toWeek(dt):
+        sunday = dt.strftime("%Y-%U-0")
+        return datetime.strptime(sunday, "%Y-%U-%w").strftime("%Y-%m-%d")
+
+    def toDay(dt):
+        return dt.strftime("%Y-%m-%d")
+
+    def toMonth(dt):
+        return dt.strftime("%Y-%m")
+
     if period == "day":
-        period_fn = _period_day
+        period_fn = toDay
     elif period == "week":
-        period_fn = _period_week
+        period_fn = toWeek
     elif period == "month":
-        period_fn = _period_month
+        period_fn = toMonth
 
     users = (
         User.objects.only("date_joined")
@@ -457,12 +455,22 @@ def run_stats(request):
     period = request.GET.get("period", "day")
     is_csv = request.GET.get("csv", False) == "true"
 
+    def toWeek(dt):
+        sunday = dt.strftime("%Y-%U-0")
+        return datetime.strptime(sunday, "%Y-%U-%w").strftime("%Y-%m-%d")
+
+    def toDay(dt):
+        return dt.strftime("%Y-%m-%d")
+
+    def toMonth(dt):
+        return dt.strftime("%Y-%m")
+
     if period == "day":
-        period_fn = _period_day
+        period_fn = toDay
     elif period == "week":
-        period_fn = _period_week
+        period_fn = toWeek
     elif period == "month":
-        period_fn = _period_month
+        period_fn = toMonth
 
     run_queryset = ExportRun.objects.only("started_at", "status").order_by(
         "-started_at"