fixup! New evidence_links_cleaned property on PlanQuestionScore

Author: struan

caps/utils.py

@@ -97,3 +97,22 @@ def gen_natsort_lamda(keyfunc=None):
     return lambda q: [
         int(t) if t.isdigit() else t.lower() for t in re.split("(\d+)", keyfunc(q))
     ]
+
+
+def clean_links(links: str):
+    # Evidence "links" can be one of:
+    # - an empty line
+    # - a string like "Airports:"
+    # - a string like "www.whatever.com/…"
+    # - a string like "http://www…"
+    # So attempt to tidy them up, before passing to
+    # a template filter like domain_human or urlizetrunc.
+    link_list = []
+    for line in links.splitlines():
+        if line == "":
+            pass
+        elif line.startswith("www."):
+            link_list.append(f"http://{line}")
+        else:
+            link_list.append(line)
+    return link_list

scoring/models.py

@@ -5,6 +5,7 @@
 from django.db.models import Avg, Count, F, Max, Q
 
 from caps.models import Council
+from caps.utils import clean_links
 
 
 # define this here as mixins imports PlanScore so if we import that then we get
@@ -531,6 +532,13 @@ def pretty_code(self):
     def is_council_operations_only(self):
         return self.code in self.COUNCIL_OPS_QUESTION_CODES
 
+    # the questions answered methods of PlanScore return PlanQuestion objects that
+    # are used like PlanQuestionScore objects in some cases so we need this in both
+    # classes
+    @property
+    def evidence_links_cleaned(self):
+        return clean_links(self.evidence_links)
+
     @classmethod
     def get_average_scores(cls, section=None, council_group=None):
         qs = PlanQuestionScore.objects.all()
@@ -582,22 +590,7 @@ class PlanQuestionScore(ScoreFilterMixin, models.Model):
 
     @property
     def evidence_links_cleaned(self):
-        # Evidence "links" can be one of:
-        # - an empty line
-        # - a string like "Airports:"
-        # - a string like "www.whatever.com/…"
-        # - a string like "http://www…"
-        # So attempt to tidy them up, before passing to
-        # a template filter like domain_human or urlizetrunc.
-        links = []
-        for line in self.evidence_links.splitlines():
-            if line == "":
-                pass
-            elif line.startswith("www."):
-                links.append(f"http://{line}")
-            else:
-                links.append(line)
-        return links
+        return clean_links(self.evidence_links)
 
     @classmethod
     def all_question_max_score_counts(

scoring/views.py

@@ -249,7 +249,7 @@ def make_question_obj(self, question):
             "how_marked_display": question.get_how_marked_display(),
             "is_council_operations_only": question.is_council_operations_only,
             "weighting": question.get_weighting_display(),
-            "evidence_links": question.evidence_links,
+            "evidence_links": question.evidence_links_cleaned,
         }
         if question.question_type == "HEADER":
             q["max"] = question.header_max