Skip to content

Commit 3d197e2

Browse files
Merge pull request #1156 from frankrousseau/reorder-routes-rename
Rename the unreleased reorder routes to /actions/.../reorder
2 parents d42543f + 4c2f57b commit 3d197e2

7 files changed

Lines changed: 18 additions & 18 deletions

File tree

tests/projects/test_route_metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def test_all_projects_metadata_descriptor(self):
8686
self.assertEqual(len(updated), 2)
8787

8888
self.post(
89-
"data/metadata-descriptors/all-projects/reorder",
89+
"actions/metadata-descriptors/all-projects/reorder",
9090
{"entity_type": "Project", "field_order": ["ship_code"]},
9191
200,
9292
)

tests/projects/test_route_project_templates.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def test_task_type_reorder_route(self):
102102
{"task_type_id": tt2, "priority": 2},
103103
)
104104
result = self.post(
105-
f"/data/project-templates/{template['id']}/task-types/reorder",
105+
f"/actions/project-templates/{template['id']}/task-types/reorder",
106106
{"task_type_ids": [tt2, tt1]},
107107
200,
108108
)
@@ -127,7 +127,7 @@ def test_task_status_reorder_route_preserves_roles(self):
127127
{"task_status_id": ts2, "priority": 2},
128128
)
129129
result = self.post(
130-
f"/data/project-templates/{template['id']}/task-statuses/reorder",
130+
f"/actions/project-templates/{template['id']}/task-statuses/reorder",
131131
{"task_status_ids": [ts2, ts1]},
132132
200,
133133
)

tests/tasks/test_route_tasks.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ def test_reorder_task_type_links(self):
688688
projects_service.create_project_task_type_link(project_id, tt1, 1)
689689
projects_service.create_project_task_type_link(project_id, tt2, 2)
690690
result = self.post(
691-
f"/data/projects/{project_id}/task-type-links/batch",
691+
f"/actions/projects/{project_id}/task-type-links/reorder",
692692
{"task_type_ids": [tt2, tt1]},
693693
200,
694694
)
@@ -700,7 +700,7 @@ def test_reorder_task_types(self):
700700
tt1 = str(self.task_type.id)
701701
tt2 = str(self.task_type_concept.id)
702702
result = self.post(
703-
"/data/task-types/reorder",
703+
"/actions/task-types/reorder",
704704
{"task_type_ids": [tt2, tt1]},
705705
200,
706706
)
@@ -726,7 +726,7 @@ def test_reorder_task_status_links_preserves_roles(self):
726726
project_id=project_id, task_status_id=ts2, priority=2
727727
)
728728
result = self.post(
729-
f"/data/projects/{project_id}/task-status-links/batch",
729+
f"/actions/projects/{project_id}/task-status-links/reorder",
730730
{"task_status_ids": [ts2, ts1]},
731731
200,
732732
)

zou/app/blueprints/crud/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
ProjectsResource,
7878
ProjectTaskTypeLinksResource,
7979
ProjectTaskStatusLinksResource,
80-
BatchProjectTaskTypeLinksResource,
81-
BatchProjectTaskStatusLinksResource,
80+
ProjectTaskTypeLinksReorderResource,
81+
ProjectTaskStatusLinksReorderResource,
8282
)
8383
from zou.app.blueprints.crud.project_status import (
8484
ProjectStatusResource,
@@ -166,19 +166,19 @@
166166
("/data/entities", EntitiesResource),
167167
("/data/entities/<instance_id>", EntityResource),
168168
("/data/task-types", TaskTypesResource),
169-
("/data/task-types/reorder", TaskTypesReorderResource),
169+
("/actions/task-types/reorder", TaskTypesReorderResource),
170170
("/data/task-types/<instance_id>", TaskTypeResource),
171171
("/data/task-type-links", ProjectTaskTypeLinksResource),
172172
(
173-
"/data/projects/<project_id>/task-type-links/batch",
174-
BatchProjectTaskTypeLinksResource,
173+
"/actions/projects/<project_id>/task-type-links/reorder",
174+
ProjectTaskTypeLinksReorderResource,
175175
),
176176
("/data/task-status", TaskStatusesResource),
177177
("/data/task-status/<instance_id>", TaskStatusResource),
178178
("/data/task-status-links", ProjectTaskStatusLinksResource),
179179
(
180-
"/data/projects/<project_id>/task-status-links/batch",
181-
BatchProjectTaskStatusLinksResource,
180+
"/actions/projects/<project_id>/task-status-links/reorder",
181+
ProjectTaskStatusLinksReorderResource,
182182
),
183183
("/data/tasks", TasksResource),
184184
("/data/tasks/<instance_id>", TaskResource),

zou/app/blueprints/crud/project.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ def _validate_id_list_body(key):
741741
return body[key]
742742

743743

744-
class BatchProjectTaskTypeLinksResource(MethodView):
744+
class ProjectTaskTypeLinksReorderResource(MethodView):
745745
@jwt_required()
746746
def post(self, project_id):
747747
"""
@@ -784,7 +784,7 @@ def post(self, project_id):
784784
)
785785

786786

787-
class BatchProjectTaskStatusLinksResource(MethodView):
787+
class ProjectTaskStatusLinksReorderResource(MethodView):
788788
@jwt_required()
789789
def post(self, project_id):
790790
"""

zou/app/blueprints/project_templates/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
ProjectTemplateTaskTypesResource,
2727
),
2828
(
29-
"/data/project-templates/<template_id>/task-types/reorder",
29+
"/actions/project-templates/<template_id>/task-types/reorder",
3030
ProjectTemplateTaskTypesReorderResource,
3131
),
3232
(
@@ -38,7 +38,7 @@
3838
ProjectTemplateTaskStatusesResource,
3939
),
4040
(
41-
"/data/project-templates/<template_id>/task-statuses/reorder",
41+
"/actions/project-templates/<template_id>/task-statuses/reorder",
4242
ProjectTemplateTaskStatusesReorderResource,
4343
),
4444
(

zou/app/blueprints/projects/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
AllProjectsMetadataDescriptorsResource,
123123
),
124124
(
125-
"/data/metadata-descriptors/all-projects/reorder",
125+
"/actions/metadata-descriptors/all-projects/reorder",
126126
AllProjectsMetadataDescriptorsReorderResource,
127127
),
128128
(

0 commit comments

Comments
 (0)