ref(notifications): improve naming

Author: Jenselme

legadilo/feeds/models/feed.py

@@ -329,8 +329,8 @@ def log_error(self, feed: Feed, error_message: str, technical_debug_data: dict |
                 user=feed.user,
                 title=_("Feed '%s' was disabled") % feed.title,
                 content=str(message),
-                url=reverse("feeds:edit_feed", kwargs={"feed_id": feed.id}),
-                url_text=str(_("Edit feed")),
+                info_link=reverse("feeds:edit_feed", kwargs={"feed_id": feed.id}),
+                info_link_text=str(_("Edit feed")),
             )
 
     def log_not_modified(self, feed: Feed):

legadilo/feeds/tests/test_models/test_feed.py

@@ -496,8 +496,8 @@ def test_disabled(self):
         assert not notification.is_read
         assert notification.title == f"Feed '{self.feed.title}' was disabled"
         assert notification.content == "We failed too many times to fetch the feed"
-        assert re.match(r"/feeds/\d+/", notification.url)
-        assert notification.url_text == "Edit feed"
+        assert re.match(r"/feeds/\d+/", notification.info_link)
+        assert notification.info_link_text == "Edit feed"
 
     def test_update_feed(self, django_assert_num_queries):
         existing_article = ArticleFactory(

legadilo/templates/users/notifications.html

@@ -20,8 +20,8 @@ <h2 class="card-title">{{ notification.title }}</h2>
                 </header>
                 <main class="card-text">
                     <p class="mb-1">{{ notification.content }}</p>
-                    {% if notification.url %}
-                        <a class="card-link" href="{{ notification.url }}">{{ notification.url_text }}</a>
+                    {% if notification.info_link %}
+                        <a class="card-link" href="{{ notification.info_link }}">{{ notification.info_link_text }}</a>
                     {% endif %}
                 </main>
                 <form class="mt-2" method="post" hx-boost="true" hx-push-url="false">

legadilo/users/migrations/0009_remove_notification_users_notification_url_and_text_set_together_and_more.py

@@ -0,0 +1,56 @@
+# Legadilo
+# Copyright (C) 2023-2025 by Legadilo contributors.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Generated by Django 5.2 on 2025-04-12 10:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "users",
+            "0008_remove_notification_users_notification_link_and_text_set_together_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="notification",
+            name="users_notification_url_and_text_set_together",
+        ),
+        migrations.RenameField(
+            model_name="notification",
+            old_name="url",
+            new_name="info_link",
+        ),
+        migrations.RenameField(
+            model_name="notification",
+            old_name="url_text",
+            new_name="info_link_text",
+        ),
+        migrations.AddConstraint(
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                condition=models.Q(
+                    models.Q(("info_link__length", 0), ("info_link_text__length", 0)),
+                    models.Q(("info_link__length__gt", 0), ("info_link_text__length__gt", 0)),
+                    _connector="OR",
+                ),
+                name="users_notification_info_link_and_info_link_text_set_together",
+            ),
+        ),
+    ]

legadilo/users/models/notification.py

@@ -83,8 +83,8 @@ def mark_as_unread(self, user: User, notification_id: int | None = None) -> None
 class Notification(models.Model):
     title = models.CharField(max_length=100)
     content = models.TextField(blank=True)
-    url = models.URLField(blank=True)
-    url_text = models.CharField(max_length=100, blank=True)
+    info_link = models.URLField(blank=True)
+    info_link_text = models.CharField(max_length=100, blank=True)
     read_at = models.DateTimeField(null=True, blank=True)
     is_read = models.GeneratedField(
         expression=models.Case(
@@ -104,9 +104,9 @@ class Notification(models.Model):
     class Meta(TypedModelMeta):
         constraints = [
             models.CheckConstraint(
-                name="%(app_label)s_%(class)s_url_and_text_set_together",
-                condition=(models.Q(url__length=0) & models.Q(url_text__length=0))
-                | (models.Q(url__length__gt=0) & models.Q(url_text__length__gt=0)),
+                name="%(app_label)s_%(class)s_info_link_and_info_link_text_set_together",
+                condition=(models.Q(info_link__length=0) & models.Q(info_link_text__length=0))
+                | (models.Q(info_link__length__gt=0) & models.Q(info_link_text__length__gt=0)),
             ),
         ]