[fix] Fixed the OrganizationGeoSettingsSerializer

Author: pandafy

openwisp_controller/geo/api/serializers.py

@@ -1,13 +1,13 @@
 from django.contrib.humanize.templatetags.humanize import ordinal
 from django.core.exceptions import ValidationError
-from django.db import transaction
+from django.db import transaction, models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 from rest_framework.serializers import IntegerField, SerializerMethodField
 from rest_framework_gis import serializers as gis_serializers
 from swapper import load_model
-
+from copy import copy
 from openwisp_utils.api.serializers import ValidatedModelSerializer
 
 from ...serializers import BaseSerializer
@@ -29,6 +29,18 @@ class Meta:
         fields = "__all__"
         read_only_fields = ["id", "organization"]
 
+    # Workaround for https://github.com/openwisp/openwisp-utils/issues/633
+    # TODO: Remove when the Bug is fixed in openwisp-utils
+    def validate(self, data):
+        Model = self.Meta.model
+        instance = copy(self.instance) if self.instance else Model()
+        for key, value in data.items():
+            # avoid direct assignment for m2m (not allowed)
+            if not isinstance(Model._meta.get_field(key), models.ManyToManyField):
+                setattr(instance, key, value)
+        instance.full_clean(exclude=self.exclude_validation)
+        return data
+
 
 class LocationDeviceSerializer(ValidatedModelSerializer):
     admin_edit_url = SerializerMethodField("get_admin_edit_url")

openwisp_controller/geo/tests/test_api.py

@@ -1510,6 +1510,26 @@ def test_organization_geo_settings_update(self):
             )
             self.assertEqual(response.status_code, 404)
 
+        with self.subTest("Validation error when WHOIS not configured"):
+            with patch.object(config_app_settings, "WHOIS_CONFIGURED", False):
+                response = self.client.put(
+                    url,
+                    {"estimated_location_enabled": True},
+                    content_type="application/json",
+                )
+                self.assertEqual(response.status_code, 400)
+                self.assertIn("estimated_location_enabled", response.data)
+                org1_geo_settings.refresh_from_db()
+                self.assertEqual(org1_geo_settings.estimated_location_enabled, False)
+
+                response = self.client.patch(
+                    url,
+                    {"estimated_location_enabled": True},
+                    content_type="application/json",
+                )
+                self.assertEqual(response.status_code, 400)
+                self.assertIn("estimated_location_enabled", response.data)
+
         with self.subTest("Superuser can update any organization's geo settings"):
             superuser = self._get_admin()
             self.client.force_login(user=superuser)