Rename phase_id to phase_pk

Author: koopmant

app/grandchallenge/evaluation/forms.py

@@ -775,7 +775,7 @@ def clean(self):
 
 
 class PhaseWithTask(NamedTuple):
-    phase_id: str
+    phase_pk: str
     task_id: int | None
 
 
@@ -795,13 +795,13 @@ def __init__(self, *args, challenge, challenge_request=None, **kwargs):
         )
 
         for phase in phases:
-            self.fields[f"phase_{phase.id}"] = forms.BooleanField(
+            self.fields[f"phase_{phase.pk}"] = forms.BooleanField(
                 label=str(phase),
                 required=False,
             )
 
             if challenge_request and len(challenge_request.task_ids) > 1:
-                self.fields[f"task_{phase.id}"] = forms.TypedChoiceField(
+                self.fields[f"task_{phase.pk}"] = forms.TypedChoiceField(
                     label=f"Task ID for {phase}",
                     choices=[(i, i) for i in challenge_request.task_ids],
                     coerce=int,
@@ -821,18 +821,18 @@ def clean(self):
         cleaned_selected_phases = []
 
         for name in selected_phases:
-            phase_id = name.split("_")[1]
-            task_id = cleaned_data.get(f"task_{phase_id}")
+            phase_pk = name.split("_")[1]
+            task_id = cleaned_data.get(f"task_{phase_pk}")
 
-            if task_id is None and f"task_{phase_id}" in cleaned_data:
+            if task_id is None and f"task_{phase_pk}" in cleaned_data:
                 self.add_error(
-                    field=f"task_{phase_id}",
+                    field=f"task_{phase_pk}",
                     error="The task ID must be provided.",
                 )
             else:
                 cleaned_selected_phases.append(
                     PhaseWithTask(
-                        phase_id=phase_id,
+                        phase_pk=phase_pk,
                         task_id=task_id,
                     )
                 )

app/grandchallenge/evaluation/views/__init__.py

@@ -1164,7 +1164,7 @@ def get_success_url(self):
 
     @staticmethod
     def turn_phase_into_algorithm_phase(*, phase_with_task):
-        phase = Phase.objects.get(pk=phase_with_task.phase_id)
+        phase = Phase.objects.get(pk=phase_with_task.phase_pk)
         archive = Archive.objects.create(
             title=format_html(
                 "{challenge_name} {phase_title} dataset",