diff --git a/F4SDM42WebApi/F4SDM42WebApiController.cs b/F4SDM42WebApi/F4SDM42WebApiController.cs index feb8374..424b586 100644 --- a/F4SDM42WebApi/F4SDM42WebApiController.cs +++ b/F4SDM42WebApi/F4SDM42WebApiController.cs @@ -94,38 +94,6 @@ namespace C4IT.F4SD return GetRequiredService(); } - private string GetQueryValue(string name) - { - return Request?.GetQueryNameValuePairs() - .FirstOrDefault(pair => string.Equals(pair.Key, name, StringComparison.OrdinalIgnoreCase)) - .Value; - } - - private string QueryValue(string value, string name) - { - return GetQueryValue(name) ?? value ?? string.Empty; - } - - private int QueryValue(int value, string name) - { - return int.TryParse(GetQueryValue(name), out var parsed) ? parsed : value; - } - - private Guid QueryValue(Guid value, string name) - { - return Guid.TryParse(GetQueryValue(name), out var parsed) ? parsed : value; - } - - private Guid? QueryValue(Guid? value, string name) - { - return Guid.TryParse(GetQueryValue(name), out var parsed) ? parsed : value; - } - - private TEnum QueryValue(TEnum value, string name) where TEnum : struct - { - return Enum.TryParse(GetQueryValue(name), true, out var parsed) ? parsed : value; - } - [Route("getDirectLinkCreateTicket"), HttpGet] public async Task getDirectLinkCreateTicket([FromUri] string sid = "", [FromUri] string assetname = "") { @@ -433,6 +401,38 @@ namespace C4IT.F4SD ?? Guid.Empty; } + private string GetQueryValue(string name) + { + return Request?.GetQueryNameValuePairs() + .FirstOrDefault(pair => string.Equals(pair.Key, name, StringComparison.OrdinalIgnoreCase)) + .Value; + } + + private string QueryValue(string value, string name) + { + return GetQueryValue(name) ?? value ?? string.Empty; + } + + private int QueryValue(int value, string name) + { + return int.TryParse(GetQueryValue(name), out var parsed) ? parsed : value; + } + + private Guid QueryValue(Guid value, string name) + { + return Guid.TryParse(GetQueryValue(name), out var parsed) ? parsed : value; + } + + private Guid? QueryValue(Guid? value, string name) + { + return Guid.TryParse(GetQueryValue(name), out var parsed) ? parsed : value; + } + + private TEnum QueryValue(TEnum value, string name) where TEnum : struct + { + return Enum.TryParse(GetQueryValue(name), true, out var parsed) ? parsed : value; + } + private static List ParseQueues(string queues) { return (queues ?? string.Empty)