Move mutation to a model method

apps/accounts/admin.py

@@ -661,8 +661,7 @@ def save_model(self, request, obj, form, change):
         # if the provider is being archived, deactivate all networks to avoid having
         # to manually do this for each network
         if "archived" in form.changed_data and form.instance.archived:
-            form.instance.deactivate_networks()
-            form.instance.update(showonwebsite=False)
+            form.instance.archive()
 
         super().save_model(request, obj, form, change)
 

apps/accounts/models/hosting.py

@@ -467,15 +467,21 @@ def mark_as_pending_review(self, approval_request):
 
         return False
 
-    def deactivate_networks(self):
+    def archive(self) -> "Hostingprovider":
         """
-        Deactivate all the IP ranges and ASNs for this provider.
+        Archive the provider, deactivating all the IP ranges
+        and ASNs for this provider, removing it from listings
         """
         active_green_ips = self.greencheckip_set.filter(active=True)
         active_green_asns = self.greencheckasn_set.filter(active=True)
         active_green_ips.update(active=False)
         active_green_asns.update(active=False)
 
+        self.archived = True
+        self.showonwebsite = False
+        self.save()
+        return self
+
     # Queries
 
     def public_supporting_evidence(

apps/accounts/models/test_models.py

@@ -62,7 +62,8 @@ def test_accepted_ways_to_model(
 
         assert datacenter.model == accounting_model
 
-    def test_deactivate_networks(
+    @pytest.mark.only
+    def test_archive(
         self, db, hosting_provider_factory, green_ip_factory, green_asn_factory
     ):
 
@@ -75,14 +76,17 @@ def test_deactivate_networks(
         assert ip_range.active is True
         assert as_network.active is True
 
-        provider.deactivate_networks()
+        provider.archive()
         ip_range.refresh_from_db()
         as_network.refresh_from_db()
 
         assert provider.active_ip_ranges().count() == 0
         assert provider.active_asns().count() == 0
         assert ip_range.active is False
         assert as_network.active is False
+        #
+        assert provider.archived is True
+        assert provider.showonwebsite is False
 
 
 class TestHostingProviderEvidence: