Fix submission archive issues

* Skip hidden participations
* Skip unofficial submissions
* Fully exclude archives from contest dump (previously, only file was excluded)

cmscontrib/DumpExporter.py

@@ -48,7 +48,8 @@
 from cms.db import version as model_version, Codename, Filename, \
     FilenameSchema, FilenameSchemaArray, Digest, SessionGen, Contest, User, \
     Task, Submission, UserTest, SubmissionResult, UserTestResult, PrintJob, \
-    Announcement, Participation, enumerate_files, District, School, Team
+    Announcement, Participation, enumerate_files, District, School, Team, \
+    DistrictSubmissionArchive
 from cms.db.filecacher import FileCacher
 from cmscommon.datetime import make_timestamp
 from cmscommon.digest import path_digest
@@ -346,6 +347,10 @@ class of the given object), an item for each column property
                 data[prp.key] = [self.get_id(p) for p in participations if p.contest_id in self.contests_ids]
                 continue
 
+            # Skip submission archives
+            if other_cls is DistrictSubmissionArchive:
+                continue
+
             val = getattr(obj, prp.key)
             if val is None:
                 data[prp.key] = None

cmscontrib/GenerateDistrictSubmissionArchives.py

@@ -82,6 +82,8 @@ def collect_archive(contest, district, session, replace, timezone):
         .filter(
             Participation.contest_id == contest.id,
             User.district_id == district.id,
+            Submission.official == True,
+            Participation.hidden == False,
         )
         .join(Task)
         .outerjoin(SubmissionResult)