Migrate pagevote and bookmark to use content_type

judge/models/bookmark.py

@@ -2,6 +2,8 @@ from django.db import models
 from django.db.models import CASCADE
 from django.utils.translation import gettext_lazy as _
 from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
 
 from judge.models.profile import Profile
 
@@ -13,7 +15,11 @@ class BookMark(models.Model):
         max_length=30,
         verbose_name=_("associated page"),
         db_index=True,
-    )
+    )  # deprecated
+    score = models.IntegerField(verbose_name=_("votes"), default=0)
+    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    object_id = models.PositiveIntegerField()
+    linked_object = GenericForeignKey("content_type", "object_id")
 
     def get_bookmark(self, user):
         userqueryset = MakeBookMark.objects.filter(bookmark=self, user=user)
@@ -22,31 +28,16 @@ class BookMark(models.Model):
         else:
             return False
 
-    def page_object(self):
-        from judge.models.contest import Contest
-        from judge.models.interface import BlogPost
-        from judge.models.problem import Problem, Solution
-
-        try:
-            page = self.page
-            if page.startswith("p:"):
-                return Problem.objects.get(code=page[2:])
-            elif page.startswith("c:"):
-                return Contest.objects.get(key=page[2:])
-            elif page.startswith("b:"):
-                return BlogPost.objects.get(id=page[2:])
-            elif page.startswith("s:"):
-                return Solution.objects.get(problem__code=page[2:])
-            return None
-        except ObjectDoesNotExist:
-            return None
-
     class Meta:
         verbose_name = _("bookmark")
         verbose_name_plural = _("bookmarks")
+        indexes = [
+            models.Index(fields=["content_type", "object_id"]),
+        ]
+        unique_together = ("content_type", "object_id")
 
     def __str__(self):
-        return self.page
+        return f"bookmark for {self.linked_object}"
 
 
 class MakeBookMark(models.Model):
@@ -56,6 +47,9 @@ class MakeBookMark(models.Model):
     )
 
     class Meta:
+        indexes = [
+            models.Index(fields=["user", "bookmark"]),
+        ]
         unique_together = ["user", "bookmark"]
         verbose_name = _("make bookmark")
         verbose_name_plural = _("make bookmarks")

judge/models/contest.py

@@ -299,6 +299,8 @@ class Contest(models.Model):
         help_text=_("Number of digits to round points to."),
     )
     comments = GenericRelation("Comment")
+    pagevote = GenericRelation("PageVote")
+    bookmark = GenericRelation("BookMark")
 
     @cached_property
     def format_class(self):

judge/models/interface.py

@@ -96,6 +96,8 @@ class BlogPost(models.Model):
         verbose_name=_("private to organizations"), default=False
     )
     comments = GenericRelation("Comment")
+    pagevote = GenericRelation("PageVote")
+    bookmark = GenericRelation("BookMark")
 
     def __str__(self):
         return self.title
@@ -130,17 +132,21 @@ class BlogPost(models.Model):
             and self.authors.filter(id=user.profile.id).exists()
         )
 
-    @cached_property
-    def pagevote(self):
-        page = "b:%s" % self.id
-        pagevote, _ = PageVote.objects.get_or_create(page=page)
-        return pagevote
+    def get_or_create_pagevote(self):
+        if self.pagevote.count():
+            return self.pagevote.first()
+        new_pagevote = PageVote()
+        new_pagevote.linked_object = self
+        new_pagevote.save()
+        return new_pagevote
 
-    @cached_property
-    def bookmark(self):
-        page = "b:%s" % self.id
-        bookmark, _ = BookMark.objects.get_or_create(page=page)
-        return bookmark
+    def get_or_create_bookmark(self):
+        if self.bookmark.count():
+            return self.bookmark.first()
+        new_bookmark = BookMark()
+        new_bookmark.linked_object = self
+        new_bookmark.save()
+        return new_bookmark
 
     class Meta:
         permissions = (("edit_all_post", _("Edit all posts")),)

judge/models/pagevote.py

@@ -1,6 +1,8 @@
 from django.db import models
 from django.db.models import CASCADE
 from django.utils.translation import gettext_lazy as _
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
 
 from judge.models.profile import Profile
 
@@ -12,12 +14,19 @@ class PageVote(models.Model):
         max_length=30,
         verbose_name=_("associated page"),
         db_index=True,
-    )
+    )  # deprecated
     score = models.IntegerField(verbose_name=_("votes"), default=0)
+    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    object_id = models.PositiveIntegerField()
+    linked_object = GenericForeignKey("content_type", "object_id")
 
     class Meta:
         verbose_name = _("pagevote")
         verbose_name_plural = _("pagevotes")
+        indexes = [
+            models.Index(fields=["content_type", "object_id"]),
+        ]
+        unique_together = ("content_type", "object_id")
 
     def vote_score(self, user):
         page_vote = PageVoteVoter.objects.filter(pagevote=self, voter=user)
@@ -27,7 +36,7 @@ class PageVote(models.Model):
             return 0
 
     def __str__(self):
-        return f"pagevote for {self.page}"
+        return f"pagevote for {self.linked_object}"
 
 
 class PageVoteVoter(models.Model):

judge/models/problem.py

@@ -272,6 +272,8 @@ class Problem(models.Model):
     objects = TranslatedProblemQuerySet.as_manager()
     tickets = GenericRelation("Ticket")
     comments = GenericRelation("Comment")
+    pagevote = GenericRelation("PageVote")
+    bookmark = GenericRelation("BookMark")
 
     organizations = models.ManyToManyField(
         Organization,
@@ -448,18 +450,6 @@ class Problem(models.Model):
     def usable_common_names(self):
         return set(self.usable_languages.values_list("common_name", flat=True))
 
-    @cached_property
-    def pagevote(self):
-        page = "p:%s" % self.code
-        pagevote, _ = PageVote.objects.get_or_create(page=page)
-        return pagevote
-
-    @cached_property
-    def bookmark(self):
-        page = "p:%s" % self.code
-        bookmark, _ = BookMark.objects.get_or_create(page=page)
-        return bookmark
-
     @property
     def usable_languages(self):
         return self.allowed_languages.filter(
@@ -559,6 +549,22 @@ class Problem(models.Model):
         cache.set(key, result)
         return result
 
+    def get_or_create_pagevote(self):
+        if self.pagevote.count():
+            return self.pagevote.first()
+        new_pagevote = PageVote()
+        new_pagevote.linked_object = self
+        new_pagevote.save()
+        return new_pagevote
+
+    def get_or_create_bookmark(self):
+        if self.bookmark.count():
+            return self.bookmark.first()
+        new_bookmark = BookMark()
+        new_bookmark.linked_object = self
+        new_bookmark.save()
+        return new_bookmark
+
     def save(self, *args, **kwargs):
         super(Problem, self).save(*args, **kwargs)
         if self.code != self.__original_code:
@@ -677,6 +683,8 @@ class Solution(models.Model):
     authors = models.ManyToManyField(Profile, verbose_name=_("authors"), blank=True)
     content = models.TextField(verbose_name=_("editorial content"))
     comments = GenericRelation("Comment")
+    pagevote = GenericRelation("PageVote")
+    bookmark = GenericRelation("BookMark")
 
     def get_absolute_url(self):
         problem = self.problem