Meik/C4IT-F4SD-M42WebApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: read optional legacy parameters from query

Browse Source
This commit is contained in:
Meik
2026-07-17 17:49:22 +02:00
parent d97a87c61a
commit cec49319da
8 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Legacy/F4SDM42WebApi/F4SDM42WebApiController.cs
View File

@@ -106,11 +106,10 @@ namespace C4IT.F4SD
public async Task<List<cF4SDTicketSummary>> getTicketList(
string sid,
int hours,
int queueoption = 0,
string queues = ""
int queueoption = 0
)
{
var decodedPairs = ParseQueues(queues);
var decodedPairs = ParseQueues(GetQueryValue("queues"));
// Nun weiterreichen an Service
return await _f4stHelperService.getTicketListByUser(
@@ -125,11 +124,10 @@ namespace C4IT.F4SD
public async Task<List<cF4SDTicketSummary>> getTicketListForUser(
Guid userId,
int hours,
int queueoption = 0,
string queues = ""
int queueoption = 0
)
{
var decodedPairs = ParseQueues(queues);
var decodedPairs = ParseQueues(GetQueryValue("queues"));
// Nun weiterreichen an Service
return await _f4stHelperService.getTicketListByUser(
@@ -163,8 +161,7 @@ namespace C4IT.F4SD
string sid,
string scope = "personal",
string keys = "",
int queueoption = 0,
string queues = ""
int queueoption = 0
)
{
var parsedKeys = (keys ?? string.Empty)
@@ -173,7 +170,7 @@ namespace C4IT.F4SD
.Where(key => !string.IsNullOrWhiteSpace(key))
.ToList();
var decodedQueues = ParseQueues(queues);
var decodedQueues = ParseQueues(GetQueryValue("queues"));
return await _f4stHelperService.getTicketOverviewCounts(sid, scope, parsedKeys, queueoption, decodedQueues);
}
@@ -183,8 +180,7 @@ namespace C4IT.F4SD
Guid userId,
string scope = "personal",
string keys = "",
int queueoption = 0,
string queues = ""
int queueoption = 0
)
{
var parsedKeys = (keys ?? string.Empty)
@@ -193,7 +189,7 @@ namespace C4IT.F4SD
.Where(key => !string.IsNullOrWhiteSpace(key))
.ToList();
var decodedQueues = ParseQueues(queues);
var decodedQueues = ParseQueues(GetQueryValue("queues"));
return await _f4stHelperService.getTicketOverviewCounts(userId, scope, parsedKeys, queueoption, decodedQueues);
}
@@ -253,11 +249,10 @@ namespace C4IT.F4SD
string scope = "personal",
string key = "",
int count = 0,
int queueoption = 0,
string queues = ""
int queueoption = 0
)
{
var decodedQueues = ParseQueues(queues);
var decodedQueues = ParseQueues(GetQueryValue("queues"));
return await _f4stHelperService.getTicketOverviewRelations(sid, scope, key, count, queueoption, decodedQueues);
}
@@ -267,11 +262,10 @@ namespace C4IT.F4SD
string scope = "personal",
string key = "",
int count = 0,
int queueoption = 0,
string queues = ""
int queueoption = 0
)
{
var decodedQueues = ParseQueues(queues);
var decodedQueues = ParseQueues(GetQueryValue("queues"));
return await _f4stHelperService.getTicketOverviewRelations(userId, scope, key, count, queueoption, decodedQueues);
}
@@ -385,6 +379,13 @@ namespace C4IT.F4SD
public string Queues { get; set; }
}
private string GetQueryValue(string name)
{
return Request?.GetQueryNameValuePairs()
.FirstOrDefault(pair => string.Equals(pair.Key, name, StringComparison.OrdinalIgnoreCase))
.Value ?? string.Empty;
}
private static List<cApiM42TicketQueueInfo> ParseQueues(string queues)
{
return (queues ?? string.Empty)
@@ -456,11 +457,11 @@ namespace C4IT.F4SD
}
[Route("log"), HttpGet]
public HttpResponseMessage getLog(string download = "0", int count = 50, string filter = "")
public HttpResponseMessage getLog(string download = "0", int count = 50)
{
try
{
return _f4stHelperService.privGetLog(download, count, Request, filter);
return _f4stHelperService.privGetLog(download, count, Request, GetQueryValue("filter"));
}
catch (Exception E)
{