[chores] Cleanup redundant lines, checks reordered

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

Author: DragnEmperor

openwisp_controller/config/apps.py

@@ -65,7 +65,6 @@ def __setmodels__(self):
         self.org_limits = load_model("config", "OrganizationLimits")
         self.cert_model = load_model("django_x509", "Cert")
         self.org_model = load_model("openwisp_users", "Organization")
-        self.org_config_model = load_model("config", "OrganizationConfigSettings")
 
     def connect_signals(self):
         """

openwisp_controller/config/handlers.py

@@ -14,7 +14,6 @@
 DeviceGroup = load_model("config", "DeviceGroup")
 Organization = load_model("openwisp_users", "Organization")
 Cert = load_model("django_x509", "Cert")
-WhoIsInfo = load_model("config", "WhoIsInfo")
 
 
 @receiver(

openwisp_controller/config/settings.py

@@ -72,11 +72,8 @@ def get_setting(option, default):
 GEOIP_LICENSE_KEY = get_setting("GEOIP_LICENSE_KEY", None)
 WHO_IS_ENABLED = get_setting("WHO_IS_ENABLED", False)
 WHO_IS_CONFIGURED = GEOIP_ACCOUNT_ID and GEOIP_LICENSE_KEY
-if WHO_IS_ENABLED:
-    try:
-        assert WHO_IS_CONFIGURED
-    except AssertionError:
-        raise ImproperlyConfigured(
-            "GEOIP_ACCOUNT_ID and GEOIP_LICENSE_KEY must be set "
-            + "when WHO_IS_ENABLED is True."
-        )
+if WHO_IS_ENABLED and not WHO_IS_CONFIGURED:
+    raise ImproperlyConfigured(
+        "GEOIP_ACCOUNT_ID and GEOIP_LICENSE_KEY must be set "
+        + "when WHO_IS_ENABLED is True."
+    )

openwisp_controller/config/tests/test_notifications.py

@@ -19,7 +19,6 @@
 Vpn = load_model("config", "Vpn")
 Device = load_model("config", "Device")
 Notification = load_model("openwisp_notifications", "Notification")
-OrganizationConfigSettings = load_model("config", "OrganizationConfigSettings")
 
 notification_qs = Notification.objects.all()
 

openwisp_controller/config/utils.py

@@ -75,17 +75,20 @@ def update_last_ip(device, request):
     if device.last_ip != ip:
         device.last_ip = ip
         update_fields.append("last_ip")
-    # for cases of devices who do not have who_is record
-    elif (
-        app_settings.WHO_IS_CONFIGURED
-        and not device.who_is_service.get_device_who_is_info()
-    ):
-        device.who_is_service.trigger_who_is_lookup()
     if device.management_ip != management_ip:
         device.management_ip = management_ip
         update_fields.append("management_ip")
     if update_fields:
         device.save(update_fields=update_fields)
+    # When update fields are present then save() will run the WhoIs
+    # lookup. But if there are no update fields, we still want to
+    # trigger the WhoIs lookup if there is no record for the device's
+    # last_ip.
+    elif (
+        app_settings.WHO_IS_CONFIGURED
+        and not device.who_is_service.get_device_who_is_info()
+    ):
+        device.who_is_service.trigger_who_is_lookup()
 
     return bool(update_fields)