github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

dev: notification segregation

Browse Source
This commit is contained in:
pablohashescobar 2023-07-07 16:02:17 +05:30
parent 9a6026c0c7
commit 581dff5482
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
apiserver/plane/api/views/notification.py
View File

@ -9,7 +9,7 @@ from sentry_sdk import capture_exception
# Module imports # Module imports
from .base import BaseViewSet from .base import BaseViewSet
from plane.db.models import Notification from plane.db.models import Notification, IssueAssignee, IssueSubscriber, Issue
from plane.api.serializers import NotificationSerializer from plane.api.serializers import NotificationSerializer
@ -30,12 +30,37 @@ class NotificationViewSet(BaseViewSet):
def list(self, request, slug): def list(self, request, slug):
try: try:
order_by = request.GET.get("ordeer_by", "-created_at") order_by = request.GET.get("order_by", "-created_at")
snoozed = request.GET.get("snoozed", "false") snoozed = request.GET.get("snoozed", "false")
# Filter type
type = request.GET.get("type", "all")
notifications = Notification.objects.filter( notifications = Notification.objects.filter(
workspace__slug=slug, receiver=request.user workspace__slug=slug, receiver_id=request.user.id
).order_by(order_by) ).order_by(order_by)
# Subscribed issues
if type == "watching":
issue_ids = IssueSubscriber.objects.filter(
workspace__slug=slug, subsriber_id=request.user.id
).values_list("issue_id", flat=True)
notifications = notifications.filter(entity_id__in=issue_ids)
# Assigned Issues
if type == "assigned":
issue_ids = IssueAssignee.objects.filter(
workspace__slug=slug, assignee_id=request.user.id
).values_list("issue_id", flat=True)
notifications = notifications.filter(entity_id__in=issue_ids)
# Created issues
if type == "created":
issue_ids = Issue.objects.filter(
workspace__slug=slug, created_by=request.user
).values_list("pk", flat=True)
notifications = notifications.filter(entity_id__in=issue_ids)
if snoozed == "false": if snoozed == "false":
notifications = notifications.filter( notifications = notifications.filter(
Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True), Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True),

3
apiserver/plane/bgtasks/issue_activites_task.py
View File

@ -1034,6 +1034,9 @@ def issue_activity(
issue_subscribers = issue_subscribers + issue_assignees issue_subscribers = issue_subscribers + issue_assignees
if issue.created_by_id:
issue_subscribers = issue_subscribers + [issue.created_by_id]
issue = Issue.objects.get(project=project, pk=issue_id) issue = Issue.objects.get(project=project, pk=issue_id)
for subscriber in issue_subscribers: for subscriber in issue_subscribers:
for issue_activity in issue_activities_created: for issue_activity in issue_activities_created: