Skip to content

DeepCode suggestions #2

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DeepCode suggestions #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions ctf/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.db import models
from django.contrib.auth import get_user_model
from django.utils.timezone import now
from django.conf import settings

Expand All @@ -17,8 +16,8 @@ class Question(models.Model):
requires = models.ForeignKey('Question', on_delete=models.SET_NULL, related_name='questions_required_by', blank=True, null=True)
category = models.ForeignKey('Category', on_delete=models.SET_NULL, related_name='questions', null=True)
files = models.ManyToManyField('File', related_name='questions', blank=True)
solvers = models.ManyToManyField(get_user_model(), related_name='questions_attempted', through='Solution', blank=True)
has_seen_hint = models.ManyToManyField(get_user_model(), related_name='hints_used', blank=True)
solvers = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='questions_attempted', through='Solution', blank=True)
has_seen_hint = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='hints_used', blank=True)

@property
def order(self):
Expand Down Expand Up @@ -111,7 +110,7 @@ class Solution(models.Model):
timestamp = models.DateTimeField(auto_now_add=True, blank=True)
success = models.BooleanField()

user = models.ForeignKey(get_user_model(), on_delete=models.CASCADE, related_name='solutions')
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='solutions')
question = models.ForeignKey('Question', on_delete=models.CASCADE, related_name='solutions')

class Meta:
Expand All @@ -130,7 +129,7 @@ class Competition(models.Model):
start = models.DateTimeField()
end = models.DateTimeField()

competitors = models.ManyToManyField(get_user_model(), related_name='competitions', blank=True)
competitors = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='competitions', blank=True)

@property
def is_live(self):
Expand Down