Refactor role assignment errors

seacatauth/authz/role/handler/roles.py

@@ -4,6 +4,7 @@
 import asab
 import asab.web.rest
 import asab.exceptions
+import seacatauth.exceptions
 
 from ....decorators import access_control
 
@@ -123,10 +124,30 @@ async def assign_role(self, request, *, tenant):
 					status=403
 				)
 
-		await self.RoleService.assign_role(
-			credentials_id=request.match_info["credentials_id"],
-			role_id=role_id
-		)
+		credentials_id = request.match_info["credentials_id"]
+		try:
+			await self.RoleService.assign_role(credentials_id, role_id)
+		except seacatauth.exceptions.TenantNotAssignedError:
+			L.log(asab.LOG_NOTICE, "Failed to assign role: Tenant not assigned", struct_data={
+				"tenant": tenant, "cid": credentials_id})
+			return asab.web.rest.json_response(request, status=400, data={
+				"result": "FAILED",
+				"message": "Tenant not assigned",
+			})
+		except seacatauth.exceptions.CredentialsNotFoundError:
+			L.log(asab.LOG_NOTICE, "Failed to assign role: Credentials not found", struct_data={
+				"cid": credentials_id})
+			return asab.web.rest.json_response(request, status=404, data={
+				"result": "NOT-FOUND",
+				"message": "Credentials not found",
+			})
+		except seacatauth.exceptions.RoleNotFoundError as e:
+			L.log(asab.LOG_NOTICE, "Failed to assign role: Role not found", struct_data={
+				"role_id": role_id})
+			return asab.web.rest.json_response(request, status=404, data={
+				"result": "NOT-FOUND",
+				"message": "Role not found",
+			})
 
 		return asab.web.rest.json_response(request, data={"result": "OK"})
 

seacatauth/authz/role/service.py

@@ -333,7 +333,7 @@ async def assign_role(
 			try:
 				await self.TenantService.get_tenant(tenant)
 			except KeyError:
-				raise exceptions.TenantNotFoundError(tenant)
+				raise exceptions.IntegrityError("Role's tenant not found", tenant_id=tenant, role_id=role_id)
 
 		if verify_credentials:
 			try:

seacatauth/exceptions.py

@@ -151,3 +151,12 @@ def __init__(self, client_id=None, *args):
 		else:
 			message = "Request contains no root session cookie"
 		super().__init__(message, *args)
+
+
+class IntegrityError(SeacatAuthError):
+	"""
+	Database is in an unexpected state; on object is missing its dependencies.
+	"""
+	def __init__(self, message, **struct_data):
+		self.StructData = struct_data
+		super().__init__(message)