formatted code for linter; reformatted _fetch_cache for readability

src/registrar/models/domain.py

@@ -1601,19 +1601,57 @@ class Domain(TimeStampedModel, DomainHelper):
     def _fetch_cache(self, fetch_hosts=False, fetch_contacts=False):
         """Contact registry for info about a domain."""
         try:
-            # get info from registry
             data_response = self._get_or_create_domain()
             cache = self._extract_data_from_response(data_response)
+            cleaned = self._clean_cache(cache, data_response)
+            self._update_hosts_and_contacts(cleaned, fetch_hosts, fetch_contacts)
+            self._update_dates(cleaned)
 
+            self._cache = cleaned
+
+        except RegistryError as e:
+            logger.error(e)
+
+    def _extract_data_from_response(self, data_response):
+        """extract datea from response from registry"""
+        data = data_response.res_data[0]
+        return {
+            "auth_info": getattr(data, "auth_info", ...),
+            "_contacts": getattr(data, "contacts", ...),
+            "cr_date": getattr(data, "cr_date", ...),
+            "ex_date": getattr(data, "ex_date", ...),
+            "_hosts": getattr(data, "hosts", ...),
+            "name": getattr(data, "name", ...),
+            "registrant": getattr(data, "registrant", ...),
+            "statuses": getattr(data, "statuses", ...),
+            "tr_date": getattr(data, "tr_date", ...),
+            "up_date": getattr(data, "up_date", ...),
+        }
+
+    def _clean_cache(self, cache, data_response):
+        """clean up the cache"""
         # remove null properties (to distinguish between "a value of None" and null)
         cleaned = self._remove_null_properties(cache)
-
         if "statuses" in cleaned:
             cleaned["statuses"] = [status.state for status in cleaned["statuses"]]
-
         cleaned["dnssecdata"] = self._get_dnssec_data(data_response.extensions)
+        return cleaned
 
-            # Capture and store old hosts and contacts from cache if they exist
+    def _remove_null_properties(self, cache):
+        return {k: v for k, v in cache.items() if v is not ...}
+
+    def _get_dnssec_data(self, response_extensions):
+        # get extensions info, if there is any
+        # DNSSECExtension is one possible extension, make sure to handle
+        # only DNSSECExtension and not other type extensions
+        dnssec_data = None
+        for extension in response_extensions:
+            if isinstance(extension, extensions.DNSSECExtension):
+                dnssec_data = extension
+        return dnssec_data
+
+    def _update_hosts_and_contacts(self, cleaned, fetch_hosts, fetch_contacts):
+        """Capture and store old hosts and contacts from cache if the don't exist"""
         old_cache_hosts = self._cache.get("hosts")
         old_cache_contacts = self._cache.get("contacts")
 
@@ -1628,6 +1666,8 @@ class Domain(TimeStampedModel, DomainHelper):
             if old_cache_contacts is not None:
                 cleaned["contacts"] = old_cache_contacts
 
+    def _update_dates(self, cleaned):
+        """Update dates (expiration and creation) from cleaned"""
         requires_save = False
 
         # if expiration date from registry does not match what is in db,
@@ -1646,39 +1686,6 @@ class Domain(TimeStampedModel, DomainHelper):
         if requires_save:
             self.save()
 
-            self._cache = cleaned
-
-        except RegistryError as e:
-            logger.error(e)
-
-    def _extract_data_from_response(self, data_response):
-        data = data_response.res_data[0]
-        return {
-            "auth_info": getattr(data, "auth_info", ...),
-            "_contacts": getattr(data, "contacts", ...),
-            "cr_date": getattr(data, "cr_date", ...),
-            "ex_date": getattr(data, "ex_date", ...),
-            "_hosts": getattr(data, "hosts", ...),
-            "name": getattr(data, "name", ...),
-            "registrant": getattr(data, "registrant", ...),
-            "statuses": getattr(data, "statuses", ...),
-            "tr_date": getattr(data, "tr_date", ...),
-            "up_date": getattr(data, "up_date", ...),
-        }
-
-    def _remove_null_properties(self, cache):
-        return {k: v for k, v in cache.items() if v is not ...}
-
-    def _get_dnssec_data(self, response_extensions):
-        # get extensions info, if there is any
-        # DNSSECExtension is one possible extension, make sure to handle
-        # only DNSSECExtension and not other type extensions
-        dnssec_data = None
-        for extension in response_extensions:
-            if isinstance(extension, extensions.DNSSECExtension):
-                dnssec_data = extension
-        return dnssec_data
-
     def _get_contacts(self, contacts):
         choices = PublicContact.ContactTypeChoices
         # We expect that all these fields get populated,

src/registrar/views/index.py

@@ -1,6 +1,4 @@
-from django.db.models import F
 from django.shortcuts import render
-from django.utils import timezone
 
 from registrar.models import DomainApplication, Domain, UserDomainRole
 
@@ -16,7 +14,7 @@ def index(request):
         context["domain_applications"] = applications.exclude(status="approved")
 
         user_domain_roles = UserDomainRole.objects.filter(user=request.user)
-        domain_ids = user_domain_roles.values_list('domain_id', flat=True)
+        domain_ids = user_domain_roles.values_list("domain_id", flat=True)
         domains = Domain.objects.filter(id__in=domain_ids)
 
         context["domains"] = domains