Model stuff (#217)

* Add unique bill vote constraint

* Changed submit_task to use context manager

* Delete and recreate bill votes

* Fix mypy errors

* Make interaction links model methods

* back to 💯

Author: mfosterw

democrasite/activitypub/models.py

@@ -62,6 +62,11 @@ def get_absolute_url(self):
             "activitypub:person-detail", kwargs={"username": self.display_name}
         )
 
+    def get_follow_url(self):
+        return reverse(
+            "activitypub:person-follow", kwargs={"username": self.display_name}
+        )
+
     def is_following(self, person: "Person") -> bool:
         """Check if a person is following this person.
 
@@ -117,12 +122,12 @@ def __str__(self):
         return f'{self.person} reposted "{self.note}"'
 
 
-class NoteManager[T](TreeManager):
-    def get_queryset(self) -> models.QuerySet[T]:
+class NoteManager(TreeManager):
+    def get_queryset(self) -> models.QuerySet:
         """Get the queryset for notes, ordered by creation date."""
         return super().get_queryset().order_by(*self.model._meta.ordering)  # noqa: SLF001
 
-    def get_person_notes(self, person: Person) -> models.QuerySet[T]:
+    def get_person_notes(self, person: Person) -> models.QuerySet:
         """Get notes for display on a person's profile page.
 
         This method returns all notes authored by the person as well as all their
@@ -150,7 +155,7 @@ def get_person_notes(self, person: Person) -> models.QuerySet[T]:
         )
         return posts.union(reposts).order_by("-order_time")
 
-    def get_person_following_notes(self, person: Person) -> models.QuerySet[T]:
+    def get_person_following_notes(self, person: Person) -> models.QuerySet:
         """Get notes from people the person is following.
 
         This method retrieves all notes authored or reposted by people that the
@@ -240,6 +245,9 @@ def get_absolute_url(self):
         """
         return reverse("activitypub:note-detail", kwargs={"pk": self.pk})
 
+    def get_like_url(self):
+        return reverse("activitypub:note-like", kwargs={"pk": self.id})
+
     def liked_by(self, person: Person) -> bool:
         """Check if a person has liked the note.
 
@@ -264,6 +272,9 @@ def like(self, person: Person) -> bool:
         self.likes.add(person)
         return True
 
+    def get_repost_url(self):
+        return reverse("activitypub:note-repost", kwargs={"pk": self.id})
+
     def reposted_by(self, person: Person) -> bool:
         """Check if a person has reposted the note.
 

democrasite/activitypub/tests/test_models.py

@@ -27,6 +27,12 @@ def test_get_absolute_url(self, person: Person):
             person.get_absolute_url() == f"/activitypub/person/{person.user.username}/"
         )
 
+    def test_get_follow_url(self, person: Person):
+        assert (
+            person.get_follow_url()
+            == f"/activitypub/person/{person.user.username}/follow/"
+        )
+
     def test_is_following(self, person: Person):
         person2 = PersonFactory.create()
         person.following.add(person2)
@@ -81,7 +87,7 @@ def test_get_person_notes(self, person: Person, note: Note):
 
         repost = person_notes[1]
         assert repost.repost_person == person.display_name
-        assert repost.repost_time == note.repost_set.first().created
+        assert repost.repost_time == note.repost_set.first().created  # type: ignore[union-attr]
 
     def test_get_person_following_notes(self, person: Person):
         person2 = PersonFactory.create()
@@ -104,7 +110,7 @@ def test_get_person_following_notes(self, person: Person):
 
         repost = following_notes[1]
         assert repost.repost_person == person2.display_name
-        assert repost.repost_time == own_notes[0].repost_set.first().created
+        assert repost.repost_time == own_notes[0].repost_set.first().created  # type: ignore[union-attr]
 
 
 class TestNote:
@@ -119,6 +125,9 @@ def test_str_short_content(self):
     def test_get_absolute_url(self, note: Note):
         assert note.get_absolute_url() == f"/activitypub/notes/{note.pk}/"
 
+    def test_get_like_url(self, note: Note):
+        assert note.get_like_url() == f"/activitypub/notes/{note.id}/like/"
+
     def test_liked_by(self, note: Note, person: Person):
         assert not note.liked_by(person)
 
@@ -135,6 +144,9 @@ def test_like(self, note: Note, person: Person):
 
         assert person not in note.likes.all()
 
+    def test_get_repost_url(self, note: Note):
+        assert note.get_repost_url() == f"/activitypub/notes/{note.id}/repost/"
+
     def test_reposted_by(self, note: Note, person: Person):
         assert not note.reposted_by(person)
 

democrasite/activitypub/views.py

@@ -105,6 +105,8 @@ def form_valid(self, form):
 @require_POST
 @require_user_profile
 def note_like_view(request: HttpRequest, pk: int) -> http.HttpResponse:
+    assert request.user.is_authenticated  # type guard
+
     note = get_object_or_404(Note, pk=pk)
     note.like(request.user.person)
 
@@ -114,6 +116,8 @@ def note_like_view(request: HttpRequest, pk: int) -> http.HttpResponse:
 @require_POST
 @require_user_profile
 def note_repost_view(request: HttpRequest, pk: int) -> http.HttpResponse:
+    assert request.user.is_authenticated  # type guard
+
     note = get_object_or_404(Note, pk=pk)
     note.repost(request.user.person)
 
@@ -193,6 +197,8 @@ def get_queryset(self):
 @require_user_profile
 def person_follow_view(request: HttpRequest, username: str) -> http.HttpResponse:
     """Follow a user by username."""
+    assert request.user.is_authenticated  # type guard
+
     person = get_object_or_404(Person, user__username=username)
     request.user.person.following.add(person)
 

democrasite/templates/activitypub/snippets/note.html

@@ -21,7 +21,7 @@
                   bi-heart
                 {% endif %}
                 text-danger note-like"
-         action="{% url 'activitypub:note-like' note.id %}"></i>
+         action="{{ note.get_like_url }}"></i>
     </a>
     <small class="text-secondary note-like-count">{{ note.likes.count }}</small>
     <a href="javascript:;"
@@ -34,7 +34,7 @@
                   text-secondary
                 {% endif %}
                 note-repost"
-         action="{% url 'activitypub:note-repost' note.id %}"></i>
+         action="{{ note.get_repost_url }}"></i>
     </a>
     <small class="text-secondary note-repost-count">{{ note.reposts.count }}</small>
     <a class="float-right text-secondary"

democrasite/templates/webiscite/bill_detail.html

@@ -23,7 +23,7 @@ <h2>{{ bill }}</h2>
         <p>
           {{ bill.description }}
           {% if bill.author == user and bill.status == bill.Status.OPEN %}
-            <a href="{% url 'webiscite:bill-update' bill.id %}">
+            <a href="{{ bill.get_update_url }}">
               <i class="bi bi-pencil-square"></i>
             </a>
           {% endif %}
@@ -50,7 +50,7 @@ <h2>{{ bill }}</h2>
             {% if user.is_authenticated %}
               {# if logged in, add vote-enabling logic #}
               id="vote-yes-{{ bill.id }}"
-              action="{% url 'webiscite:bill-vote' bill.id %}"
+              action="{{ bill.get_vote_url }}"
               value="vote-yes"
             {% else %}
               {# otherwise, add a "log in to vote" popup #}
@@ -66,7 +66,7 @@ <h2>{{ bill }}</h2>
                   {% if user in bill.no_votes.all %}font-weight-bold{% endif %}"
            {% if bill.status == bill.Status.OPEN %}
              {% if user.is_authenticated %}
-               id="vote-no-{{ bill.id }}" action="{% url 'webiscite:bill-vote' bill.id %}" value="vote-no"
+               id="vote-no-{{ bill.id }}" action="{{ bill.get_vote_url }}" value="vote-no"
              {% else %}
                data-toggle="tooltip" data-placement="bottom" title="{% trans 'Log in to vote' %}" data-trigger="click"
              {% endif %}

democrasite/templates/webiscite/bill_list.html

@@ -46,7 +46,7 @@ <h5 class="card-title">{{ bill }}</h5>
                       {% if user in bill.yes_votes.all %}font-weight-bold{% endif %}"
                {% if bill.status == bill.Status.OPEN %}
                  {% if user.is_authenticated %}
-                   id="vote-yes-{{ bill.id }}" action="{% url 'webiscite:bill-vote' bill.id %}" value="vote-yes"
+                   id="vote-yes-{{ bill.id }}" action="{{ bill.get_vote_url }}" value="vote-yes"
                  {% else %}
                    data-toggle="tooltip" data-placement="bottom" title="Log in to vote" data-trigger="click"
                  {% endif %}
@@ -58,7 +58,7 @@ <h5 class="card-title">{{ bill }}</h5>
                       {% if user in bill.no_votes.all %}font-weight-bold{% endif %}"
                {% if bill.status == bill.Status.OPEN %}
                  {% if user.is_authenticated %}
-                   id="vote-no-{{ bill.id }}" action="{% url 'webiscite:bill-vote' bill.id %}" value="vote-no"
+                   id="vote-no-{{ bill.id }}" action="{{ bill.get_vote_url }}" value="vote-no"
                  {% else %}
                    data-toggle="tooltip" data-placement="bottom" title="{% trans 'Log in to vote' %}" data-trigger="click"
                  {% endif %}

democrasite/webiscite/migrations/0003_vote_unique_user_bill_vote.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.6 on 2025-07-05 19:13
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webiscite', '0002_remove_bill_submit_task_bill__submit_task'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name='vote',
+            constraint=models.UniqueConstraint(fields=('bill', 'user'), name='unique_user_bill_vote', violation_error_code='Only one vote per user per bill allowed'),
+        ),
+    ]