thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

fix: issue created notification (#1553)

Browse Source 
* fix: issue created notification

* chore: my issues assigned notifications

* dev: fix read at notification
This commit is contained in:
Nikhil 2023-07-19 14:31:45 +05:30 committed by GitHub
parent 509af4662d
commit 98b9957753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ class NotificationViewSet(BaseViewSet):
order_by = request.GET.get("order_by", "-created_at") order_by = request.GET.get("order_by", "-created_at")
snoozed = request.GET.get("snoozed", "false") snoozed = request.GET.get("snoozed", "false")
archived = request.GET.get("archived", "false") archived = request.GET.get("archived", "false")
read = request.GET.get("read", "false") read = request.GET.get("read", "true")
# Filter type # Filter type
type = request.GET.get("type", "all") type = request.GET.get("type", "all")
@ -53,8 +53,6 @@ class NotificationViewSet(BaseViewSet):
Q(snoozed_till__lt=timezone.now()) | Q(snoozed_till__isnull=False) Q(snoozed_till__lt=timezone.now()) | Q(snoozed_till__isnull=False)
) )
if read == "true":
notifications = notifications.filter(read_at__isnull=False)
if read == "false": if read == "false":
notifications = notifications.filter(read_at__isnull=True) notifications = notifications.filter(read_at__isnull=True)
@ -213,7 +211,7 @@ class UnreadNotificationEndpoint(BaseAPIView):
def get(self, request, slug): def get(self, request, slug):
try: try:
# Watching Issues Count # Watching Issues Count
watching_notification_count = Notification.objects.filter( watching_issues_count = Notification.objects.filter(
workspace__slug=slug, workspace__slug=slug,
receiver_id=request.user.id, receiver_id=request.user.id,
read_at__isnull=True, read_at__isnull=True,
@ -244,7 +242,7 @@ class UnreadNotificationEndpoint(BaseAPIView):
return Response( return Response(
{ {
"watching_notifications": watching_notification_count, "watching_issues": watching_issues_count,
"my_issues": my_issues_count, "my_issues": my_issues_count,
"created_issues": created_issues_count, "created_issues": created_issues_count,
}, },

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

@ -1030,6 +1030,7 @@ def issue_activity(
issue = Issue.objects.filter(pk=issue_id, project_id=project_id).first() issue = Issue.objects.filter(pk=issue_id, project_id=project_id).first()
if issue is not None: if issue is not None:
issue.updated_at = timezone.now() issue.updated_at = timezone.now()
issue.save(update_fields=["updated_at"]) issue.save(update_fields=["updated_at"])
@ -1110,6 +1111,8 @@ def issue_activity(
issue_subscribers = issue_subscribers + issue_assignees issue_subscribers = issue_subscribers + issue_assignees
issue = Issue.objects.filter(pk=issue_id, project_id=project_id).first()
# Add bot filtering # Add bot filtering
if issue is not None and issue.created_by_id is not None and not issue.created_by.is_bot: if issue is not None and issue.created_by_id is not None and not issue.created_by.is_bot:
issue_subscribers = issue_subscribers + [issue.created_by_id] issue_subscribers = issue_subscribers + [issue.created_by_id]