Also record the ids of the archives being used

This will allow us to confirm to the competitors which were used
at the competition.

Author: PeterJCLaw

code_submitter/extract_archives.py

@@ -17,9 +17,16 @@ async def async_main(submissions_directory: Path) -> None:
     async with database.transaction():
         submissions = await utils.get_chosen_submissions(database)
 
-        for team, content in submissions.items():
+        for team, (_, content) in submissions.items():
             (submissions_directory / f'{team.upper()}.zip').write_bytes(content)
 
+        (submissions_directory / 'summary.txt').write_text(
+            "".join(
+                "{}: {}\n".format(team, id_)
+                for team, (id_, _) in submissions.items()
+            ),
+        )
+
 
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser()

code_submitter/utils.py

@@ -1,12 +1,14 @@
-from typing import Dict
+from typing import Dict, Tuple
 
 import databases
 from sqlalchemy.sql import select
 
 from .tables import Archive, ChoiceHistory
 
 
-async def get_chosen_submissions(database: databases.Database) -> Dict[str, bytes]:
+async def get_chosen_submissions(
+    database: databases.Database,
+) -> Dict[str, Tuple[int, bytes]]:
     """
     Return a mapping of teams to their the chosen archive.
     """
@@ -16,6 +18,7 @@ async def get_chosen_submissions(database: databases.Database) -> Dict[str, byte
 
     rows = await database.fetch_all(
         select([
+            Archive.c.id,
             Archive.c.team,
             Archive.c.content,
             ChoiceHistory.c.created,
@@ -28,4 +31,4 @@ async def get_chosen_submissions(database: databases.Database) -> Dict[str, byte
     )
 
     # Rely on later keys replacing earlier occurrences of the same key.
-    return {x['team']: x['content'] for x in rows}
+    return {x['team']: (x['id'], x['content']) for x in rows}

tests/tests_utils.py

@@ -67,8 +67,8 @@ def test_get_chosen_submissions_multiple_chosen(self) -> None:
         result = self.await_(utils.get_chosen_submissions(self.database))
         self.assertEqual(
             {
-                'SRZ2': b'1111111111',
-                'ABC': b'8888888888',
+                'SRZ2': (1111111111, b'1111111111'),
+                'ABC': (8888888888, b'8888888888'),
             },
             result,
         )