RE1-T40 PR#292 fixes

Author: ucswift

Web/Resgrid.Web/Areas/User/Controllers/DocumentsController.cs

@@ -76,6 +76,9 @@ public async Task<IActionResult> GetDocument(int documentId)
 		{
 			var document = await _documentsService.GetDocumentByIdAsync(documentId);
 
+			if (document == null)
+				return NotFound();
+
 			if (document.DepartmentId != DepartmentId)
 				return Unauthorized();
 
@@ -94,6 +97,9 @@ public async Task<IActionResult> DeleteDocument(int documentId, CancellationToke
 		{
 			var document = await _documentsService.GetDocumentByIdAsync(documentId);
 
+			if (document == null)
+				return NotFound();
+
 			if (document.DepartmentId != DepartmentId)
 				return Unauthorized();
 
@@ -200,6 +206,9 @@ public async Task<IActionResult> EditDocument(int documentId)
 
 			var document = await _documentsService.GetDocumentByIdAsync(documentId);
 
+			if (document == null)
+				return NotFound();
+
 			if (document.DepartmentId != DepartmentId)
 				return Unauthorized();
 
@@ -231,6 +240,9 @@ public async Task<IActionResult> EditDocument(EditDocumentView model, IFormFile
 		{
 			var document = await _documentsService.GetDocumentByIdAsync(model.DocumentId);
 
+			if (document == null)
+				return NotFound();
+
 			if (document.DepartmentId != DepartmentId)
 				return Unauthorized();
 

Web/Resgrid.Web/Areas/User/Controllers/MappingController.cs

@@ -102,7 +102,10 @@ public async Task<IActionResult> ViewType(int poiTypeId)
 
 			var type = await _mappingService.GetTypeByIdAsync(poiTypeId);
 
-			if (type == null || type.DepartmentId != DepartmentId)
+			if (type == null)
+				return NotFound();
+
+			if (type.DepartmentId != DepartmentId)
 				return Unauthorized();
 
 			model.Type = type;
@@ -210,7 +213,10 @@ public async Task<IActionResult> EditLayer(string layerId)
 			model.CenterCoordinates = await _departmentSettingsService.GetMapCenterCoordinatesAsync(model.Department);
 			var layer = await _mappingService.GetMapLayersByIdAsync(layerId);
 
-			if (layer == null || layer.DepartmentId != DepartmentId || layer.IsDeleted)
+			if (layer == null || layer.IsDeleted)
+				return NotFound();
+
+			if (layer.DepartmentId != DepartmentId)
 				return Unauthorized();
 
 			var feature = layer.Data.Convert();
@@ -262,7 +268,10 @@ public async Task<IActionResult> DeleteLayer(string layerId)
 
 			var layer = await _mappingService.GetMapLayersByIdAsync(layerId);
 
-			if (layer == null || layer.DepartmentId != DepartmentId || layer.IsDeleted)
+			if (layer == null || layer.IsDeleted)
+				return NotFound();
+
+			if (layer.DepartmentId != DepartmentId)
 				return Unauthorized();
 
 			layer.IsDeleted = true;
@@ -621,7 +630,10 @@ public async Task<IActionResult> GetTypesMapData(int poiTypeId)
 
 			var poiType = await _mappingService.GetTypeByIdAsync(poiTypeId);
 
-			if (poiType == null || poiType.DepartmentId != DepartmentId)
+			if (poiType == null)
+				return NotFound();
+
+			if (poiType.DepartmentId != DepartmentId)
 				return Unauthorized();
 
 			foreach (var poi in poiType.Pois)
@@ -648,7 +660,10 @@ public async Task<IActionResult> GetPoisForType(int poiTypeId)
 
 			var poiType = await _mappingService.GetTypeByIdAsync(poiTypeId);
 
-			if (poiType == null || poiType.DepartmentId != DepartmentId)
+			if (poiType == null)
+				return NotFound();
+
+			if (poiType.DepartmentId != DepartmentId)
 				return Unauthorized();
 
 			foreach (var poi in poiType.Pois)
@@ -700,9 +715,15 @@ public async Task<IActionResult> StationRouting(int stationId, int callId)
 			var station = await _departmentGroupsService.GetGroupByIdAsync(stationId);
 			var call = await _callsService.GetCallByIdAsync(callId);
 
+			if (station == null)
+				return NotFound();
+
 			if (station.DepartmentId != DepartmentId)
 				return Unauthorized();
 
+			if (call == null)
+				return NotFound();
+
 			if (call.DepartmentId != DepartmentId)
 				return Unauthorized();