feat: read comments and course variations from IOF XML (#530)

Author: sergeikobelev

sportorg/libs/iof/parser.py

@@ -98,7 +98,7 @@ def variation_data(tree, ns):
     root = tree.getroot()
     if "CourseData" not in root.tag:
         return
-    teams = []
+    course_assignments = []
 
     version = "0"
     if "iofVersion" in root.attrib:
@@ -108,22 +108,28 @@ def variation_data(tree, ns):
 
     if version == "3":
         # TeamCourseAssignment - variations for relays
-        for team_el in root.find("iof:RaceCourseData", ns).findall(
-            "iof:TeamCourseAssignment", ns
-        ):
+        for team_el in root.find("iof:RaceCourseData", ns).findall("iof:TeamCourseAssignment", ns):
             team = {
                 "bib_number": int(team_el.find("iof:BibNumber", ns).text),
-                "legs": [],
+                "legs": []
             }
             for leg_el in team_el.findall("iof:TeamMemberCourseAssignment", ns):
                 leg = {
                     "leg_number": leg_el.find("iof:Leg", ns).text,
-                    "course_name": leg_el.find("iof:CourseName", ns).text,
+                    "course_name": leg_el.find("iof:CourseName", ns).text
                 }
                 team["legs"].append(leg)
-            teams.append(team)
+            course_assignments.append(team)
 
-    return teams
+        for person_el in root.find("iof:RaceCourseData", ns).findall("iof:PersonCourseAssignment", ns):
+            course_assignment = {
+                "bib_number": int(person_el.find("iof:BibNumber", ns).text),
+                "course_name": person_el.find("iof:CourseName", ns).text,
+                "legs": []
+            }
+            course_assignments.append(course_assignment)
+
+    return course_assignments
 
 
 def entry_list(tree, ns):
@@ -164,6 +170,12 @@ def entry_list(tree, ns):
                 if bib_el is not None:
                     person["extensions"]["bib"] = bib_el.text
 
+            service_request_el = person_entry_el.find("iof:ServiceRequest", ns)
+            if service_request_el is not None:
+                comment_el = service_request_el.find("iof:Comment", ns)
+                if comment_el is not None:
+                    person["comment"] = comment_el.text
+
             org_el = person_entry_el.find("iof:Organisation", ns)
             organization = None
             if org_el:

sportorg/modules/iof/iof_xml.py

@@ -111,39 +111,51 @@ def import_from_course_data(courses) -> None:
                 obj.courses.append(c)
 
 
-def import_from_variation_data(teams) -> None:
+def import_from_variation_data(course_assignments) -> None:
     obj = race()
-    for team in teams:
-        for leg in team["legs"]:
-            leg_number = leg["leg_number"]
-            course_name = leg["course_name"]
+    for course_assignment in course_assignments:
+        if course_assignment["legs"] and len(course_assignment["legs"]) > 0:
+            # relay
+            for leg in course_assignment["legs"]:
+                leg_number = leg["leg_number"]
+                course_name = leg["course_name"]
+                course = find(obj.courses, name=course_name)
+                if course:
+                    new_course = Course()
+                    new_course.name = str(course_assignment["bib_number"]) + "." + str(leg_number)
+                    new_course.length = course.length
+                    new_course.controls = copy.deepcopy(course.controls)
+                    obj.courses.append(new_course)
+
+        elif course_assignment["course_name"] is not None:
+            # one man relay
+            course_name = course_assignment["course_name"]
             course = find(obj.courses, name=course_name)
             if course:
                 new_course = Course()
-                new_course.name = str(team["bib_number"]) + "." + str(leg_number)
+                new_course.name = str(course_assignment["bib_number"])
                 new_course.length = course.length
                 new_course.controls = copy.deepcopy(course.controls)
                 obj.courses.append(new_course)
 
-
 def create_person(person_entry):
     obj = race()
 
     person = Person()
 
     name = person_entry["group"]["name"]
     if (
-        "short_name" in person_entry["group"]
-        and len(person_entry["group"]["short_name"]) > 0
+            "short_name" in person_entry["group"]
+            and len(person_entry["group"]["short_name"]) > 0
     ):
         name = person_entry["group"]["short_name"]
     group = find(obj.groups, name=name)
     if group is None:
         group = Group()
         group.long_name = person_entry["group"]["name"]
         if (
-            "short_name" in person_entry["group"]
-            and len(person_entry["group"]["short_name"]) > 0
+                "short_name" in person_entry["group"]
+                and len(person_entry["group"]["short_name"]) > 0
         ):
             group.name = person_entry["group"]["short_name"]
         else:
@@ -180,19 +192,22 @@ def create_person(person_entry):
     if "bib" in person_entry["person"] and person_entry["person"]["bib"]:
         person.set_bib(int(person_entry["person"]["bib"]))
     elif (
-        "bib" in person_entry["person"]["extensions"]
-        and person_entry["person"]["extensions"]["bib"]
+            "bib" in person_entry["person"]["extensions"]
+            and person_entry["person"]["extensions"]["bib"]
     ):
         person.set_bib(int(person_entry["person"]["extensions"]["bib"]))
     if (
-        "qual" in person_entry["person"]["extensions"]
-        and person_entry["person"]["extensions"]["qual"]
+            "qual" in person_entry["person"]["extensions"]
+            and person_entry["person"]["extensions"]["qual"]
     ):
         person.qual = Qualification.get_qual_by_name(
             person_entry["person"]["extensions"]["qual"]
         )
     if "start" in person_entry["person"] and person_entry["person"]["start"]:
         person.start_time = time_iof_to_otime(person_entry["person"]["start"])
+    if "comment" in person_entry["person"]:
+        person.comment = person_entry["person"]["comment"]
+
 
     obj.persons.append(person)
     return person
@@ -306,10 +321,10 @@ def import_from_event_data(data) -> None:
     if "name" in data:
         new_name = data["name"]
         if (
-            new_name
-            and len(new_name) > 0
-            and new_name != "Event"
-            and new_name.find("Example") < 0
+                new_name
+                and len(new_name) > 0
+                and new_name != "Event"
+                and new_name.find("Example") < 0
         ):
             obj.data.title = data["name"]