From f4e408e99923bd9d0e9d03cbbb724a9a3dcc2994 Mon Sep 17 00:00:00 2001 From: tdruez Date: Mon, 2 Nov 2026 16:28:50 +0400 Subject: [PATCH 1/6] chore: replace django-notifications-patched with an internal notifications app Signed-off-by: tdruez --- .dockerignore | 1 + MANIFEST.in | 1 + component_catalog/tests/test_views.py | 2 +- compose.dev.yml | 1 + dje/models.py | 3 +- .../navbar/navbar_header_right_menu.html | 3 +- .../notifications/notice_content.html | 5 +- dje/tests/test_views.py | 22 ++- dje/views.py | 24 +-- etc/scripts/build_deb_docker.py | 9 +- etc/scripts/build_rpm_docker.py | 12 +- notifications/__init__.py | 7 + notifications/apps.py | 15 ++ ...009_alter_notification_options_and_more.py | 157 ++++++++++++++++++ .../migrations/0002_remove_unused_fields.py | 38 +++++ notifications/migrations/__init__.py | 0 notifications/models.py | 78 +++++++++ notifications/tests/__init__.py | 0 notifications/tests/test_models.py | 65 ++++++++ product_portfolio/tests/test_tasks.py | 2 +- product_portfolio/tests/test_views.py | 2 +- pyproject.toml | 4 - .../django-notifications-patched-2.0.0.tar.gz | Bin 33450 -> 0 bytes .../dist/jsonfield-3.2.0-py3-none-any.whl | Bin 8316 -> 0 bytes .../jsonfield-3.2.0-py3-none-any.whl.ABOUT | 13 -- .../dist/swapper-1.5.0-py2.py3-none-any.whl | Bin 7273 -> 0 bytes uv.lock | 36 ---- vulnerabilities/tests/test_fetch.py | 3 +- workflow/notification.py | 15 +- workflow/tests/test_views.py | 2 +- 30 files changed, 414 insertions(+), 106 deletions(-) create mode 100644 notifications/__init__.py create mode 100644 notifications/apps.py create mode 100644 notifications/migrations/0001_squashed_0009_alter_notification_options_and_more.py create mode 100644 notifications/migrations/0002_remove_unused_fields.py create mode 100644 notifications/migrations/__init__.py create mode 100644 notifications/models.py create mode 100644 notifications/tests/__init__.py create mode 100644 notifications/tests/test_models.py delete mode 100644 thirdparty/dist/django-notifications-patched-2.0.0.tar.gz delete mode 100644 thirdparty/dist/jsonfield-3.2.0-py3-none-any.whl delete mode 100644 thirdparty/dist/jsonfield-3.2.0-py3-none-any.whl.ABOUT delete mode 100644 thirdparty/dist/swapper-1.5.0-py2.py3-none-any.whl diff --git a/.dockerignore b/.dockerignore index 1eb63a0d..2e1e336a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -10,6 +10,7 @@ !dje/ !license_library/ !notification/ +!notifications/ !organization/ !policy/ !product_portfolio/ diff --git a/MANIFEST.in b/MANIFEST.in index aea848c4..9bae1949 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -21,6 +21,7 @@ graft docs graft etc graft license_library graft notification +graft notifications graft organization graft policy graft product_portfolio diff --git a/component_catalog/tests/test_views.py b/component_catalog/tests/test_views.py index 186b72de..2940f9d7 100644 --- a/component_catalog/tests/test_views.py +++ b/component_catalog/tests/test_views.py @@ -26,7 +26,6 @@ from django.utils.encoding import force_str from guardian.shortcuts import assign_perm -from notifications.models import Notification from component_catalog.forms import ComponentAddToProductForm from component_catalog.forms import ComponentForm @@ -64,6 +63,7 @@ from license_library.models import LicenseTag from license_library.models import LicenseTagGroup from license_library.models import LicenseTagGroupAssignedTag +from notifications.models import Notification from organization.models import Owner from organization.models import Subowner from policy.models import UsagePolicy diff --git a/compose.dev.yml b/compose.dev.yml index 835bc9e5..c33f6ba0 100644 --- a/compose.dev.yml +++ b/compose.dev.yml @@ -43,6 +43,7 @@ services: - ./dje:/opt/dejacode/dje - ./license_library:/opt/dejacode/license_library - ./notification:/opt/dejacode/notification + - ./notifications:/opt/dejacode/notifications - ./organization:/opt/dejacode/organization - ./policy:/opt/dejacode/policy - ./product_portfolio:/opt/dejacode/product_portfolio diff --git a/dje/models.py b/dje/models.py index 7c19488a..e94bbcbc 100644 --- a/dje/models.py +++ b/dje/models.py @@ -46,11 +46,10 @@ from django.utils.text import format_lazy from django.utils.translation import gettext_lazy as _ -from notifications.models import Notification - from aboutcode.api_auth import AbstractAPIToken from dje.fields import LastModifiedByField from dje.tasks import send_mail_task +from notifications.models import Notification logger = logging.getLogger("dje") diff --git a/dje/templates/navbar/navbar_header_right_menu.html b/dje/templates/navbar/navbar_header_right_menu.html index 71593b16..4c6fb262 100644 --- a/dje/templates/navbar/navbar_header_right_menu.html +++ b/dje/templates/navbar/navbar_header_right_menu.html @@ -1,5 +1,4 @@ {% load i18n static %} -{% load has_notification from notifications_tags %} {% block right-nav %}
  • @@ -23,7 +22,7 @@
  • - {% if user|has_notification %} + {% if user.notifications.unread.exists %} diff --git a/dje/templates/notifications/notice_content.html b/dje/templates/notifications/notice_content.html index ee8bf051..7ece3351 100644 --- a/dje/templates/notifications/notice_content.html +++ b/dje/templates/notifications/notice_content.html @@ -9,12 +9,9 @@ {% elif action_object_content_type|slugify == 'package' %} (object not found) {% endif %} - {% if notice.target %} - of {{ notice.target }} - {% endif %} - {{ notice.timesince }} ago + {{ notice.timestamp|timesince }} ago {% if notice.description %} diff --git a/dje/tests/test_views.py b/dje/tests/test_views.py index b1fd5c70..846632d5 100644 --- a/dje/tests/test_views.py +++ b/dje/tests/test_views.py @@ -20,7 +20,6 @@ from django.urls import reverse from guardian.shortcuts import assign_perm -from notifications.models import Notification from dje.models import Dataspace from dje.models import DataspaceConfiguration @@ -30,6 +29,7 @@ from dje.tests import create from dje.tests import create_superuser from dje.tests import create_user +from notifications.models import Notification Owner = apps.get_model("organization", "Owner") Component = apps.get_model("component_catalog", "Component") @@ -383,6 +383,26 @@ def test_mark_all_notifications_as_read_view(self): self.assertRedirects(response, unread_url) self.assertEqual(0, self.user.notifications.unread().count()) + def test_notifications_list_views(self): + Notification.objects.create(recipient=self.user, actor=self.user, verb="Read", unread=False) + Notification.objects.create(recipient=self.user, actor=self.super_user, verb="Unread") + Notification.objects.create(recipient=self.super_user, actor=self.user, verb="Other") + unread_url = reverse("notifications:unread") + all_url = reverse("notifications:all") + + response = self.client.get(unread_url) + self.assertRedirects(response, f"{reverse('login')}?next={unread_url}") + + self.client.login(username=self.user.username, password="secret") + response = self.client.get(unread_url) + self.assertEqual(["Unread"], [notice.verb for notice in response.context["notifications"]]) + self.assertEqual(2, response.context["all_count"]) + self.assertEqual(1, response.context["unread_count"]) + + response = self.client.get(all_url) + verbs = [notice.verb for notice in response.context["notifications"]] + self.assertEqual(["Unread", "Read"], verbs) + @override_settings(REFERENCE_DATASPACE="Dataspace") def test_global_search_list_view(self): self.client.login(username=self.user.username, password="secret") diff --git a/dje/views.py b/dje/views.py index 27872e82..ef28a7a1 100644 --- a/dje/views.py +++ b/dje/views.py @@ -74,7 +74,6 @@ from drf_yasg.views import get_schema_view from grappelli.views.related import AutocompleteLookup from grappelli.views.related import RelatedLookup -from notifications import views as notifications_views from aboutcode.api_auth.views import BaseGenerateAPIKeyView from aboutcode.api_auth.views import BaseRevokeAPIKeyView @@ -2306,24 +2305,25 @@ def get_context_data(self, **kwargs): return context -class UnreadNotificationsList( - NotificationsCountMixin, - notifications_views.UnreadNotificationsList, -): - pass +class NotificationsListView(LoginRequiredMixin, NotificationsCountMixin, ListView): + template_name = "notifications/list.html" + context_object_name = "notifications" + paginate_by = 20 -class AllNotificationsList( - NotificationsCountMixin, - notifications_views.AllNotificationsList, -): - pass +class UnreadNotificationsList(NotificationsListView): + def get_queryset(self): + return self.request.user.notifications.unread() + + +class AllNotificationsList(NotificationsListView): + def get_queryset(self): + return self.request.user.notifications.all() @login_required @require_POST def mark_all_notifications_as_read_view(request): - """Replace the `notifications` library view, which marks as read on GET requests.""" request.user.notifications.mark_all_as_read() return redirect("notifications:unread") diff --git a/etc/scripts/build_deb_docker.py b/etc/scripts/build_deb_docker.py index 1ca54f6d..34fcf1b7 100644 --- a/etc/scripts/build_deb_docker.py +++ b/etc/scripts/build_deb_docker.py @@ -58,10 +58,6 @@ def build_deb_with_docker(): # Get all dependencies dependencies = project.get("dependencies", []) - filtered_dependencies = [ - dep for dep in dependencies if "django_notifications_patched" not in dep - ] - docker_cmd = [ "docker", "run", @@ -95,11 +91,8 @@ def build_deb_with_docker(): # Clean previous build artifacts rm -rf build/ - # Install non-PyPI dependencies - pip install https://github.com/dejacode/django-notifications-patched/archive/refs/tags/2.0.0.tar.gz - # Install dependencies directly - {" && ".join([f'pip install "{dep}"' for dep in filtered_dependencies])} + {" && ".join([f'pip install "{dep}"' for dep in dependencies])} # Install build tool pip install build diff --git a/etc/scripts/build_rpm_docker.py b/etc/scripts/build_rpm_docker.py index b264dc78..913efc7f 100644 --- a/etc/scripts/build_rpm_docker.py +++ b/etc/scripts/build_rpm_docker.py @@ -55,15 +55,11 @@ def build_rpm_with_docker(): rpm_name = f"python3-{pkg_name.lower()}" rpm_version = project["version"].replace("-dev", "~dev") - # Generate requirements for RPM - exclude packages installed from GitHub + # Generate requirements for RPM dependencies = project["dependencies"] - filtered_dependencies = [ - dep for dep in dependencies if "django-notifications-patched" not in dep - ] - # Create a requirements.txt content for installation - requirements_content = "\n".join(filtered_dependencies) + requirements_content = "\n".join(dependencies) docker_cmd = [ "docker", @@ -186,10 +182,6 @@ def build_rpm_with_docker(): # Install system dependencies for psycopg dnf install -y postgresql-devel -# Install non-PyPI dependencies -/tmp/venv_build/bin/python -m pip install \\ - https://github.com/dejacode/django-notifications-patched/archive/refs/tags/2.0.0.tar.gz - # Install the main package /tmp/venv_build/bin/python -m pip install -r requirements.txt diff --git a/notifications/__init__.py b/notifications/__init__.py new file mode 100644 index 00000000..f61c4aae --- /dev/null +++ b/notifications/__init__.py @@ -0,0 +1,7 @@ +# +# Copyright (c) nexB Inc. and others. All rights reserved. +# DejaCode is a trademark of nexB Inc. +# SPDX-License-Identifier: AGPL-3.0-only +# See https://github.com/aboutcode-org/dejacode for support or download. +# See https://aboutcode.org for more information about AboutCode FOSS projects. +# diff --git a/notifications/apps.py b/notifications/apps.py new file mode 100644 index 00000000..d9644e46 --- /dev/null +++ b/notifications/apps.py @@ -0,0 +1,15 @@ +# +# Copyright (c) nexB Inc. and others. All rights reserved. +# DejaCode is a trademark of nexB Inc. +# SPDX-License-Identifier: AGPL-3.0-only +# See https://github.com/aboutcode-org/dejacode for support or download. +# See https://aboutcode.org for more information about AboutCode FOSS projects. +# + +from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ + + +class NotificationsConfig(AppConfig): + name = "notifications" + verbose_name = _("Notifications") diff --git a/notifications/migrations/0001_squashed_0009_alter_notification_options_and_more.py b/notifications/migrations/0001_squashed_0009_alter_notification_options_and_more.py new file mode 100644 index 00000000..4e2cff9e --- /dev/null +++ b/notifications/migrations/0001_squashed_0009_alter_notification_options_and_more.py @@ -0,0 +1,157 @@ +# Replaces the migrations of the former django-notifications-patched package, +# so existing databases keep their table and data unchanged. + +import django.db.models.deletion +import django.utils.timezone +from django.conf import settings +from django.db import migrations +from django.db import models + + +class Migration(migrations.Migration): + replaces = [ + ("notifications", "0001_initial"), + ("notifications", "0002_auto_20150224_1134"), + ("notifications", "0003_notification_data"), + ("notifications", "0004_auto_20150826_1508"), + ("notifications", "0005_auto_20160504_1520"), + ("notifications", "0006_indexes"), + ("notifications", "0007_add_timestamp_index"), + ("notifications", "0008_index_together_recipient_unread"), + ("notifications", "0009_alter_notification_options_and_more"), + ] + + initial = True + + dependencies = [ + ("contenttypes", "0002_remove_content_type_name"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name="Notification", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + ( + "level", + models.CharField( + choices=[ + ("success", "success"), + ("info", "info"), + ("warning", "warning"), + ("error", "error"), + ], + default="info", + max_length=20, + verbose_name="level", + ), + ), + ( + "unread", + models.BooleanField(db_index=True, default=True, verbose_name="unread"), + ), + ( + "actor_object_id", + models.CharField(max_length=255, verbose_name="actor object id"), + ), + ("verb", models.CharField(max_length=255, verbose_name="verb")), + ( + "description", + models.TextField(blank=True, null=True, verbose_name="description"), + ), + ( + "target_object_id", + models.CharField( + blank=True, max_length=255, null=True, verbose_name="target object id" + ), + ), + ( + "action_object_object_id", + models.CharField( + blank=True, + max_length=255, + null=True, + verbose_name="action object object id", + ), + ), + ( + "timestamp", + models.DateTimeField( + db_index=True, + default=django.utils.timezone.now, + verbose_name="timestamp", + ), + ), + ( + "public", + models.BooleanField(db_index=True, default=True, verbose_name="public"), + ), + ( + "deleted", + models.BooleanField(db_index=True, default=False, verbose_name="deleted"), + ), + ( + "emailed", + models.BooleanField(db_index=True, default=False, verbose_name="emailed"), + ), + # Text column, as created by the former jsonfield.JSONField + ("data", models.TextField(blank=True, null=True, verbose_name="data")), + ( + "action_object_content_type", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="notify_action_object", + to="contenttypes.contenttype", + verbose_name="action object content type", + ), + ), + ( + "actor_content_type", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="notify_actor", + to="contenttypes.contenttype", + verbose_name="actor content type", + ), + ), + ( + "recipient", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="notifications", + to=settings.AUTH_USER_MODEL, + verbose_name="recipient", + ), + ), + ( + "target_content_type", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="notify_target", + to="contenttypes.contenttype", + verbose_name="target content type", + ), + ), + ], + options={ + "verbose_name": "Notification", + "verbose_name_plural": "Notifications", + "ordering": ("-timestamp",), + "indexes": [ + models.Index( + fields=["recipient", "unread"], name="notificatio_recipie_8bedf2_idx" + ) + ], + }, + ), + ] diff --git a/notifications/migrations/0002_remove_unused_fields.py b/notifications/migrations/0002_remove_unused_fields.py new file mode 100644 index 00000000..374e0b4c --- /dev/null +++ b/notifications/migrations/0002_remove_unused_fields.py @@ -0,0 +1,38 @@ +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("notifications", "0001_squashed_0009_alter_notification_options_and_more"), + ] + + operations = [ + migrations.RemoveField( + model_name="notification", + name="level", + ), + migrations.RemoveField( + model_name="notification", + name="target_content_type", + ), + migrations.RemoveField( + model_name="notification", + name="target_object_id", + ), + migrations.RemoveField( + model_name="notification", + name="public", + ), + migrations.RemoveField( + model_name="notification", + name="deleted", + ), + migrations.RemoveField( + model_name="notification", + name="emailed", + ), + migrations.RemoveField( + model_name="notification", + name="data", + ), + ] diff --git a/notifications/migrations/__init__.py b/notifications/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/notifications/models.py b/notifications/models.py new file mode 100644 index 00000000..ce2e21a8 --- /dev/null +++ b/notifications/models.py @@ -0,0 +1,78 @@ +# +# Copyright (c) nexB Inc. and others. All rights reserved. +# DejaCode is a trademark of nexB Inc. +# SPDX-License-Identifier: AGPL-3.0-only +# See https://github.com/aboutcode-org/dejacode for support or download. +# See https://aboutcode.org for more information about AboutCode FOSS projects. +# + +from django.conf import settings +from django.contrib.contenttypes.fields import GenericForeignKey +from django.contrib.contenttypes.models import ContentType +from django.db import models +from django.utils import timezone +from django.utils.translation import gettext_lazy as _ + + +class NotificationQuerySet(models.QuerySet): + def unread(self): + return self.filter(unread=True) + + def mark_all_as_read(self): + return self.unread().update(unread=False) + + def notify(self, recipients, actor, verb, **fields): + """Create a Notification from the `actor` for each of the `recipients`.""" + notifications = [ + self.model(recipient=recipient, actor=actor, verb=verb, **fields) + for recipient in recipients + ] + return self.bulk_create(notifications) + + +class Notification(models.Model): + """An internal notification: `actor` `verb` `action_object`, sent to a `recipient`.""" + + recipient = models.ForeignKey( + settings.AUTH_USER_MODEL, + on_delete=models.CASCADE, + related_name="notifications", + verbose_name=_("recipient"), + ) + unread = models.BooleanField(_("unread"), default=True, db_index=True) + actor_content_type = models.ForeignKey( + ContentType, + on_delete=models.CASCADE, + related_name="notify_actor", + verbose_name=_("actor content type"), + ) + actor_object_id = models.CharField(_("actor object id"), max_length=255) + actor = GenericForeignKey("actor_content_type", "actor_object_id") + verb = models.CharField(_("verb"), max_length=255) + description = models.TextField(_("description"), blank=True, null=True) + action_object_content_type = models.ForeignKey( + ContentType, + on_delete=models.CASCADE, + related_name="notify_action_object", + verbose_name=_("action object content type"), + blank=True, + null=True, + ) + action_object_object_id = models.CharField( + _("action object object id"), max_length=255, blank=True, null=True + ) + action_object = GenericForeignKey("action_object_content_type", "action_object_object_id") + timestamp = models.DateTimeField(_("timestamp"), default=timezone.now, db_index=True) + + objects = NotificationQuerySet.as_manager() + + class Meta: + ordering = ("-timestamp",) + indexes = [ + models.Index(fields=["recipient", "unread"]), + ] + verbose_name = _("Notification") + verbose_name_plural = _("Notifications") + + def __str__(self): + return f"{self.actor} {self.verb}" diff --git a/notifications/tests/__init__.py b/notifications/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/notifications/tests/test_models.py b/notifications/tests/test_models.py new file mode 100644 index 00000000..c3feb292 --- /dev/null +++ b/notifications/tests/test_models.py @@ -0,0 +1,65 @@ +# +# Copyright (c) nexB Inc. and others. All rights reserved. +# DejaCode is a trademark of nexB Inc. +# SPDX-License-Identifier: AGPL-3.0-only +# See https://github.com/aboutcode-org/dejacode for support or download. +# See https://aboutcode.org for more information about AboutCode FOSS projects. +# + +from django.test import TestCase + +from dje.models import Dataspace +from dje.tests import create_user +from notifications.models import Notification + + +class NotificationModelTestCase(TestCase): + def setUp(self): + self.dataspace = Dataspace.objects.create(name="nexB") + self.actor = create_user("actor", self.dataspace) + self.recipient1 = create_user("recipient1", self.dataspace) + self.recipient2 = create_user("recipient2", self.dataspace) + + def test_notification_model_str(self): + notification = Notification.objects.create( + recipient=self.recipient1, actor=self.actor, verb="commented" + ) + self.assertEqual("actor commented", str(notification)) + + def test_notification_queryset_unread_and_mark_all_as_read(self): + unread = Notification.objects.create( + recipient=self.recipient1, actor=self.actor, verb="unread" + ) + Notification.objects.create( + recipient=self.recipient1, actor=self.actor, verb="read", unread=False + ) + other_recipient = Notification.objects.create( + recipient=self.recipient2, actor=self.actor, verb="other" + ) + + self.assertEqual([unread], list(self.recipient1.notifications.unread())) + + self.assertEqual(1, self.recipient1.notifications.mark_all_as_read()) + self.assertEqual(0, self.recipient1.notifications.unread().count()) + other_recipient.refresh_from_db() + self.assertTrue(other_recipient.unread) + + def test_notification_queryset_notify(self): + notifications = Notification.objects.notify( + recipients=[self.recipient1, self.recipient2], + actor=self.actor, + verb="updated", + action_object=self.dataspace, + description="details", + ) + self.assertEqual(2, len(notifications)) + + for recipient in [self.recipient1, self.recipient2]: + notification = recipient.notifications.get() + self.assertEqual(self.actor, notification.actor) + self.assertEqual("updated", notification.verb) + self.assertEqual(self.dataspace, notification.action_object) + self.assertEqual("details", notification.description) + self.assertTrue(notification.unread) + + self.assertEqual([], Notification.objects.notify(recipients=[], actor=self.actor, verb="x")) diff --git a/product_portfolio/tests/test_tasks.py b/product_portfolio/tests/test_tasks.py index beb1e59e..21e6d823 100644 --- a/product_portfolio/tests/test_tasks.py +++ b/product_portfolio/tests/test_tasks.py @@ -14,12 +14,12 @@ from django.test import TestCase from guardian.shortcuts import assign_perm -from notifications.models import Notification from dje.models import Dataspace from dje.tests import MaxQueryMixin from dje.tests import create_superuser from dje.tests import create_user +from notifications.models import Notification from product_portfolio.models import ScanCodeProject from product_portfolio.tasks import improve_packages_from_purldb_task from product_portfolio.tasks import logger as tasks_logger diff --git a/product_portfolio/tests/test_views.py b/product_portfolio/tests/test_views.py index 26214ca1..9ff44cd2 100644 --- a/product_portfolio/tests/test_views.py +++ b/product_portfolio/tests/test_views.py @@ -24,7 +24,6 @@ from guardian.shortcuts import assign_perm from guardian.shortcuts import get_user_perms -from notifications.models import Notification from component_catalog.models import Component from component_catalog.models import ComponentAssignedPackage @@ -42,6 +41,7 @@ from dje.tests import create_user from license_library.models import License from license_library.tests import make_license +from notifications.models import Notification from organization.models import Owner from policy.models import UsagePolicy from policy.tests import make_usage_policy diff --git a/pyproject.toml b/pyproject.toml index 29473a81..bd84a899 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,10 +103,6 @@ dependencies = [ # license expressions "boolean.py==5.0", "license-expression==30.4.4", - # django-notifications - "django_notifications_patched==2.0.0", - "jsonfield==3.2.0", - "swapper==1.5.0", # YAML "saneyaml==0.6.1", # Spreadsheet diff --git a/thirdparty/dist/django-notifications-patched-2.0.0.tar.gz b/thirdparty/dist/django-notifications-patched-2.0.0.tar.gz deleted file mode 100644 index 0463865f5819af58c28e426ad10e6fc0f2102da9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33450 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 R%(VY+|9i7gEQ10w0{|=j0B!&P diff --git a/thirdparty/dist/jsonfield-3.2.0-py3-none-any.whl b/thirdparty/dist/jsonfield-3.2.0-py3-none-any.whl deleted file mode 100644 index 77fee8c2589b96ac5030cb2b751277e336e58a41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8316 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 RL&N!VP5!Y=IPHHv{Rd`APx}A> diff --git a/uv.lock b/uv.lock index f780282f..2d7812e1 100644 --- a/uv.lock +++ b/uv.lock @@ -163,7 +163,6 @@ dependencies = [ { name = "django-filter" }, { name = "django-grappelli" }, { name = "django-guardian" }, - { name = "django-notifications-patched" }, { name = "django-otp" }, { name = "django-registration" }, { name = "django-rq" }, @@ -174,7 +173,6 @@ dependencies = [ { name = "gunicorn" }, { name = "idna" }, { name = "inflection" }, - { name = "jsonfield" }, { name = "license-expression" }, { name = "lxml" }, { name = "markdown" }, @@ -203,7 +201,6 @@ dependencies = [ { name = "six" }, { name = "sortedcontainers" }, { name = "sqlparse" }, - { name = "swapper" }, { name = "tblib" }, { name = "typing-extensions" }, { name = "typing-inspection" }, @@ -243,7 +240,6 @@ requires-dist = [ { name = "django-filter", specifier = "==26.2" }, { name = "django-grappelli", specifier = "==5.0.1" }, { name = "django-guardian", specifier = "==3.5.2" }, - { name = "django-notifications-patched", specifier = "==2.0.0" }, { name = "django-otp", specifier = "==1.7.5" }, { name = "django-registration", specifier = "==5.2.1" }, { name = "django-rq", specifier = "==4.2.0" }, @@ -254,7 +250,6 @@ requires-dist = [ { name = "gunicorn", specifier = "==26.2.0" }, { name = "idna", specifier = "==3.20" }, { name = "inflection", specifier = "==0.5.1" }, - { name = "jsonfield", specifier = "==3.2.0" }, { name = "license-expression", specifier = "==30.4.4" }, { name = "lxml", specifier = "==6.1.3" }, { name = "markdown", specifier = "==3.11.2" }, @@ -284,7 +279,6 @@ requires-dist = [ { name = "six", specifier = "==1.17.0" }, { name = "sortedcontainers", specifier = "==2.4.0" }, { name = "sqlparse", specifier = "==0.6.0" }, - { name = "swapper", specifier = "==1.5.0" }, { name = "tblib", specifier = "==3.2.2" }, { name = "typing-extensions", specifier = "==4.16.0" }, { name = "typing-inspection", specifier = "==0.4.4" }, @@ -404,17 +398,6 @@ wheels = [ { path = "django_guardian-3.5.2-py3-none-any.whl" }, ] -[[package]] -name = "django-notifications-patched" -version = "2.0.0" -source = { registry = "thirdparty/dist" } -dependencies = [ - { name = "django" }, - { name = "jsonfield" }, - { name = "swapper" }, -] -sdist = { path = "django-notifications-patched-2.0.0.tar.gz" } - [[package]] name = "django-otp" version = "1.7.5" @@ -523,17 +506,6 @@ wheels = [ { path = "inflection-0.5.1-py2.py3-none-any.whl" }, ] -[[package]] -name = "jsonfield" -version = "3.2.0" -source = { registry = "thirdparty/dist" } -dependencies = [ - { name = "django" }, -] -wheels = [ - { path = "jsonfield-3.2.0-py3-none-any.whl" }, -] - [[package]] name = "license-expression" version = "30.4.4" @@ -820,14 +792,6 @@ wheels = [ { path = "sqlparse-0.6.0-py3-none-any.whl" }, ] -[[package]] -name = "swapper" -version = "1.5.0" -source = { registry = "thirdparty/dist" } -wheels = [ - { path = "swapper-1.5.0-py2.py3-none-any.whl" }, -] - [[package]] name = "tblib" version = "3.2.2" diff --git a/vulnerabilities/tests/test_fetch.py b/vulnerabilities/tests/test_fetch.py index a67acec3..1c575073 100644 --- a/vulnerabilities/tests/test_fetch.py +++ b/vulnerabilities/tests/test_fetch.py @@ -14,12 +14,11 @@ from django.test import TestCase -from notifications.models import Notification - from component_catalog.models import Package from component_catalog.tests import make_package from dje.models import Dataspace from dje.tests import create_user +from notifications.models import Notification from product_portfolio.tests import make_product from product_portfolio.tests import make_product_item_purpose from product_portfolio.tests import make_product_package diff --git a/workflow/notification.py b/workflow/notification.py index 0877da00..3037182b 100644 --- a/workflow/notification.py +++ b/workflow/notification.py @@ -9,9 +9,8 @@ from django.conf import settings from django.template.loader import render_to_string -from notifications.signals import notify as internal_notification - from dje.tasks import send_mail_task +from notifications.models import Notification # WARNING: Using the name `req` in place of `request` for Request instance, # to avoid any conflict, especially in template contexts, @@ -59,11 +58,11 @@ def send_request_notification(http_request, req, created, extra=None): # Remove the `action_user` from the internal notification recipients recipients.discard(action_user) - internal_notification.send( - sender=action_user, + Notification.objects.notify( + recipients=recipients, + actor=action_user, verb="{} Request".format("submitted" if created else "updated"), action_object=req, - recipient=list(recipients), description=extra.get("description") if extra else "", ) @@ -100,11 +99,11 @@ def send_request_comment_notification(http_request, comment, closed=False): emails = get_recipient_emails(recipients, req.cc_emails) send_mail_task.delay(subject, body, settings.DEFAULT_FROM_EMAIL, emails) - internal_notification.send( - sender=comment.user, + Notification.objects.notify( + recipients=recipients, + actor=comment.user, verb="commented on Request", action_object=req, - recipient=list(recipients), description=comment.text, ) diff --git a/workflow/tests/test_views.py b/workflow/tests/test_views.py index d2875ee9..d907b107 100644 --- a/workflow/tests/test_views.py +++ b/workflow/tests/test_views.py @@ -19,7 +19,6 @@ from django.urls import reverse from guardian.shortcuts import assign_perm -from notifications.models import Notification from component_catalog.models import Component from component_catalog.models import Package @@ -30,6 +29,7 @@ from dje.tests import add_perm from dje.tests import create_superuser from dje.tests import create_user +from notifications.models import Notification from product_portfolio.models import ProductComponent from product_portfolio.models import ProductPackage from product_portfolio.models import ProductRelationStatus From 6dbbe6f6184127d93723565188b9fba5c6a40bc6 Mon Sep 17 00:00:00 2001 From: tdruez Date: Tue, 3 Nov 2026 13:10:02 +0400 Subject: [PATCH 2/6] add the 6.1.0 upgrade prerequisite for the notifications migration Signed-off-by: tdruez --- CHANGELOG.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7ea91f3f..20a46677 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,14 @@ Release notes ============= +### Version 6.1.0 + +**Upgrade prerequisite:** upgrade to DejaCode 6.0.x and run its migrations before upgrading to this version. The internal notifications app replaces the django-notifications-patched dependency and requires the 6.0.x database schema. + +This release removes unused columns from the notifications table: back up the database before upgrading, as a rollback to an earlier version requires a database restore. + +For installations outside Docker, uninstall the obsolete package: `pip uninstall django-notifications-patched` + ### Version 6.0.1 * fix: relink cloned codebase resources to the cloned inventory #601 by @tdruez in https://github.com/aboutcode-org/dejacode/pull/602 From d883c8805bae4fd093d08182a73b77e0c8130a1f Mon Sep 17 00:00:00 2001 From: tdruez Date: Wed, 4 Nov 2026 18:37:27 +0400 Subject: [PATCH 3/6] rename the notifications app to internal_notifications Signed-off-by: tdruez --- {notifications => internal_notifications}/__init__.py | 0 {notifications => internal_notifications}/apps.py | 0 .../0001_squashed_0009_alter_notification_options_and_more.py | 0 .../migrations/0002_remove_unused_fields.py | 0 {notifications => internal_notifications}/migrations/__init__.py | 0 {notifications => internal_notifications}/models.py | 0 {notifications => internal_notifications}/tests/__init__.py | 0 {notifications => internal_notifications}/tests/test_models.py | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename {notifications => internal_notifications}/__init__.py (100%) rename {notifications => internal_notifications}/apps.py (100%) rename {notifications => internal_notifications}/migrations/0001_squashed_0009_alter_notification_options_and_more.py (100%) rename {notifications => internal_notifications}/migrations/0002_remove_unused_fields.py (100%) rename {notifications => internal_notifications}/migrations/__init__.py (100%) rename {notifications => internal_notifications}/models.py (100%) rename {notifications => internal_notifications}/tests/__init__.py (100%) rename {notifications => internal_notifications}/tests/test_models.py (100%) diff --git a/notifications/__init__.py b/internal_notifications/__init__.py similarity index 100% rename from notifications/__init__.py rename to internal_notifications/__init__.py diff --git a/notifications/apps.py b/internal_notifications/apps.py similarity index 100% rename from notifications/apps.py rename to internal_notifications/apps.py diff --git a/notifications/migrations/0001_squashed_0009_alter_notification_options_and_more.py b/internal_notifications/migrations/0001_squashed_0009_alter_notification_options_and_more.py similarity index 100% rename from notifications/migrations/0001_squashed_0009_alter_notification_options_and_more.py rename to internal_notifications/migrations/0001_squashed_0009_alter_notification_options_and_more.py diff --git a/notifications/migrations/0002_remove_unused_fields.py b/internal_notifications/migrations/0002_remove_unused_fields.py similarity index 100% rename from notifications/migrations/0002_remove_unused_fields.py rename to internal_notifications/migrations/0002_remove_unused_fields.py diff --git a/notifications/migrations/__init__.py b/internal_notifications/migrations/__init__.py similarity index 100% rename from notifications/migrations/__init__.py rename to internal_notifications/migrations/__init__.py diff --git a/notifications/models.py b/internal_notifications/models.py similarity index 100% rename from notifications/models.py rename to internal_notifications/models.py diff --git a/notifications/tests/__init__.py b/internal_notifications/tests/__init__.py similarity index 100% rename from notifications/tests/__init__.py rename to internal_notifications/tests/__init__.py diff --git a/notifications/tests/test_models.py b/internal_notifications/tests/test_models.py similarity index 100% rename from notifications/tests/test_models.py rename to internal_notifications/tests/test_models.py From a59b73c0cfcaa72011f0273529ac1976db5d3743 Mon Sep 17 00:00:00 2001 From: tdruez Date: Wed, 4 Nov 2026 18:37:44 +0400 Subject: [PATCH 4/6] rename the notifications app to internal_notifications Signed-off-by: tdruez --- .dockerignore | 2 +- MANIFEST.in | 2 +- component_catalog/tests/test_views.py | 2 +- compose.dev.yml | 2 +- dejacode/settings.py | 2 +- dje/models.py | 4 +- dje/tests/test_views.py | 2 +- etc/scripts/build_nix_docker.py | 99 ++++++++------------- internal_notifications/apps.py | 7 +- internal_notifications/tests/test_models.py | 2 +- product_portfolio/tests/test_tasks.py | 2 +- product_portfolio/tests/test_views.py | 2 +- vulnerabilities/tests/test_fetch.py | 2 +- workflow/notification.py | 2 +- workflow/tests/test_views.py | 2 +- 15 files changed, 58 insertions(+), 76 deletions(-) diff --git a/.dockerignore b/.dockerignore index 2e1e336a..fafd3396 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,9 +8,9 @@ !dejacode/ !dejacode_toolkit/ !dje/ +!internal_notifications/ !license_library/ !notification/ -!notifications/ !organization/ !policy/ !product_portfolio/ diff --git a/MANIFEST.in b/MANIFEST.in index 9bae1949..579465d2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -19,9 +19,9 @@ graft dejacode_toolkit graft dje graft docs graft etc +graft internal_notifications graft license_library graft notification -graft notifications graft organization graft policy graft product_portfolio diff --git a/component_catalog/tests/test_views.py b/component_catalog/tests/test_views.py index 2940f9d7..a621b8bd 100644 --- a/component_catalog/tests/test_views.py +++ b/component_catalog/tests/test_views.py @@ -58,12 +58,12 @@ from dje.tests import create_superuser from dje.tests import create_user from dje.views import PaginationMixin +from internal_notifications.models import Notification from license_library.models import License from license_library.models import LicenseAssignedTag from license_library.models import LicenseTag from license_library.models import LicenseTagGroup from license_library.models import LicenseTagGroupAssignedTag -from notifications.models import Notification from organization.models import Owner from organization.models import Subowner from policy.models import UsagePolicy diff --git a/compose.dev.yml b/compose.dev.yml index c33f6ba0..67508ed8 100644 --- a/compose.dev.yml +++ b/compose.dev.yml @@ -41,9 +41,9 @@ services: - ./dejacode:/opt/dejacode/dejacode - ./dejacode_toolkit:/opt/dejacode/dejacode_toolkit - ./dje:/opt/dejacode/dje + - ./internal_notifications:/opt/dejacode/internal_notifications - ./license_library:/opt/dejacode/license_library - ./notification:/opt/dejacode/notification - - ./notifications:/opt/dejacode/notifications - ./organization:/opt/dejacode/organization - ./policy:/opt/dejacode/policy - ./product_portfolio:/opt/dejacode/product_portfolio diff --git a/dejacode/settings.py b/dejacode/settings.py index fc8abda2..a6f2162b 100644 --- a/dejacode/settings.py +++ b/dejacode/settings.py @@ -329,7 +329,6 @@ def gettext_noop(s): "crispy_bootstrap5", "guardian", "django_filters", - "notifications", "axes", "django_otp", "django_otp.plugins.otp_totp", @@ -346,6 +345,7 @@ def gettext_noop(s): "purldb", "policy", "notification", + "internal_notifications", "vulnerabilities", "vulnerabilities.triage", ] diff --git a/dje/models.py b/dje/models.py index e94bbcbc..cbd3d7ab 100644 --- a/dje/models.py +++ b/dje/models.py @@ -49,7 +49,7 @@ from aboutcode.api_auth import AbstractAPIToken from dje.fields import LastModifiedByField from dje.tasks import send_mail_task -from notifications.models import Notification +from internal_notifications.models import Notification logger = logging.getLogger("dje") @@ -1880,7 +1880,7 @@ def serialize_hook(self, hook): } def send_internal_notification(self, verb, **data): - """Similar to ``notify.send`` without relying on the Signal system.""" + """Create an internal Notification sent by and to this user.""" return Notification.objects.create( recipient=self, actor=self, diff --git a/dje/tests/test_views.py b/dje/tests/test_views.py index 846632d5..b8add7b8 100644 --- a/dje/tests/test_views.py +++ b/dje/tests/test_views.py @@ -29,7 +29,7 @@ from dje.tests import create from dje.tests import create_superuser from dje.tests import create_user -from notifications.models import Notification +from internal_notifications.models import Notification Owner = apps.get_model("organization", "Owner") Component = apps.get_model("component_catalog", "Component") diff --git a/etc/scripts/build_nix_docker.py b/etc/scripts/build_nix_docker.py index 76cab467..e4c01d3d 100644 --- a/etc/scripts/build_nix_docker.py +++ b/etc/scripts/build_nix_docker.py @@ -242,76 +242,55 @@ def create_defualt_nix(dependencies_list, meta_dict): print("Processing {}/{}: {}".format(idx + 1, deps_size, dep["name"])) name = dep["name"] version = dep["version"] - # Handle 'django_notifications_patched' seperately - if name == "django_notifications_patched": - if name == "django_notifications_patched" and version == "2.0.0": - nix_content += " " + name + " = self.buildPythonPackage rec {\n" - nix_content += ' pname = "django_notifications_patched";\n' - nix_content += ' version = "2.0.0";\n' - nix_content += ' format = "setuptools";\n' - nix_content += " doCheck = false;\n" - nix_content += " src = pkgs.fetchFromGitHub {\n" - nix_content += ' owner = "dejacode";\n' - nix_content += ' repo = "django-notifications-patched";\n' - nix_content += ' rev = "2.0.0";\n' - nix_content += ' url = "https://github.com/dejacode/django-notifications-patched/archive/refs/tags/2.0.0.tar.gz";\n' - nix_content += ( - ' sha256 = "sha256-RDAp2PKWa2xA5ge25VqkmRm8HCYVS4/fq2xKc80LDX8=";\n' - ) - nix_content += " };\n" - nix_content += " };\n" - else: - need_review_packages_list.append(dep) - else: - url = "https://pypi.org/pypi/{name}/{version}/json".format(name=name, version=version) - try: - response = requests.get(url, timeout=30) - response.raise_for_status() - data = response.json() - - url_section = data.get("urls", []) - build_from_src = True - package_added = False - + url = "https://pypi.org/pypi/{name}/{version}/json".format(name=name, version=version) + try: + response = requests.get(url, timeout=30) + response.raise_for_status() + data = response.json() + + url_section = data.get("urls", []) + build_from_src = True + package_added = False + + for component in url_section: + if component.get("packagetype") == "bdist_wheel": + whl_url = component.get("url") + if not is_compatible_wheel(whl_url, py_version_major, py_version_minor): + continue + whl_sha256 = get_sha256_hash(whl_url) + nix_content += " " + name + " = buildCustomPackage {\n" + nix_content += ' pname = "' + name + '";\n' + nix_content += ' version = "' + version + '";\n' + nix_content += ' format = "wheel";\n' + nix_content += " src = pkgs.fetchurl {\n" + nix_content += ' url = "' + whl_url + '";\n' + nix_content += ' sha256 = "' + whl_sha256 + '";\n' + nix_content += " };\n" + nix_content += " };\n" + build_from_src = False + package_added = True + break + + if build_from_src: for component in url_section: - if component.get("packagetype") == "bdist_wheel": - whl_url = component.get("url") - if not is_compatible_wheel(whl_url, py_version_major, py_version_minor): - continue - whl_sha256 = get_sha256_hash(whl_url) + if component.get("packagetype") == "sdist": + sdist_url = component.get("url") + sdist_sha256 = get_sha256_hash(sdist_url) nix_content += " " + name + " = buildCustomPackage {\n" nix_content += ' pname = "' + name + '";\n' nix_content += ' version = "' + version + '";\n' - nix_content += ' format = "wheel";\n' + nix_content += ' format = "setuptools";\n' nix_content += " src = pkgs.fetchurl {\n" - nix_content += ' url = "' + whl_url + '";\n' - nix_content += ' sha256 = "' + whl_sha256 + '";\n' + nix_content += ' url = "' + sdist_url + '";\n' + nix_content += ' sha256 = "' + sdist_sha256 + '";\n' nix_content += " };\n" nix_content += " };\n" - build_from_src = False package_added = True break - - if build_from_src: - for component in url_section: - if component.get("packagetype") == "sdist": - sdist_url = component.get("url") - sdist_sha256 = get_sha256_hash(sdist_url) - nix_content += " " + name + " = buildCustomPackage {\n" - nix_content += ' pname = "' + name + '";\n' - nix_content += ' version = "' + version + '";\n' - nix_content += ' format = "setuptools";\n' - nix_content += " src = pkgs.fetchurl {\n" - nix_content += ' url = "' + sdist_url + '";\n' - nix_content += ' sha256 = "' + sdist_sha256 + '";\n' - nix_content += " };\n" - nix_content += " };\n" - package_added = True - break - if not package_added: - need_review_packages_list.append(dep) - except requests.exceptions.RequestException: + if not package_added: need_review_packages_list.append(dep) + except requests.exceptions.RequestException: + need_review_packages_list.append(dep) nix_content += """ }; diff --git a/internal_notifications/apps.py b/internal_notifications/apps.py index d9644e46..f0cf496c 100644 --- a/internal_notifications/apps.py +++ b/internal_notifications/apps.py @@ -10,6 +10,9 @@ from django.utils.translation import gettext_lazy as _ -class NotificationsConfig(AppConfig): - name = "notifications" +class InternalNotificationsConfig(AppConfig): + name = "internal_notifications" + # Label of the former django-notifications-patched app: keeps the table, + # the migration history, and the content types unchanged. + label = "notifications" verbose_name = _("Notifications") diff --git a/internal_notifications/tests/test_models.py b/internal_notifications/tests/test_models.py index c3feb292..3508d4a4 100644 --- a/internal_notifications/tests/test_models.py +++ b/internal_notifications/tests/test_models.py @@ -10,7 +10,7 @@ from dje.models import Dataspace from dje.tests import create_user -from notifications.models import Notification +from internal_notifications.models import Notification class NotificationModelTestCase(TestCase): diff --git a/product_portfolio/tests/test_tasks.py b/product_portfolio/tests/test_tasks.py index 21e6d823..c528f373 100644 --- a/product_portfolio/tests/test_tasks.py +++ b/product_portfolio/tests/test_tasks.py @@ -19,7 +19,7 @@ from dje.tests import MaxQueryMixin from dje.tests import create_superuser from dje.tests import create_user -from notifications.models import Notification +from internal_notifications.models import Notification from product_portfolio.models import ScanCodeProject from product_portfolio.tasks import improve_packages_from_purldb_task from product_portfolio.tasks import logger as tasks_logger diff --git a/product_portfolio/tests/test_views.py b/product_portfolio/tests/test_views.py index 9ff44cd2..11e653e7 100644 --- a/product_portfolio/tests/test_views.py +++ b/product_portfolio/tests/test_views.py @@ -39,9 +39,9 @@ from dje.tests import add_perms from dje.tests import create_superuser from dje.tests import create_user +from internal_notifications.models import Notification from license_library.models import License from license_library.tests import make_license -from notifications.models import Notification from organization.models import Owner from policy.models import UsagePolicy from policy.tests import make_usage_policy diff --git a/vulnerabilities/tests/test_fetch.py b/vulnerabilities/tests/test_fetch.py index 1c575073..6bfc36cc 100644 --- a/vulnerabilities/tests/test_fetch.py +++ b/vulnerabilities/tests/test_fetch.py @@ -18,7 +18,7 @@ from component_catalog.tests import make_package from dje.models import Dataspace from dje.tests import create_user -from notifications.models import Notification +from internal_notifications.models import Notification from product_portfolio.tests import make_product from product_portfolio.tests import make_product_item_purpose from product_portfolio.tests import make_product_package diff --git a/workflow/notification.py b/workflow/notification.py index 3037182b..92fe15e1 100644 --- a/workflow/notification.py +++ b/workflow/notification.py @@ -10,7 +10,7 @@ from django.template.loader import render_to_string from dje.tasks import send_mail_task -from notifications.models import Notification +from internal_notifications.models import Notification # WARNING: Using the name `req` in place of `request` for Request instance, # to avoid any conflict, especially in template contexts, diff --git a/workflow/tests/test_views.py b/workflow/tests/test_views.py index d907b107..5a5b616b 100644 --- a/workflow/tests/test_views.py +++ b/workflow/tests/test_views.py @@ -29,7 +29,7 @@ from dje.tests import add_perm from dje.tests import create_superuser from dje.tests import create_user -from notifications.models import Notification +from internal_notifications.models import Notification from product_portfolio.models import ProductComponent from product_portfolio.models import ProductPackage from product_portfolio.models import ProductRelationStatus From cbeee42271c21450ba042bfcfcd949c1bac9e099 Mon Sep 17 00:00:00 2001 From: tdruez Date: Wed, 4 Nov 2026 18:39:14 +0400 Subject: [PATCH 5/6] update changelog Signed-off-by: tdruez --- CHANGELOG.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 20a46677..bc8fd303 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,8 +7,6 @@ Release notes This release removes unused columns from the notifications table: back up the database before upgrading, as a rollback to an earlier version requires a database restore. -For installations outside Docker, uninstall the obsolete package: `pip uninstall django-notifications-patched` - ### Version 6.0.1 * fix: relink cloned codebase resources to the cloned inventory #601 by @tdruez in https://github.com/aboutcode-org/dejacode/pull/602 From e258b9259e71f11c3cc3cad96c65af16dc236e4b Mon Sep 17 00:00:00 2001 From: tdruez Date: Wed, 4 Nov 2026 18:45:02 +0400 Subject: [PATCH 6/6] merge NotificationsCountMixin into NotificationsListView and drop unused pagination Signed-off-by: tdruez --- dje/tests/test_views.py | 39 +++++++++++++++++++++++++++++++-------- dje/views.py | 10 +++------- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dje/tests/test_views.py b/dje/tests/test_views.py index b8add7b8..ec349e3b 100644 --- a/dje/tests/test_views.py +++ b/dje/tests/test_views.py @@ -384,9 +384,31 @@ def test_mark_all_notifications_as_read_view(self): self.assertEqual(0, self.user.notifications.unread().count()) def test_notifications_list_views(self): - Notification.objects.create(recipient=self.user, actor=self.user, verb="Read", unread=False) - Notification.objects.create(recipient=self.user, actor=self.super_user, verb="Unread") - Notification.objects.create(recipient=self.super_user, actor=self.user, verb="Other") + def get_verbs_by_model(grouped_notifications): + return { + content_type.model: [notice.verb for notice in notices] + for content_type, notices in grouped_notifications.items() + } + + Notification.objects.create( + recipient=self.user, + actor=self.user, + verb="Read", + action_object=self.owner1, + unread=False, + ) + Notification.objects.create( + recipient=self.user, actor=self.super_user, verb="Unread", action_object=self.owner1 + ) + Notification.objects.create( + recipient=self.user, + actor=self.super_user, + verb="Updated", + action_object=self.dataspace1, + ) + Notification.objects.create( + recipient=self.super_user, actor=self.user, verb="Other", action_object=self.owner1 + ) unread_url = reverse("notifications:unread") all_url = reverse("notifications:all") @@ -395,13 +417,14 @@ def test_notifications_list_views(self): self.client.login(username=self.user.username, password="secret") response = self.client.get(unread_url) - self.assertEqual(["Unread"], [notice.verb for notice in response.context["notifications"]]) - self.assertEqual(2, response.context["all_count"]) - self.assertEqual(1, response.context["unread_count"]) + expected = {"dataspace": ["Updated"], "owner": ["Unread"]} + self.assertEqual(expected, get_verbs_by_model(response.context["grouped_notifications"])) + self.assertEqual(3, response.context["all_count"]) + self.assertEqual(2, response.context["unread_count"]) response = self.client.get(all_url) - verbs = [notice.verb for notice in response.context["notifications"]] - self.assertEqual(["Unread", "Read"], verbs) + expected = {"dataspace": ["Updated"], "owner": ["Unread", "Read"]} + self.assertEqual(expected, get_verbs_by_model(response.context["grouped_notifications"])) @override_settings(REFERENCE_DATASPACE="Dataspace") def test_global_search_list_view(self): diff --git a/dje/views.py b/dje/views.py index ef28a7a1..408469e3 100644 --- a/dje/views.py +++ b/dje/views.py @@ -2289,7 +2289,9 @@ def get_context_data(self, **kwargs): return context_data -class NotificationsCountMixin: +class NotificationsListView(LoginRequiredMixin, ListView): + template_name = "notifications/list.html" + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) user_notifications = self.request.user.notifications @@ -2305,12 +2307,6 @@ def get_context_data(self, **kwargs): return context -class NotificationsListView(LoginRequiredMixin, NotificationsCountMixin, ListView): - template_name = "notifications/list.html" - context_object_name = "notifications" - paginate_by = 20 - - class UnreadNotificationsList(NotificationsListView): def get_queryset(self): return self.request.user.notifications.unread()