fixup! Remove inactive person links

Author: VirginiaDooley

ynr/apps/candidatebot/helpers.py

@@ -1,3 +1,4 @@
+import contextlib
 import re
 
 import pypandoc
@@ -196,3 +197,10 @@ def add_theyworkforyou_id(self, twfy_id):
         value = f"https://www.theyworkforyou.com/mp/{twfy_id}/"
         internal_id = f"uk.org.publicwhip/person/{twfy_id}"
         self.edit_field("theyworkforyou", value, internal_id=internal_id)
+
+    def remove_person_identifier(self, identifier):
+        with contextlib.suppress(PersonIdentifier.DoesNotExist):
+            self.person.get_all_identifiers.remove(identifier)
+            self.person.save()
+            identifier.delete()
+        return self.person

…commands/remove_inactive_person_links.py …idatebot_remove_inactive_person_links.pyynr/apps/people/management/commands/remove_inactive_person_links.py renamed to ynr/apps/candidatebot/management/commands/candidatebot_remove_inactive_person_links.py ynr/apps/people/management/commands/remove_inactive_person_links.py renamed to ynr/apps/candidatebot/management/commands/candidatebot_remove_inactive_person_links.py

@@ -2,6 +2,7 @@
 from urllib.parse import urlparse
 
 import requests
+from candidatebot.helpers import CandidateBot
 from django.core.management.base import BaseCommand
 from people.models import Person
 from popolo.models import Membership
@@ -22,6 +23,12 @@ class Command(BaseCommand):
     Test and remove inactive or dead links from Person objects.
     """
 
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--person-id",
+            help="Person ID to test",
+        )
+
     def handle(self, *args, **options):
         """
         Iterate over all Person objects and check if the
@@ -66,9 +73,8 @@ def handle(self, *args, **options):
                         ]
                     )
                     # delete the identifier from the person identifiers
-                    identifier.person.get_all_identifiers.remove(identifier)
-                    identifier.delete()
-                    identifier.person.save()
+                    bot = CandidateBot(person.pk, ignore_errors=True)
+                    bot.remove_person_identifier(identifier)
                     print(
-                        f"Deleted {identifier.value_type}:{identifier.value} from {person.name}"
+                        f"Candidatebot deleted {identifier.value_type}:{identifier.value} from {person.name}"
                     )

ynr/apps/candidates/tests/test_remove_inactive_person_identifiers.py

@@ -56,7 +56,12 @@ def test_remove_inactive_person_identifiers(self):
             self.person.get_all_identifiers[1].value,
             "http://www.conservatives.com/about/our-team/example.com",
         )
-        call_command("remove_inactive_person_links")
+
+        call_command(
+            "candidatebot_remove_inactive_person_links",
+            "--person-id",
+            self.person.id,
+        )
         self.person.refresh_from_db()
         self.assertEqual(len(self.person.get_all_identifiers), 1)
         self.assertEqual(