Rename validate_foo to get_foo_or_raise

airlock/views/helpers.py

@@ -11,7 +11,7 @@ def login_exempt(view):
     return view
 
 
-def validate_workspace(user, workspace_name):
+def get_workspace_or_raise(user, workspace_name):
     """Ensure the workspace exists and the current user has permissions to access it."""
     try:
         workspace = bll.get_workspace(workspace_name, user)
@@ -23,7 +23,7 @@ def validate_workspace(user, workspace_name):
     return workspace
 
 
-def validate_release_request(user, request_id):
+def get_release_request_or_raise(user, request_id):
     """Ensure the release request exists for this workspace."""
     try:
         release_request = bll.get_release_request(request_id, user)

airlock/views/request.py

@@ -12,7 +12,7 @@
 from airlock.business_logic import Status, bll
 from airlock.file_browser_api import get_request_tree
 
-from .helpers import serve_file, validate_release_request
+from .helpers import get_release_request_or_raise, serve_file
 
 
 def request_index(request):
@@ -35,7 +35,7 @@ def request_index(request):
 # we return different content if it is a HTMX request.
 @vary_on_headers("HX-Request")
 def request_view(request, request_id: str, path: str = ""):
-    release_request = validate_release_request(request.user, request_id)
+    release_request = get_release_request_or_raise(request.user, request_id)
 
     template = "file_browser/index.html"
     selected_only = False
@@ -93,7 +93,7 @@ def request_view(request, request_id: str, path: str = ""):
 
 @require_http_methods(["GET"])
 def request_contents(request, request_id: str, path: str):
-    release_request = validate_release_request(request.user, request_id)
+    release_request = get_release_request_or_raise(request.user, request_id)
 
     try:
         abspath = release_request.abspath(path)
@@ -115,7 +115,7 @@ def request_contents(request, request_id: str, path: str):
 
 @require_http_methods(["POST"])
 def request_submit(request, request_id):
-    release_request = validate_release_request(request.user, request_id)
+    release_request = get_release_request_or_raise(request.user, request_id)
 
     try:
         bll.set_status(release_request, Status.SUBMITTED, request.user)
@@ -128,7 +128,7 @@ def request_submit(request, request_id):
 
 @require_http_methods(["POST"])
 def request_reject(request, request_id):
-    release_request = validate_release_request(request.user, request_id)
+    release_request = get_release_request_or_raise(request.user, request_id)
 
     try:
         bll.set_status(release_request, Status.REJECTED, request.user)
@@ -141,7 +141,7 @@ def request_reject(request, request_id):
 
 @require_http_methods(["POST"])
 def request_release_files(request, request_id):
-    release_request = validate_release_request(request.user, request_id)
+    release_request = get_release_request_or_raise(request.user, request_id)
 
     try:
         # For now, we just implicitly approve when release files is requested

airlock/views/workspace.py

@@ -12,7 +12,7 @@
 from airlock.file_browser_api import get_workspace_tree
 from airlock.forms import AddFileForm
 
-from .helpers import serve_file, validate_workspace
+from .helpers import get_workspace_or_raise, serve_file
 
 
 def grouped_workspaces(workspaces):
@@ -34,7 +34,7 @@ def workspace_index(request):
 # we return different content if it is a HTMX request.
 @vary_on_headers("HX-Request")
 def workspace_view(request, workspace_name: str, path: str = ""):
-    workspace = validate_workspace(request.user, workspace_name)
+    workspace = get_workspace_or_raise(request.user, workspace_name)
 
     template = "file_browser/index.html"
     selected_only = False
@@ -97,7 +97,7 @@ def workspace_view(request, workspace_name: str, path: str = ""):
 
 @require_http_methods(["GET"])
 def workspace_contents(request, workspace_name: str, path: str):
-    workspace = validate_workspace(request.user, workspace_name)
+    workspace = get_workspace_or_raise(request.user, workspace_name)
 
     try:
         abspath = workspace.abspath(path)
@@ -112,7 +112,7 @@ def workspace_contents(request, workspace_name: str, path: str):
 
 @require_http_methods(["POST"])
 def workspace_add_file_to_request(request, workspace_name):
-    workspace = validate_workspace(request.user, workspace_name)
+    workspace = get_workspace_or_raise(request.user, workspace_name)
     relpath = UrlPath(request.POST["path"])
     try:
         workspace.abspath(relpath)