dev: update webhook and workspace leave

apiserver/plane/api/views/base.py

@@ -7,7 +7,6 @@ from django.conf import settings
 from django.db import IntegrityError
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.utils import timezone
-from django.core.serializers.json import DjangoJSONEncoder
 
 # Third party imports
 from rest_framework.views import APIView
@@ -42,6 +41,8 @@ class WebhookMixin:
 
     def finalize_response(self, request, response, *args, **kwargs):
         response = super().finalize_response(request, response, *args, **kwargs)
+
+        # Check for the case should webhook be sent
         if (
             self.webhook_event
             and self.request.method in ["POST", "PATCH"]
@@ -51,13 +52,30 @@ class WebhookMixin:
             object_id = (
                 response.data.get("id") if isinstance(response.data, dict) else None
             )
-
+            # Push the object to delay
             send_webhook.delay(
                 event=self.webhook_event,
                 event_id=object_id,
                 action=self.request.method,
                 slug=self.workspace_slug,
             )
+
+        # Check for the case should webhook be sent
+        if (
+            self.webhook_event
+            and self.request.method in ["DELETE"]
+            and response.status_code in [204]
+        ):
+            # Get the id
+            object_id = self.kwargs.get("pk")
+            # Push the object to delay
+            send_webhook.delay(
+                event=self.webhook_event,
+                event_id=object_id,
+                action=self.request.method,
+                slug=self.workspace_slug,
+            )
+
         return response
 
 

apiserver/plane/api/views/issue.py

@@ -40,7 +40,6 @@ from plane.db.models import (
     IssueComment,
     IssueActivity,
 )
-from plane.utils.issue_filters import issue_filters
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.api.serializers import (
     IssueSerializer,
@@ -452,7 +451,7 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
 
     serializer_class = IssueCommentSerializer
     model = IssueComment
-    webhook_event = "issue-comment"
+    webhook_event = "issue_comment"
     permission_classes = [
         ProjectLitePermission,
     ]

apiserver/plane/app/views/external.py

@@ -1,6 +1,6 @@
 # Python imports
 import requests
-
+import os
 # Third party imports
 from openai import OpenAI
 from rest_framework.response import Response
@@ -85,14 +85,22 @@ class ReleaseNotesEndpoint(BaseAPIView):
 class UnsplashEndpoint(BaseAPIView):
 
     def get(self, request):
+        instance_configuration = InstanceConfiguration.objects.values("key", "value")
+        unsplash_access_key = get_configuration_value(instance_configuration, "UNSPLASH_ACCESS_KEY", os.environ.get("UNSPLASH_ACCESS_KEY"))
+
+        # Check unsplash access key
+        if not unsplash_access_key:
+            return Response([], status=status.HTTP_200_OK)
+
+        # Query parameters
         query = request.GET.get("query", False)
         page = request.GET.get("page", 1)
         per_page = request.GET.get("per_page", 20)
 
         url = (
-            f"https://api.unsplash.com/search/photos/?client_id={settings.UNSPLASH_ACCESS_KEY}&query={query}&page=${page}&per_page={per_page}"
+            f"https://api.unsplash.com/search/photos/?client_id={unsplash_access_key}&query={query}&page=${page}&per_page={per_page}"
             if query
-            else f"https://api.unsplash.com/photos/?client_id={settings.UNSPLASH_ACCESS_KEY}&page={page}&per_page={per_page}"
+            else f"https://api.unsplash.com/photos/?client_id={unsplash_access_key}&page={page}&per_page={per_page}"
         )
 
         headers = {

apiserver/plane/app/views/issue.py

@@ -596,7 +596,7 @@ class IssueActivityEndpoint(BaseAPIView):
 class IssueCommentViewSet(WebhookMixin, BaseViewSet):
     serializer_class = IssueCommentSerializer
     model = IssueComment
-    webhook_event = "issue-comment"
+    webhook_event = "issue_comment"
     permission_classes = [
         ProjectLitePermission,
     ]

apiserver/plane/app/views/workspace.py

@@ -590,7 +590,7 @@ class WorkSpaceMemberViewSet(BaseViewSet):
                 member_with_role=Count(
                     "project_projectmember",
                     filter=Q(
-                        project_projectmember__member_id=request.user.id,
+                        project_projectmember__member_id=workspace_member.id,
                         project_projectmember__role=20,
                     ),
                 ),

apiserver/plane/license/management/commands/configure_instance.py

@@ -30,9 +30,11 @@ class Command(BaseCommand):
             "EMAIL_USE_TLS": os.environ.get("EMAIL_USE_TLS", "1"),
             "EMAIL_USE_SSL": os.environ.get("EMAIL_USE_SSL", "0"),
             # Open AI Settings
-            "OPENAI_API_BASE": os.environ.get("", "https://api.openai.com/v1"),
-            "OPENAI_API_KEY": os.environ.get("OPENAI_API_KEY", "sk-"),
+            "OPENAI_API_BASE": os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1"),
+            "OPENAI_API_KEY": os.environ.get("OPENAI_API_KEY", ""),
             "GPT_ENGINE": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
+            # Unsplash Access Key
+            "UNSPLASH_ACCESS_KEY": os.environ.get("UNSPLASH_ACESS_KEY", "")
         }
 
         for key, value in config_keys.items():