[qa] Refactor after rebasing

Signed-off-by: DragnEmperor <[email protected]>

Author: DragnEmperor

openwisp_controller/config/whois/service.py

@@ -92,8 +92,8 @@ def _need_whois_lookup(self, new_ip):
 
         The lookup is not triggered if:
             - The new IP address is None or it is a private IP address.
-            - The WhoIs information of new ip is already present.
-            - WhoIs is disabled in the organization settings. (query from db)
+            - The WHOIS information of new ip is already present.
+            - WHOIS is disabled in the organization settings. (query from db)
         """
 
         # Check cheap conditions first before hitting the database

openwisp_controller/config/whois/tasks.py

@@ -12,6 +12,7 @@
 from openwisp_utils.tasks import OpenwispCeleryTask
 
 from .. import settings as app_settings
+from .utils import send_whois_task_notification
 
 logger = logging.getLogger(__name__)
 
@@ -44,8 +45,6 @@ class WHOISCeleryRetryTask(OpenwispCeleryTask):
 
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         """Notify the user about the failure of the WHOIS task."""
-        from .utils import send_whois_task_notification
-
         device_pk = kwargs.get("device_pk")
         send_whois_task_notification(device_pk=device_pk, notify_type="device_error")
         logger.error(f"WHOIS lookup failed. Details: {exc}")

openwisp_controller/config/whois/test_whois.py

@@ -1,8 +1,8 @@
 import importlib
 from unittest import mock
 
-from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 from django.contrib.gis.geos import Point
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.db.models.signals import post_delete, post_save
 from django.test import TestCase, TransactionTestCase, override_settings, tag
@@ -326,7 +326,7 @@ class TestWHOISTransaction(
     CreateWHOISMixin, WHOISTransactionMixin, TransactionTestCase
 ):
     _WHOIS_GEOIP_CLIENT = (
-        "openwisp_controller.config.whois.tasks.geoip2_webservice.Client.city"
+        "openwisp_controller.config.whois.tasks.geoip2_webservice.Client"
     )
     _WHOIS_TASKS_INFO_LOGGER = "openwisp_controller.config.whois.tasks.logger.info"
     _WHOIS_TASKS_WARN_LOGGER = "openwisp_controller.config.whois.tasks.logger.warning"

openwisp_controller/config/whois/utils.py

@@ -3,10 +3,6 @@
 from swapper import load_model
 
 from .. import settings as app_settings
-from .serializers import WHOISSerializer
-from .service import WHOISService
-
-Device = load_model("config", "Device")
 
 MESSAGE_MAP = {
     "device_error": {
@@ -46,6 +42,11 @@ def send_whois_task_notification(device_pk, notify_type):
 
 
 def get_whois_info(pk):
+    from .serializers import WHOISSerializer
+    from .service import WHOISService
+
+    Device = load_model("config", "Device")
+
     if not app_settings.WHOIS_CONFIGURED or not pk:
         return None
     device = (

openwisp_controller/geo/estimated_location/tasks.py

@@ -59,14 +59,13 @@ def _update_or_create_estimated_location(
                     # we do not update it, but create a new one.
                     _create_estimated_location(device_location, location_defaults)
                     return
-                updated = False
+                update_fields = []
                 for attr, value in location_defaults.items():
                     if getattr(current_location, attr) != value:
                         setattr(current_location, attr, value)
-                        updated = True
-                if updated:
-                    current_location.full_clean()
-                    current_location.save()
+                        update_fields.append(attr)
+                if update_fields:
+                    current_location.save(update_fields=update_fields)
                     logger.info(
                         f"Estimated location saved successfully for {device_pk}"
                         f" for IP: {ip_address}"