Dashboard overhaul

container-compose.yml

@@ -41,6 +41,7 @@ services:
       additional_contexts:
         - orbit_docs_source=./docs
         - mailman_source=./mailman
+        - denis_source=./denis
       target: orbit
       args:
         orbit_version_info: "singularity ${SINGULARITY_VERSION} ${SINGULARITY_DEPLOYMENT_STATUS} https://github.com/underground-software/singularity"
@@ -55,6 +56,10 @@ services:
         source: submissions-db
         target: /var/lib/mailman
         read_only: true
+      - type: volume
+        source: denis-db
+        target: /var/lib/denis
+        read_only: true
       - type: volume
         source: git-repos
         target: /var/lib/git

mailman/db.py

@@ -18,6 +18,15 @@ class Submission(BaseModel):
     recipient = peewee.TextField()
     email_count = peewee.IntegerField()
     in_reply_to = peewee.TextField(null=True)
+    status = peewee.TextField(null=True)
+
+
+class Gradeable(BaseModel):
+    submission_id = peewee.TextField(unique=True)
+    timestamp = peewee.IntegerField()
+    user = peewee.TextField()
+    assignment = peewee.TextField()
+    component = peewee.TextField()
 
 
 if __name__ == '__main__':

mailman/submit.py

@@ -5,6 +5,7 @@
 import sys
 
 import db
+import denis.db
 
 
 Email = collections.namedtuple('Email', ['rcpt', 'msg_id'])
@@ -22,6 +23,7 @@ def main(argv):
     with open(Path(logdir) / logfile) as log:
         header, *email_lines = log.readlines()
     timestamp, user = header.split()
+    timestamp = int(timestamp)
 
     emails = [email_from_log_line(line) for line in email_lines]
 
@@ -46,9 +48,55 @@ def main(argv):
             reply_id = reply_email_id[:-4] + '0000'
             break
 
-    db.Submission.create(submission_id=logfile, timestamp=timestamp,
-                         user=user, recipient=emails[0].rcpt,
-                         email_count=len(emails), in_reply_to=reply_id)
+    sub = db.Submission(submission_id=logfile, timestamp=timestamp,
+                        user=user, recipient=emails[0].rcpt,
+                        email_count=len(emails), in_reply_to=reply_id)
+
+    def set_status(status):
+        sub.status = status
+        sub.save()
+        return 0
+
+    asn_db = denis.db.Assignment
+    gr_db = db.Gradeable
+    if asn := asn_db.get_or_none(asn_db.name == emails[0].rcpt):
+        if len(emails) < 2:
+            return set_status('missing patches')
+        typ = ('initial' if timestamp < asn.initial_due_date
+               else 'final' if timestamp < asn.final_due_date else None)
+        if not typ:
+            return set_status(f'{asn.name} past due')
+        gr_db.create(submission_id=logfile, timestamp=timestamp, user=user,
+                     assignment=asn.name, component=typ)
+        return set_status(f'{asn.name}: {typ}')
+
+    if reply_id:
+        if not (orig := gr_db.get_or_none(gr_db.submission_id == reply_id)):
+            return set_status('not a reply to a submission')
+        asn_name = orig.assignment
+        asn = asn_db.get_or_none(asn_name == asn_db.name)
+        if not asn:
+            raise RuntimeError('invalid assignment name in gradeable DB')
+        if timestamp > asn.peer_review_due_date:
+            return set_status(f'{asn.name} review past due')
+        rev_db = denis.db.PeerReviewAssignment
+        rev = rev_db.get_or_none((rev_db.assignment == asn_name) &
+                                 (rev_db.reviewer == user))
+        if not rev:
+            return set_status('ineligible for peer review')
+        match emails[0].rcpt:
+            case rev.reviewee1:
+                typ = 'review1'
+            case rev.reviewee2:
+                typ = 'review2'
+            case _:
+                return set_status('reviewed wrong submission')
+        gr_db.create(submission_id=logfile, timestamp=timestamp,
+                     user=user, assignment=asn_name, component=typ,
+                     comments=None)
+        return set_status(f'{asn_name}: {typ}')
+
+    return set_status('Not a recognized recipient')
 
 
 if __name__ == "__main__":

nginx_snippets/server_https/00-orbit-paths.conf

@@ -5,7 +5,7 @@ location @login {
 	return 303 /login?target=$uri;
 }
 
-location ~* ^((.*\.md)|/log(in|out)|/dashboard|/register|/cgit.*)$ {
+location ~* ^((.*\.md)|/log(in|out)|/activity|/dashboard|/register|/cgit.*)$ {
 	include uwsgi_params;
 	proxy_intercept_errors on;
 	proxy_pass http://orbit:9098;

orbit/Containerfile

@@ -33,6 +33,7 @@ WORKDIR /usr/local/share/orbit
 COPY --from=build /usr/local/share/orbit /usr/local/share/orbit
 COPY --from=orbit_docs_source . ./docs
 COPY --from=mailman_source . ./mailman
+COPY --from=denis_source . ./denis
 
 RUN mkdir -p /var/lib/orbit/ && \
 	./db.py \

orbit/db.py

@@ -23,5 +23,11 @@ class Session(BaseModel):
     expiry = peewee.FloatField()
 
 
+class Oopsie(BaseModel):
+    user = peewee.TextField(primary_key=True)
+    assignment = peewee.TextField()
+    timestamp = peewee.IntegerField()
+
+
 if __name__ == '__main__':
     DB.create_tables(BaseModel.__subclasses__())

orbit/header.html

@@ -21,7 +21,8 @@ <h1 class="title" >Kernel Development Learning Pipeline</h1>
 		<div class="nav">
 			<a class="nav" href="/index.md">Home</a>
 			<a class="nav" href="/cgit">Git</a>
-			<a class="nav" href="/dashboard">Dashboard</a>
+			<a class="nav" href="/dashboard">Course Dashboard</a>
+			<a class="nav" href="/activity">Activity Log</a>
 			<a class="nav" href="/login">Login</a>
 		</div>
 		<hr>