diff --git a/apps/api/plane/api/urls/__init__.py b/apps/api/plane/api/urls/__init__.py index ed187549d61..10cad2068e3 100644 --- a/apps/api/plane/api/urls/__init__.py +++ b/apps/api/plane/api/urls/__init__.py @@ -1,21 +1,23 @@ -from .project import urlpatterns as project_patterns -from .state import urlpatterns as state_patterns -from .issue import urlpatterns as issue_patterns +from .asset import urlpatterns as asset_patterns from .cycle import urlpatterns as cycle_patterns -from .module import urlpatterns as module_patterns from .intake import urlpatterns as intake_patterns +from .label import urlpatterns as label_patterns from .member import urlpatterns as member_patterns -from .asset import urlpatterns as asset_patterns +from .module import urlpatterns as module_patterns +from .project import urlpatterns as project_patterns +from .state import urlpatterns as state_patterns from .user import urlpatterns as user_patterns +from .work_item import urlpatterns as work_item_patterns urlpatterns = [ *asset_patterns, - *project_patterns, - *state_patterns, - *issue_patterns, *cycle_patterns, - *module_patterns, *intake_patterns, + *label_patterns, *member_patterns, + *module_patterns, + *project_patterns, + *state_patterns, *user_patterns, + *work_item_patterns, ] diff --git a/apps/api/plane/api/urls/label.py b/apps/api/plane/api/urls/label.py new file mode 100644 index 00000000000..f7ee57b1713 --- /dev/null +++ b/apps/api/plane/api/urls/label.py @@ -0,0 +1,17 @@ +from django.urls import path + +from plane.api.views import LabelListCreateAPIEndpoint, LabelDetailAPIEndpoint + + +urlpatterns = [ + path( + "workspaces//projects//labels/", + LabelListCreateAPIEndpoint.as_view(http_method_names=["get", "post"]), + name="label", + ), + path( + "workspaces//projects//labels//", + LabelDetailAPIEndpoint.as_view(http_method_names=["get", "patch", "delete"]), + name="label", + ), +] diff --git a/apps/api/plane/api/urls/issue.py b/apps/api/plane/api/urls/work_item.py similarity index 52% rename from apps/api/plane/api/urls/issue.py rename to apps/api/plane/api/urls/work_item.py index 8306a13159b..7207df9579f 100644 --- a/apps/api/plane/api/urls/issue.py +++ b/apps/api/plane/api/urls/work_item.py @@ -3,8 +3,6 @@ from plane.api.views import ( IssueListCreateAPIEndpoint, IssueDetailAPIEndpoint, - LabelListCreateAPIEndpoint, - LabelDetailAPIEndpoint, IssueLinkListCreateAPIEndpoint, IssueLinkDetailAPIEndpoint, IssueCommentListCreateAPIEndpoint, @@ -17,7 +15,8 @@ IssueSearchEndpoint, ) -urlpatterns = [ +# Deprecated url patterns +old_url_patterns = [ path( "workspaces//issues/search/", IssueSearchEndpoint.as_view(http_method_names=["get"]), @@ -38,16 +37,6 @@ IssueDetailAPIEndpoint.as_view(http_method_names=["get", "patch", "delete"]), name="issue", ), - path( - "workspaces//projects//labels/", - LabelListCreateAPIEndpoint.as_view(http_method_names=["get", "post"]), - name="label", - ), - path( - "workspaces//projects//labels//", - LabelDetailAPIEndpoint.as_view(http_method_names=["get", "patch", "delete"]), - name="label", - ), path( "workspaces//projects//issues//links/", IssueLinkListCreateAPIEndpoint.as_view(http_method_names=["get", "post"]), @@ -89,3 +78,69 @@ name="issue-attachment", ), ] + +# New url patterns with work-items as the prefix +new_url_patterns = [ + path( + "workspaces//work-items/search/", + IssueSearchEndpoint.as_view(http_method_names=["get"]), + name="work-item-search", + ), + path( + "workspaces//work-items/-/", + WorkspaceIssueAPIEndpoint.as_view(http_method_names=["get"]), + name="work-item-by-identifier", + ), + path( + "workspaces//projects//work-items/", + IssueListCreateAPIEndpoint.as_view(http_method_names=["get", "post"]), + name="work-item-list", + ), + path( + "workspaces//projects//work-items//", + IssueDetailAPIEndpoint.as_view(http_method_names=["get", "patch", "delete"]), + name="work-item-detail", + ), + path( + "workspaces//projects//work-items//links/", + IssueLinkListCreateAPIEndpoint.as_view(http_method_names=["get", "post"]), + name="work-item-link-list", + ), + path( + "workspaces//projects//work-items//links//", + IssueLinkDetailAPIEndpoint.as_view(http_method_names=["get", "patch", "delete"]), + name="work-item-link-detail", + ), + path( + "workspaces//projects//work-items//comments/", + IssueCommentListCreateAPIEndpoint.as_view(http_method_names=["get", "post"]), + name="work-item-comment-list", + ), + path( + "workspaces//projects//work-items//comments//", + IssueCommentDetailAPIEndpoint.as_view(http_method_names=["get", "patch", "delete"]), + name="work-item-comment-detail", + ), + path( + "workspaces//projects//work-items//activities/", + IssueActivityListAPIEndpoint.as_view(http_method_names=["get"]), + name="work-item-activity-list", + ), + path( + "workspaces//projects//work-items//activities//", + IssueActivityDetailAPIEndpoint.as_view(http_method_names=["get"]), + name="work-item-activity-detail", + ), + path( + "workspaces//projects//work-items//attachments/", + IssueAttachmentListCreateAPIEndpoint.as_view(http_method_names=["get", "post"]), + name="work-item-attachment-list", + ), + path( + "workspaces//projects//work-items//attachments//", + IssueAttachmentDetailAPIEndpoint.as_view(http_method_names=["get", "patch", "delete"]), + name="work-item-attachment-detail", + ), +] + +urlpatterns = old_url_patterns + new_url_patterns