diff --git a/Legacy/F4SDM42WebApi/F4SDM42WebApiController.cs b/Legacy/F4SDM42WebApi/F4SDM42WebApiController.cs index f28546d..c98cb31 100644 --- a/Legacy/F4SDM42WebApi/F4SDM42WebApiController.cs +++ b/Legacy/F4SDM42WebApi/F4SDM42WebApiController.cs @@ -106,11 +106,10 @@ namespace C4IT.F4SD public async Task> 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> 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 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) { diff --git a/Legacy/PackageTemplate/install/02-01-0080 PLSLWebServiceOperationType.dat b/Legacy/PackageTemplate/install/02-01-0080 PLSLWebServiceOperationType.dat index 0702498..2048cf2 100644 --- a/Legacy/PackageTemplate/install/02-01-0080 PLSLWebServiceOperationType.dat +++ b/Legacy/PackageTemplate/install/02-01-0080 PLSLWebServiceOperationType.dat @@ -136,8 +136,8 @@ f977a1d8-f21c-c1bc-4ea0-08dac09d3c99 - {"UsedTypes":{"RequestContract":{"Descriptor":{"download":{"Type":"StringType"},"count":{"Type":"StringType"},"filter":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} - getLog(download, count, filter) + {"UsedTypes":{"RequestContract":{"Descriptor":{"download":{"Type":"StringType"},"count":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} + getLog(download, count) log 7660e907-769c-e711-a182-f079595b3ec7 diff --git a/Legacy/PackageTemplate/install/02-01-0110 PLSLWebServiceOperationType.dat b/Legacy/PackageTemplate/install/02-01-0110 PLSLWebServiceOperationType.dat index f4ed852..45f452f 100644 --- a/Legacy/PackageTemplate/install/02-01-0110 PLSLWebServiceOperationType.dat +++ b/Legacy/PackageTemplate/install/02-01-0110 PLSLWebServiceOperationType.dat @@ -136,8 +136,8 @@ 163e04c2-8b5c-c0e6-0535-08da9bbec2df - {"UsedTypes":{"RequestContract":{"Descriptor":{"sid":{"Type":"StringType"},"hours":{"Type":"StringType"},"queueoption":{"Type":"StringType"},"queues":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} - getTicketList(sid, hours, queueoption, queues) + {"UsedTypes":{"RequestContract":{"Descriptor":{"sid":{"Type":"StringType"},"hours":{"Type":"StringType"},"queueoption":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} + getTicketList(sid, hours, queueoption) getTicketList 7660e907-769c-e711-a182-f079595b3ec7 diff --git a/Legacy/PackageTemplate/install/getticketlistforuser.dat b/Legacy/PackageTemplate/install/getticketlistforuser.dat index 5887cf7..1b3505a 100644 --- a/Legacy/PackageTemplate/install/getticketlistforuser.dat +++ b/Legacy/PackageTemplate/install/getticketlistforuser.dat @@ -138,8 +138,8 @@ 8e1a4dc1-4b8d-4f97-9f58-101d95a00401 {"UsedTypes":{},"ContractDescriptor":{"ReturnCountType":"NotProvided","Documentation":"Return value","Type":"System_Collections_Generic_List`1[C4IT_FASD_Base_cF4SDTicketSummary]"}} - {"UsedTypes":{"RequestContract":{"Descriptor":{"userId":{"Type":"GuidType"},"hours":{"Type":"IntType"},"queueoption":{"Type":"IntType"},"queues":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} - getTicketListForUser(userId,hours,queueoption,queues) + {"UsedTypes":{"RequestContract":{"Descriptor":{"userId":{"Type":"GuidType"},"hours":{"Type":"IntType"},"queueoption":{"Type":"IntType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} + getTicketListForUser(userId,hours,queueoption) getTicketListForUser 7660e907-769c-e711-a182-f079595b3ec7 diff --git a/Legacy/PackageTemplate/install/getticketoverviewcounts.dat b/Legacy/PackageTemplate/install/getticketoverviewcounts.dat index f2d039a..14dc8fd 100644 --- a/Legacy/PackageTemplate/install/getticketoverviewcounts.dat +++ b/Legacy/PackageTemplate/install/getticketoverviewcounts.dat @@ -138,8 +138,8 @@ 99eef84e-a303-c248-36c5-08ded882fc6c {"UsedTypes":{"C4IT_F4SD_F4SDHelperService+TicketOverviewCountsResult":{"Descriptor":{"Counts":{"Type":["StringType"]}}}},"ContractDescriptor":{"ReturnCountType":"NotProvided","Documentation":"Return value","Type":"C4IT_F4SD_F4SDHelperService+TicketOverviewCountsResult"}} - {"UsedTypes":{"RequestContract":{"Descriptor":{"sid":{"Type":"StringType"},"scope":{"Type":"StringType"},"keys":{"Type":"StringType"},"queueoption":{"Type":"IntType"},"queues":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} - getTicketOverviewCounts(sid,scope,keys,queueoption,queues) + {"UsedTypes":{"RequestContract":{"Descriptor":{"sid":{"Type":"StringType"},"scope":{"Type":"StringType"},"keys":{"Type":"StringType"},"queueoption":{"Type":"IntType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} + getTicketOverviewCounts(sid,scope,keys,queueoption) getTicketOverviewCounts 7660e907-769c-e711-a182-f079595b3ec7 diff --git a/Legacy/PackageTemplate/install/getticketoverviewcountsforuser.dat b/Legacy/PackageTemplate/install/getticketoverviewcountsforuser.dat index 6bb29d0..0a81cfb 100644 --- a/Legacy/PackageTemplate/install/getticketoverviewcountsforuser.dat +++ b/Legacy/PackageTemplate/install/getticketoverviewcountsforuser.dat @@ -138,8 +138,8 @@ 8e1a4dc1-4b8d-4f97-9f58-101d95a00402 {"UsedTypes":{"C4IT_F4SD_F4SDHelperService+TicketOverviewCountsResult":{"Descriptor":{"Counts":{"Type":["StringType"]}}}},"ContractDescriptor":{"ReturnCountType":"NotProvided","Documentation":"Return value","Type":"C4IT_F4SD_F4SDHelperService+TicketOverviewCountsResult"}} - {"UsedTypes":{"RequestContract":{"Descriptor":{"userId":{"Type":"GuidType"},"scope":{"Type":"StringType"},"keys":{"Type":"StringType"},"queueoption":{"Type":"IntType"},"queues":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} - getTicketOverviewCountsForUser(userId,scope,keys,queueoption,queues) + {"UsedTypes":{"RequestContract":{"Descriptor":{"userId":{"Type":"GuidType"},"scope":{"Type":"StringType"},"keys":{"Type":"StringType"},"queueoption":{"Type":"IntType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} + getTicketOverviewCountsForUser(userId,scope,keys,queueoption) getTicketOverviewCountsForUser 7660e907-769c-e711-a182-f079595b3ec7 diff --git a/Legacy/PackageTemplate/install/getticketoverviewrelations.dat b/Legacy/PackageTemplate/install/getticketoverviewrelations.dat index 41130ed..db15ab1 100644 --- a/Legacy/PackageTemplate/install/getticketoverviewrelations.dat +++ b/Legacy/PackageTemplate/install/getticketoverviewrelations.dat @@ -138,8 +138,8 @@ c5dd653a-54d8-c430-c9df-08ded882fc79 {"UsedTypes":{},"ContractDescriptor":{"ReturnCountType":"NotProvided","Documentation":"Return value","Type":"System_Collections_Generic_List`1[C4IT_F4SD_F4SDHelperService+TicketOverviewRelationDto]"}} - {"UsedTypes":{"RequestContract":{"Descriptor":{"sid":{"Type":"StringType"},"scope":{"Type":"StringType"},"key":{"Type":"StringType"},"count":{"Type":"IntType"},"queueoption":{"Type":"IntType"},"queues":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} - getTicketOverviewRelations(sid,scope,key,count,queueoption,queues) + {"UsedTypes":{"RequestContract":{"Descriptor":{"sid":{"Type":"StringType"},"scope":{"Type":"StringType"},"key":{"Type":"StringType"},"count":{"Type":"IntType"},"queueoption":{"Type":"IntType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} + getTicketOverviewRelations(sid,scope,key,count,queueoption) getTicketOverviewRelations 7660e907-769c-e711-a182-f079595b3ec7 diff --git a/Legacy/PackageTemplate/install/getticketoverviewrelationsforuser.dat b/Legacy/PackageTemplate/install/getticketoverviewrelationsforuser.dat index f82cc37..7f98d9d 100644 --- a/Legacy/PackageTemplate/install/getticketoverviewrelationsforuser.dat +++ b/Legacy/PackageTemplate/install/getticketoverviewrelationsforuser.dat @@ -138,8 +138,8 @@ 8e1a4dc1-4b8d-4f97-9f58-101d95a00404 {"UsedTypes":{},"ContractDescriptor":{"ReturnCountType":"NotProvided","Documentation":"Return value","Type":"System_Collections_Generic_List`1[C4IT_F4SD_F4SDHelperService+TicketOverviewRelationDto]"}} - {"UsedTypes":{"RequestContract":{"Descriptor":{"userId":{"Type":"GuidType"},"scope":{"Type":"StringType"},"key":{"Type":"StringType"},"count":{"Type":"IntType"},"queueoption":{"Type":"IntType"},"queues":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} - getTicketOverviewRelationsForUser(userId,scope,key,count,queueoption,queues) + {"UsedTypes":{"RequestContract":{"Descriptor":{"userId":{"Type":"GuidType"},"scope":{"Type":"StringType"},"key":{"Type":"StringType"},"count":{"Type":"IntType"},"queueoption":{"Type":"IntType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}} + getTicketOverviewRelationsForUser(userId,scope,key,count,queueoption) getTicketOverviewRelationsForUser 7660e907-769c-e711-a182-f079595b3ec7