[chores] Removed uuid primary key from GeoSettings + cleanup

Author: nemesifier

openwisp_controller/geo/api/serializers.py

@@ -29,7 +29,7 @@ class OrganizationGeoSettingsSerializer(ValidatedModelSerializer):
     class Meta:
         model = OrganizationGeoSettings
         fields = "__all__"
-        read_only_fields = ["id", "organization"]
+        read_only_fields = ["organization"]
 
     # Workaround for https://github.com/openwisp/openwisp-utils/issues/633
     # TODO: Remove when the Bug is fixed in openwisp-utils

openwisp_controller/geo/base/models.py

@@ -15,7 +15,6 @@
 from openwisp_controller.geo import settings as geo_settings
 from openwisp_controller.geo.estimated_location.service import EstimatedLocationService
 from openwisp_users.mixins import OrgMixin, ValidateOrgMixin
-from openwisp_utils.base import UUIDModel
 from openwisp_utils.fields import FallbackBooleanChoiceField
 
 
@@ -161,12 +160,13 @@ def organization_id(self):
         return self.device.organization_id
 
 
-class AbstractOrganizationGeoSettings(UUIDModel):
+class AbstractOrganizationGeoSettings(models.Model):
     organization = models.OneToOneField(
         swapper.get_model_name("openwisp_users", "Organization"),
         verbose_name=_("organization"),
         related_name="geo_settings",
         on_delete=models.CASCADE,
+        primary_key=True,
     )
     estimated_location_enabled = FallbackBooleanChoiceField(
         help_text=_("Whether the estimated location feature is enabled"),
@@ -180,7 +180,9 @@ class Meta:
         abstract = True
 
     def __str__(self):
-        return f"Geo settings for {self.organization.name}"
+        return _("Geo settings for %(organization)s") % {
+            "organization": self.organization.name
+        }
 
     def clean(self):
         if not config_settings.WHOIS_CONFIGURED and self.estimated_location_enabled:
@@ -192,7 +194,6 @@ def clean(self):
                     )
                 }
             )
-        return super().clean()
 
     @classmethod
     def organization_post_save_receiver(cls, sender, instance, created, **kwargs):

openwisp_controller/geo/migrations/0005_organizationgeosettings.py

@@ -1,7 +1,5 @@
 # Generated by Django 5.2.12 on 2026-03-23 14:59
 
-import uuid
-
 import django.db.models.deletion
 import swapper
 from django.db import migrations, models
@@ -23,12 +21,14 @@ class Migration(migrations.Migration):
             name="OrganizationGeoSettings",
             fields=[
                 (
-                    "id",
-                    models.UUIDField(
-                        default=uuid.uuid4,
-                        editable=False,
+                    "organization",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
                         primary_key=True,
+                        related_name="geo_settings",
                         serialize=False,
+                        to=swapper.get_model_name("openwisp_users", "Organization"),
+                        verbose_name="organization",
                     ),
                 ),
                 (
@@ -42,15 +42,6 @@ class Migration(migrations.Migration):
                         verbose_name="Estimated Location Enabled",
                     ),
                 ),
-                (
-                    "organization",
-                    models.OneToOneField(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="geo_settings",
-                        to=swapper.get_model_name("openwisp_users", "Organization"),
-                        verbose_name="organization",
-                    ),
-                ),
             ],
             options={
                 "verbose_name": "Geographic settings",

openwisp_controller/geo/tests/test_api.py

@@ -1415,7 +1415,6 @@ def test_organization_geo_settings_retrieve(self):
             response = self.client.get(url)
             self.assertEqual(response.status_code, 200)
             data = response.data
-            self.assertEqual(data["id"], str(org1_geo_settings.pk))
             self.assertEqual(str(data["organization"]), str(org1.pk))
             self.assertEqual(
                 data["estimated_location_enabled"],

tests/openwisp2/sample_geo/migrations/0005_organizationgeosettings.py

@@ -1,7 +1,5 @@
 # Generated by Django 5.2.12 on 2026-03-24 19:45
 
-import uuid
-
 import django.db.models.deletion
 from django.db import migrations, models
 from swapper import get_model_name
@@ -21,12 +19,14 @@ class Migration(migrations.Migration):
             name="OrganizationGeoSettings",
             fields=[
                 (
-                    "id",
-                    models.UUIDField(
-                        default=uuid.uuid4,
-                        editable=False,
+                    "organization",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
                         primary_key=True,
+                        related_name="geo_settings",
                         serialize=False,
+                        to=get_model_name("openwisp_users", "Organization"),
+                        verbose_name="organization",
                     ),
                 ),
                 (
@@ -41,15 +41,6 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("details", models.CharField(blank=True, max_length=64, null=True)),
-                (
-                    "organization",
-                    models.OneToOneField(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="geo_settings",
-                        to=get_model_name("openwisp_users", "Organization"),
-                        verbose_name="organization",
-                    ),
-                ),
             ],
             options={
                 "verbose_name": "Geographic settings",