From a3a7053be72fa2a695720fa58886295d42743c6d Mon Sep 17 00:00:00 2001 From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:30:44 +0530 Subject: [PATCH] chore: added identifiers in the notification (#5513) --- .../plane/bgtasks/issue_activities_task.py | 2 - apiserver/plane/bgtasks/notification_task.py | 146 +++++++++++++++++- apiserver/plane/settings/common.py | 2 - 3 files changed, 144 insertions(+), 6 deletions(-) diff --git a/apiserver/plane/bgtasks/issue_activities_task.py b/apiserver/plane/bgtasks/issue_activities_task.py index f83602399..8ecf7845d 100644 --- a/apiserver/plane/bgtasks/issue_activities_task.py +++ b/apiserver/plane/bgtasks/issue_activities_task.py @@ -1,13 +1,11 @@ # Python imports import json -import requests # Third Party imports from celery import shared_task # Django imports -from django.conf import settings from django.core.serializers.json import DjangoJSONEncoder from django.utils import timezone diff --git a/apiserver/plane/bgtasks/notification_task.py b/apiserver/plane/bgtasks/notification_task.py index 0189316cf..44f325015 100644 --- a/apiserver/plane/bgtasks/notification_task.py +++ b/apiserver/plane/bgtasks/notification_task.py @@ -128,7 +128,9 @@ def extract_mentions(issue_instance): "mention-component", attrs={"target": "users"} ) - mentions = [mention_tag["entity_identifier"] for mention_tag in mention_tags] + mentions = [ + mention_tag["entity_identifier"] for mention_tag in mention_tags + ] return list(set(mentions)) except Exception: @@ -198,6 +200,16 @@ def create_mention_notification( "actor": str(activity.get("actor_id")), "new_value": str(activity.get("new_value")), "old_value": str(activity.get("old_value")), + "old_identifier": ( + str(activity.get("old_identifier")) + if activity.get("old_identifier") + else None + ), + "new_identifier": ( + str(activity.get("new_identifier")) + if activity.get("new_identifier") + else None + ), }, }, ) @@ -440,6 +452,24 @@ def notifications( if issue_comment is not None else "" ), + "old_identifier": ( + str( + issue_activity.get( + "old_identifier" + ) + ) + if issue_activity.get("old_identifier") + else None + ), + "new_identifier": ( + str( + issue_activity.get( + "new_identifier" + ) + ) + if issue_activity.get("new_identifier") + else None + ), }, }, ) @@ -489,6 +519,28 @@ def notifications( if issue_comment is not None else "" ), + "old_identifier": ( + str( + issue_activity.get( + "old_identifier" + ) + ) + if issue_activity.get( + "old_identifier" + ) + else None + ), + "new_identifier": ( + str( + issue_activity.get( + "new_identifier" + ) + ) + if issue_activity.get( + "new_identifier" + ) + else None + ), "activity_time": issue_activity.get( "created_at" ), @@ -572,6 +624,28 @@ def notifications( "old_value": str( issue_activity.get("old_value") ), + "old_identifier": ( + str( + issue_activity.get( + "old_identifier" + ) + ) + if issue_activity.get( + "old_identifier" + ) + else None + ), + "new_identifier": ( + str( + issue_activity.get( + "new_identifier" + ) + ) + if issue_activity.get( + "new_identifier" + ) + else None + ), "activity_time": issue_activity.get( "created_at" ), @@ -627,6 +701,28 @@ def notifications( "old_value": str( last_activity.old_value ), + "old_identifier": ( + str( + issue_activity.get( + "old_identifier" + ) + ) + if issue_activity.get( + "old_identifier" + ) + else None + ), + "new_identifier": ( + str( + issue_activity.get( + "new_identifier" + ) + ) + if issue_activity.get( + "new_identifier" + ) + else None + ), }, }, ) @@ -662,7 +758,31 @@ def notifications( "old_value": str( last_activity.old_value ), - "activity_time": str(last_activity.created_at), + "old_identifier": ( + str( + issue_activity.get( + "old_identifier" + ) + ) + if issue_activity.get( + "old_identifier" + ) + else None + ), + "new_identifier": ( + str( + issue_activity.get( + "new_identifier" + ) + ) + if issue_activity.get( + "new_identifier" + ) + else None + ), + "activity_time": str( + last_activity.created_at + ), }, }, ) @@ -719,6 +839,28 @@ def notifications( "old_value" ) ), + "old_identifier": ( + str( + issue_activity.get( + "old_identifier" + ) + ) + if issue_activity.get( + "old_identifier" + ) + else None + ), + "new_identifier": ( + str( + issue_activity.get( + "new_identifier" + ) + ) + if issue_activity.get( + "new_identifier" + ) + else None + ), "activity_time": issue_activity.get( "created_at" ), diff --git a/apiserver/plane/settings/common.py b/apiserver/plane/settings/common.py index af6560ca1..0ce0a6dcb 100644 --- a/apiserver/plane/settings/common.py +++ b/apiserver/plane/settings/common.py @@ -2,10 +2,8 @@ # Python imports import os -import ssl from urllib.parse import urlparse -import certifi # Third party imports import dj_database_url