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: update the response for conflicting errors (#3568)

Browse Source
This commit is contained in:
Nikhil 2024-02-06 17:00:42 +05:30 committed by GitHub
parent ac22769220
commit 751b15a7a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apiserver/plane/api/views/cycle.py
View File

@ -262,7 +262,7 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
return Response( return Response(
{ {
"error": "Cycle with the same external id and external source already exists", "error": "Cycle with the same external id and external source already exists",
"cycle": str(cycle.id), "id": str(cycle.id),
}, },
status=status.HTTP_409_CONFLICT, status=status.HTTP_409_CONFLICT,
) )
@ -325,7 +325,7 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
return Response( return Response(
{ {
"error": "Cycle with the same external id and external source already exists", "error": "Cycle with the same external id and external source already exists",
"cycle_id": str(cycle.id), "id": str(cycle.id),
}, },
status=status.HTTP_409_CONFLICT, status=status.HTTP_409_CONFLICT,
) )

61
apiserver/plane/api/views/issue.py
View File

@ -239,7 +239,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
return Response( return Response(
{ {
"error": "Issue with the same external id and external source already exists", "error": "Issue with the same external id and external source already exists",
"issue_id": str(issue.id), "id": str(issue.id),
}, },
status=status.HTTP_409_CONFLICT, status=status.HTTP_409_CONFLICT,
) )
@ -286,14 +286,16 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
and Issue.objects.filter( and Issue.objects.filter(
project_id=project_id, project_id=project_id,
workspace__slug=slug, workspace__slug=slug,
external_source=request.data.get("external_source", issue.external_source), external_source=request.data.get(
"external_source", issue.external_source
),
external_id=request.data.get("external_id"), external_id=request.data.get("external_id"),
).exists() ).exists()
): ):
return Response( return Response(
{ {
"error": "Issue with the same external id and external source already exists", "error": "Issue with the same external id and external source already exists",
"issue_id": str(issue.id), "id": str(issue.id),
}, },
status=status.HTTP_409_CONFLICT, status=status.HTTP_409_CONFLICT,
) )
@ -362,6 +364,30 @@ class LabelAPIEndpoint(BaseAPIView):
try: try:
serializer = LabelSerializer(data=request.data) serializer = LabelSerializer(data=request.data)
if serializer.is_valid(): if serializer.is_valid():
if (
request.data.get("external_id")
and request.data.get("external_source")
and Label.objects.filter(
project_id=project_id,
workspace__slug=slug,
external_source=request.data.get("external_source"),
external_id=request.data.get("external_id"),
).exists()
):
label = Label.objects.filter(
workspace__slug=slug,
project_id=project_id,
external_id=request.data.get("external_id"),
external_source=request.data.get("external_source"),
).first()
return Response(
{
"error": "Label with the same external id and external source already exists",
"id": str(label.id),
},
status=status.HTTP_409_CONFLICT,
)
serializer.save(project_id=project_id) serializer.save(project_id=project_id)
return Response( return Response(
serializer.data, status=status.HTTP_201_CREATED serializer.data, status=status.HTTP_201_CREATED
@ -370,11 +396,17 @@ class LabelAPIEndpoint(BaseAPIView):
serializer.errors, status=status.HTTP_400_BAD_REQUEST serializer.errors, status=status.HTTP_400_BAD_REQUEST
) )
except IntegrityError: except IntegrityError:
label = Label.objects.filter(
workspace__slug=slug,
project_id=project_id,
name=request.data.get("name"),
).first()
return Response( return Response(
{ {
"error": "Label with the same name already exists in the project" "error": "Label with the same name already exists in the project",
"id": str(label.id),
}, },
status=status.HTTP_400_BAD_REQUEST, status=status.HTTP_409_CONFLICT,
) )
def get(self, request, slug, project_id, pk=None): def get(self, request, slug, project_id, pk=None):
@ -401,6 +433,25 @@ class LabelAPIEndpoint(BaseAPIView):
label = self.get_queryset().get(pk=pk) label = self.get_queryset().get(pk=pk)
serializer = LabelSerializer(label, data=request.data, partial=True) serializer = LabelSerializer(label, data=request.data, partial=True)
if serializer.is_valid(): if serializer.is_valid():
if (
str(request.data.get("external_id"))
and (label.external_id != str(request.data.get("external_id")))
and Issue.objects.filter(
project_id=project_id,
workspace__slug=slug,
external_source=request.data.get(
"external_source", label.external_source
),
external_id=request.data.get("external_id"),
).exists()
):
return Response(
{
"error": "Label with the same external id and external source already exists",
"id": str(label.id),
},
status=status.HTTP_409_CONFLICT,
)
serializer.save() serializer.save()
return Response(serializer.data, status=status.HTTP_200_OK) return Response(serializer.data, status=status.HTTP_200_OK)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

4
apiserver/plane/api/views/module.py
View File

@ -151,7 +151,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
return Response( return Response(
{ {
"error": "Module with the same external id and external source already exists", "error": "Module with the same external id and external source already exists",
"module_id": str(module.id), "id": str(module.id),
}, },
status=status.HTTP_409_CONFLICT, status=status.HTTP_409_CONFLICT,
) )
@ -185,7 +185,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
return Response( return Response(
{ {
"error": "Module with the same external id and external source already exists", "error": "Module with the same external id and external source already exists",
"module_id": str(module.id), "id": str(module.id),
}, },
status=status.HTTP_409_CONFLICT, status=status.HTTP_409_CONFLICT,
) )

4
apiserver/plane/api/views/state.py
View File

@ -57,7 +57,7 @@ class StateAPIEndpoint(BaseAPIView):
return Response( return Response(
{ {
"error": "State with the same external id and external source already exists", "error": "State with the same external id and external source already exists",
"state_id": str(state.id), "id": str(state.id),
}, },
status=status.HTTP_409_CONFLICT, status=status.HTTP_409_CONFLICT,
) )
@ -128,7 +128,7 @@ class StateAPIEndpoint(BaseAPIView):
return Response( return Response(
{ {
"error": "State with the same external id and external source already exists", "error": "State with the same external id and external source already exists",
"state_id": str(state.id), "id": str(state.id),
}, },
status=status.HTTP_409_CONFLICT, status=status.HTTP_409_CONFLICT,
) )