From 34fa34e53ddc1ebbb05f7985f6450e9562acb8f4 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 10 Mar 2021 17:47:33 +0000
Subject: [PATCH]

---
 server/AyaNova/Controllers/ReportController.cs |  2 --
 server/AyaNova/biz/ReportBiz.cs                | 11 ++++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/server/AyaNova/Controllers/ReportController.cs b/server/AyaNova/Controllers/ReportController.cs
index 3ef3973c..1e54c136 100644
--- a/server/AyaNova/Controllers/ReportController.cs
+++ b/server/AyaNova/Controllers/ReportController.cs
@@ -13,8 +13,6 @@ using AyaNova.Biz;
 using AyaNova.Util;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using EnumsNET;
-using AyaNova.DataList;
 
 namespace AyaNova.Api.Controllers
 {
diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs
index 8e0d1e9a..c80babbb 100644
--- a/server/AyaNova/biz/ReportBiz.cs
+++ b/server/AyaNova/biz/ReportBiz.cs
@@ -341,6 +341,11 @@ namespace AyaNova.Biz
             var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::GetReportData");
             AuthorizationRoles effectiveRoles = CurrentUserRoles;
 
+            if (selectedRequest.ObjectType == AyaType.NoType)
+            {
+                AddError(ApiErrorCode.VALIDATION_REQUIRED, null, $"ObjectType is required");
+                return null;
+            }
 
             if (!AyaNova.Api.ControllerHelpers.Authorized.HasReadFullRole(effectiveRoles, selectedRequest.ObjectType))
             {
@@ -399,7 +404,11 @@ namespace AyaNova.Biz
 
 
             //Get data     
-            var ReportData = await GetReportData(reportRequest);
+            var ReportData = await GetReportData(reportRequest);            
+            //if GetReportData errored then will return null so need to return that as well here
+            if(ReportData==null){
+                return null;
+            }
 
             //initialization
             log.LogDebug("Initializing report system");