Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-3930] chore: set IN_APP as default source value for intake issue (#6963)

Sangeethadff176be8f3b
diff --git a/apiserver/plane/api/views/intake.py b/apiserver/plane/api/views/intake.py
index 1aee7195ec..93acb06649 100644
--- a/apiserver/plane/api/views/intake.py
+++ b/apiserver/plane/api/views/intake.py
@@ -20,6 +20,7 @@ from plane.bgtasks.issue_activities_task import issue_activity
from plane.db.models import Intake, IntakeIssue, Issue, Project, ProjectMember, State
from plane.utils.host import base_host
from .base import BaseAPIView
+from plane.db.models.intake import SourceType
class IntakeIssueAPIEndpoint(BaseAPIView):
@@ -125,7 +126,7 @@ class IntakeIssueAPIEndpoint(BaseAPIView):
intake_id=intake.id,
project_id=project_id,
issue=issue,
- source=request.data.get("source", "IN-APP"),
+ source=SourceType.IN_APP,
)
# Create an Issue Activity
issue_activity.delay(
diff --git a/apiserver/plane/app/views/intake/base.py b/apiserver/plane/app/views/intake/base.py
index 92b2f62d2e..1ca9e39705 100644
--- a/apiserver/plane/app/views/intake/base.py
+++ b/apiserver/plane/app/views/intake/base.py
@@ -44,6 +44,7 @@ from plane.app.views.base import BaseAPIView
from plane.utils.timezone_converter import user_timezone_converter
from plane.utils.global_paginator import paginate
from plane.utils.host import base_host
+from plane.db.models.intake import SourceType
class IntakeViewSet(BaseViewSet):
@@ -278,7 +279,7 @@ class IntakeIssueViewSet(BaseViewSet):
intake_id=intake_id.id,
project_id=project_id,
issue_id=serializer.data["id"],
- source=request.data.get("source", "IN-APP"),
+ source=SourceType.IN_APP,
)
# Create an Issue Activity
issue_activity.delay(
@@ -408,7 +409,6 @@ class IntakeIssueViewSet(BaseViewSet):
)
if issue_serializer.is_valid():
-
# Log all the updates
requested_data = json.dumps(issue_data, cls=DjangoJSONEncoder)
if issue is not None:
@@ -607,7 +607,6 @@ class IntakeIssueViewSet(BaseViewSet):
class IntakeWorkItemDescriptionVersionEndpoint(BaseAPIView):
-
def process_paginated_result(self, fields, results, timezone):
paginated_data = results.values(*fields)
diff --git a/apiserver/plane/db/models/intake.py b/apiserver/plane/db/models/intake.py
index 3860b97f20..2f698ae1bf 100644
--- a/apiserver/plane/db/models/intake.py
+++ b/apiserver/plane/db/models/intake.py
@@ -31,6 +31,10 @@ class Intake(ProjectBaseModel):
ordering = ("name",)
+class SourceType(models.TextChoices):
+ IN_APP = "IN_APP"
+
+
class IntakeIssue(ProjectBaseModel):
intake = models.ForeignKey(
"db.Intake", related_name="issue_intake", on_delete=models.CASCADE