Skip to content

denis: initial: update query to reflect new schema #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michael-burke4 merged 2 commits into from
Sep 23, 2024
Merged

denis: initial: update query to reflect new schema #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4794d1d
denis: initial: update query to reflect new schema
charliemirabile Sep 23, 2024
d6f2e25
denis: initial/db: handle < 3 students completing assignment
charliemirabile Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions denis/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ class Assignment(BaseModel):
class PeerReviewAssignment(BaseModel):
assignment = peewee.TextField()
reviewer = peewee.TextField()
reviewee1 = peewee.TextField()
reviewee2 = peewee.TextField()
reviewee1 = peewee.TextField(null=True)
reviewee2 = peewee.TextField(null=True)

class Meta:
indexes = ((('assignment', 'reviewer'), True),)
Expand Down
8 changes: 4 additions & 4 deletions denis/initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def generate_peer_review_email(assignment, review_table):

students_who_submitted = [user.username for user in orbit.db.User.select()
if mailman.db.Submission.get_or_none((mailman.db.Submission.user == user.username) & # NOQA: E501
(mailman.db.Submission.assignment == assignment)) is not None] # NOQA: E501
(mailman.db.Submission.recipient == assignment)) is not None] # NOQA: E501

# let them see emails that have been sent since last final due date
for student in students_who_submitted:
Expand Down Expand Up @@ -142,9 +142,9 @@ def generate_peer_review_email(assignment, review_table):
db.PeerReviewAssignment.insert_many(
[{'assignment': assignment,
'reviewer': reviewer,
'reviewee1': reviewee1,
'reviewee2': reviewee2}
for (reviewer, reviewee1, reviewee2) in reviews]).execute()
'reviewee1': reviewees[0] if len(reviewees) >= 1 else None,
'reviewee2': reviewees[1] if len(reviewees) >= 2 else None}
for [reviewer, *reviewees] in reviews]).execute()
except db.peewee.IntegrityError as e:
print(e)

Expand Down