diff --git a/F4SDM42WebApi/F4SD - M42WebApi.csproj b/F4SDM42WebApi/F4SD - M42WebApi.csproj index cbd4869..8dc12fb 100644 --- a/F4SDM42WebApi/F4SD - M42WebApi.csproj +++ b/F4SDM42WebApi/F4SD - M42WebApi.csproj @@ -13,7 +13,7 @@ false 6673a25d-33d6-4072-91d9-abed4be1a966 C4ITF4SD*.* - 1.4.0.37 + 1.4.0.38 true diff --git a/F4SDM42WebApi/F4SDHelperService.cs b/F4SDM42WebApi/F4SDHelperService.cs index a5280e6..7dd0206 100644 --- a/F4SDM42WebApi/F4SDHelperService.cs +++ b/F4SDM42WebApi/F4SDHelperService.cs @@ -210,7 +210,7 @@ namespace C4IT.F4SD if (activityTable?.Rows == null || activityTable.Rows.Count == 0) { LogEntry($"No activity entries found for userSid: '{userSid}'", LogLevels.Warning); - return null; + return new List(); } for (int i = 0; i < activityTable.Rows.Count; i++) @@ -291,7 +291,7 @@ namespace C4IT.F4SD catch (Exception E) { LogException(E); - return null; + return new List(); } finally { diff --git a/F4SDM42WebApi/F4SDM42WebApiController.cs b/F4SDM42WebApi/F4SDM42WebApiController.cs index d9e2196..d0d4f8f 100644 --- a/F4SDM42WebApi/F4SDM42WebApiController.cs +++ b/F4SDM42WebApi/F4SDM42WebApiController.cs @@ -122,7 +122,7 @@ namespace C4IT.F4SD hours, queueoption, decodedPairs - ); + ) ?? new List(); } diff --git a/docs/postman/C4IT-F4SD-M42WebApi.postman_collection.json b/docs/postman/C4IT-F4SD-M42WebApi.postman_collection.json index fe7b86d..461e802 100644 --- a/docs/postman/C4IT-F4SD-M42WebApi.postman_collection.json +++ b/docs/postman/C4IT-F4SD-M42WebApi.postman_collection.json @@ -327,11 +327,11 @@ "script": { "type": "text/javascript", "exec": [ - "pm.test(\"Ticket list is array or null\", function () {", + "pm.test(\"Ticket list is an array\", function () {", " const text = pm.response.text();", - " if (!text) return;", + " pm.expect(text).to.not.equal(\"\");", " const json = pm.response.json();", - " pm.expect(json === null || Array.isArray(json)).to.equal(true);", + " pm.expect(Array.isArray(json)).to.equal(true);", "});", "", "const tickets = pm.response.text() ? pm.response.json() : null;",