feat: add user-based ticket endpoints

F4SDM42WebApi/F4SDM42WebApiController.cs

@@ -1,11 +1,4 @@
-using C4IT.F4SDM;
-using C4IT.FASD.Base;
-using C4IT.Logging;
-using Matrix42.Common;
-using Matrix42.Contracts.ServiceManagement.ServiceContracts;
-using Matrix42.Pandora.Contracts;
-using Matrix42.Services.Description.Contracts;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -18,8 +11,17 @@ using System.Web.Http;
 using System.Web.Http.Controllers;
 using System.Web.OData;
 using System.Web.OData.Query;
+
+using Matrix42.Common;
+using Matrix42.Contracts.ServiceManagement.ServiceContracts;
+using Matrix42.Pandora.Contracts;
+using Matrix42.Services.Description.Contracts;
 using update4u.SPS.Utility.GlobalConfiguration;
-using static C4IT.FASD.Base.cF4SDTicket;
+
+using C4IT.F4SDM;
+using C4IT.FASD.Base;
+using C4IT.Logging;
+
 using static C4IT.Logging.cLogManager;
 
 namespace C4IT.F4SD
@@ -28,6 +30,7 @@ namespace C4IT.F4SD
     public partial class F4SDM42WebApiController : ApiController
     {
         public static bool IsInitialized { get; private set; } = false;
+
         public static F4SDM42WebApiController defaultInstance;
         //private readonly IIncidentService _incidentService;
         internal readonly GlobalConfigurationProvider _globalConfigurationProvider;
@@ -91,34 +94,55 @@ namespace C4IT.F4SD
             await Task.Delay(0);
             return await _f4stHelperService.getDirectLinkCreateTicket(sid, assetname);
         }
+
         [Route("getDirectLinkF4SD"), HttpGet]
         public async Task<string> getDirectLinkF4SD(Guid EOID, string Type)
         {
             return await _f4stHelperService.getDirectLinkF4SD(EOID, Type);
         }
 
+        [Obsolete]
         [Route("getTicketList"), HttpGet]
-        public async Task<List<cF4SDTicketSummary>> getTicketList(
-            string sid,
-            int hours,
-            int queueoption = 0,
-            string queues = ""
-        )
-        {
-            var decodedPairs = ParseQueues(queues);
-
-            // Nun weiterreichen an Service
-            return await _f4stHelperService.getTicketListByUser(
-                sid,
-                hours,
-                queueoption,
+        public async Task<List<cF4SDTicketSummary>> getTicketList(
+            string sid,
+            int hours,
+            int queueoption = 0,
+            string queues = ""
+        )
+        {
+            var decodedPairs = ParseQueues(queues);
+
+            // Nun weiterreichen an Service
+            return await _f4stHelperService.getTicketListByUser(
+                sid,
+                hours,
+                queueoption,
+                decodedPairs
+            );
+        }
+
+        [Route("getTicketListForUser"), HttpGet]
+        public async Task<List<cF4SDTicketSummary>> getTicketListForUser(
+            Guid userId,
+            int hours,
+            int queueoption = 0,
+            string queues = ""
+        )
+        {
+            var decodedPairs = ParseQueues(queues);
+
+            // Nun weiterreichen an Service
+            return await _f4stHelperService.getTicketListByUser(
+                userId,
+                hours,
+                queueoption,
                 decodedPairs
             );
         }
 
 
         [Route("getTicketDetails"), HttpGet]
-        public async Task<cF4SDTicket> getTicketDetails(Guid objectId)
+        public async Task<F4SDHelperService.cF4SDTicket> getTicketDetails(Guid objectId)
         {
             var tickets = await _f4stHelperService.getTicketDetails(new List<Guid>() { objectId });
             if (tickets.Count > 0)
@@ -127,73 +151,136 @@ namespace C4IT.F4SD
                 return null;
         }
 
-        [Route("getTicketHistory"), HttpGet]
-        public async Task<List<cTicketJournalItem>> getTicketHistory(Guid objectId)
-        {
-            return await _f4stHelperService.GetJournalEntries(objectId);
-        }
-
-        [Route("getTicketOverviewCounts"), HttpGet]
-        public async Task<F4SDHelperService.TicketOverviewCountsResult> getTicketOverviewCounts(
-            string sid,
-            string scope = "personal",
-            string keys = "",
-            int queueoption = 0,
-            string queues = ""
-        )
-        {
-            var parsedKeys = (keys ?? string.Empty)
-                .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(key => key.Trim())
-                .Where(key => !string.IsNullOrWhiteSpace(key))
-                .ToList();
-
-            var decodedQueues = ParseQueues(queues);
-            return await _f4stHelperService.getTicketOverviewCounts(sid, scope, parsedKeys, queueoption, decodedQueues);
-        }
-
-        [Route("getTicketOverviewCountsByRoles"), HttpPost]
-        public async Task<F4SDHelperService.TicketOverviewCountsByRoleResult> getTicketOverviewCountsByRoles([FromBody] TicketOverviewCountsByRolesRequest request)
-        {
-            var parsedKeys = (request?.Keys ?? new List<string>())
-                .Where(key => !string.IsNullOrWhiteSpace(key))
-                .Select(key => key.Trim())
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .ToList();
-
-            var roleGuids = (request?.RoleGuids ?? new List<Guid>())
-                .Where(roleId => roleId != Guid.Empty)
-                .Distinct()
-                .ToList();
-
-            var decodedQueues = ParseQueues(request?.Queues ?? string.Empty);
-            return await _f4stHelperService.getTicketOverviewCountsByRoles(
-                request?.Sid,
-                roleGuids,
-                parsedKeys,
-                request?.QueueOption ?? 0,
-                decodedQueues
-            );
-        }
-
-        [Route("getTicketOverviewRelations"), HttpGet]
-        public async Task<List<F4SDHelperService.TicketOverviewRelationDto>> getTicketOverviewRelations(
-            string sid,
-            string scope = "personal",
-            string key = "",
-            int count = 0,
-            int queueoption = 0,
-            string queues = ""
-        )
-        {
-            var decodedQueues = ParseQueues(queues);
-            return await _f4stHelperService.getTicketOverviewRelations(sid, scope, key, count, queueoption, decodedQueues);
-        }
-        /*
-        [Route("updateActivitySolution/{objectId}"), HttpPost]
-        public async Task<HttpResponseMessage> updateActivitySolution(Guid objectId, [FromBody] string SolutionHtml)
-        {
-            return new HttpResponseMessage
+        [Route("getTicketHistory"), HttpGet]
+        public async Task<List<F4SDHelperService.cF4SDTicket.cTicketJournalItem>> getTicketHistory(Guid objectId)
+        {
+            return await _f4stHelperService.GetJournalEntries(objectId);
+        }
+
+        [Obsolete]
+        [Route("getTicketOverviewCounts"), HttpGet]
+        public async Task<F4SDHelperService.TicketOverviewCountsResult> getTicketOverviewCounts(
+            string sid,
+            string scope = "personal",
+            string keys = "",
+            int queueoption = 0,
+            string queues = ""
+        )
+        {
+            var parsedKeys = (keys ?? string.Empty)
+                .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(key => key.Trim())
+                .Where(key => !string.IsNullOrWhiteSpace(key))
+                .ToList();
+
+            var decodedQueues = ParseQueues(queues);
+            return await _f4stHelperService.getTicketOverviewCounts(sid, scope, parsedKeys, queueoption, decodedQueues);
+        }
+
+
+        [Route("getTicketOverviewCountsForUser"), HttpGet]
+        public async Task<F4SDHelperService.TicketOverviewCountsResult> getTicketOverviewCountsForUser(
+            Guid userId,
+            string scope = "personal",
+            string keys = "",
+            int queueoption = 0,
+            string queues = ""
+        )
+        {
+            var parsedKeys = (keys ?? string.Empty)
+                .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(key => key.Trim())
+                .Where(key => !string.IsNullOrWhiteSpace(key))
+                .ToList();
+
+            var decodedQueues = ParseQueues(queues);
+            return await _f4stHelperService.getTicketOverviewCounts(userId, scope, parsedKeys, queueoption, decodedQueues);
+        }
+
+        [Obsolete]
+        [Route("getTicketOverviewCountsByRoles"), HttpPost]
+        public async Task<F4SDHelperService.TicketOverviewCountsByRoleResult> getTicketOverviewCountsByRoles([FromBody] TicketOverviewCountsByRolesRequest request)
+        {
+            var parsedKeys = (request?.Keys ?? new List<string>())
+                .Where(key => !string.IsNullOrWhiteSpace(key))
+                .Select(key => key.Trim())
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            var roleGuids = (request?.RoleGuids ?? new List<Guid>())
+                .Where(roleId => roleId != Guid.Empty)
+                .Distinct()
+                .ToList();
+
+            var decodedQueues = ParseQueues(request?.Queues ?? string.Empty);
+            return await _f4stHelperService.getTicketOverviewCountsByRoles(
+                request?.Sid,
+                roleGuids,
+                parsedKeys,
+                request?.QueueOption ?? 0,
+                decodedQueues
+            );
+        }
+
+        [Route("getTicketOverviewCountsByRolesForUser"), HttpPost]
+        public async Task<F4SDHelperService.TicketOverviewCountsByRoleResult> getTicketOverviewCountsByRolesForUser([FromBody] TicketOverviewCountsByRolesForUserRequest request)
+        {
+            var parsedKeys = (request?.Keys ?? new List<string>())
+                .Where(key => !string.IsNullOrWhiteSpace(key))
+                .Select(key => key.Trim())
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            var roleGuids = (request?.RoleGuids ?? new List<Guid>())
+                .Where(roleId => roleId != Guid.Empty)
+                .Distinct()
+                .ToList();
+
+            var decodedQueues = ParseQueues(request?.Queues ?? string.Empty);
+            return await _f4stHelperService.getTicketOverviewCountsByRoles(
+                request.userId,
+                roleGuids,
+                parsedKeys,
+                request?.QueueOption ?? 0,
+                decodedQueues
+            );
+        }
+
+        [Obsolete]
+        [Route("getTicketOverviewRelations"), HttpGet]
+        public async Task<List<F4SDHelperService.TicketOverviewRelationDto>> getTicketOverviewRelations(
+            string sid,
+            string scope = "personal",
+            string key = "",
+            int count = 0,
+            int queueoption = 0,
+            string queues = ""
+        )
+        {
+            var decodedQueues = ParseQueues(queues);
+            return await _f4stHelperService.getTicketOverviewRelations(sid, scope, key, count, queueoption, decodedQueues);
+        }
+
+        [Route("getTicketOverviewRelationsForUser"), HttpGet]
+        public async Task<List<F4SDHelperService.TicketOverviewRelationDto>> getTicketOverviewRelations(
+            Guid userId,
+            string scope = "personal",
+            string key = "",
+            int count = 0,
+            int queueoption = 0,
+            string queues = ""
+        )
+        {
+            var decodedQueues = ParseQueues(queues);
+            return await _f4stHelperService.getTicketOverviewRelations(userId, scope, key, count, queueoption, decodedQueues);
+        }
+
+
+        /*
+        [Route("updateActivitySolution/{objectId}"), HttpPost]
+        public async Task<HttpResponseMessage> updateActivitySolution(Guid objectId, [FromBody] string SolutionHtml)
+        {
+            return new HttpResponseMessage
             {
                 StatusCode = await _f4stHelperService.updateActivitySolution(objectId, SolutionHtml) ? HttpStatusCode.NoContent : HttpStatusCode.BadRequest,
             };
@@ -234,8 +321,8 @@ namespace C4IT.F4SD
             var filter = AsqlHelper.BuildInCondition("ID", new Guid[] { User.Id });
             return Request.CreateResponse(HttpStatusCode.OK, await _f4stHelperService.UserPermissionsInfo(filter));
         }
-        [HttpGet]
-        [Route("getRoleMemberships", Order = 1)]
+
+        [Route("getRoleMemberships", Order = 1), HttpGet]
         public async Task<HttpResponseMessage> getRoleMemberships([FromUri] GetRoleMembershipsRequest req)
         {
             var filter = "";
@@ -263,43 +350,82 @@ namespace C4IT.F4SD
             }
         }
 
-        public class GetRoleMembershipsRequest
-        {
-            public Guid? Id { get; set; }
-            public string Sid { get; set; }
-            public string Upn { get; set; }
-            public GetRoleMembershipsRequest() { }
-        }
-
-        public class TicketOverviewCountsByRolesRequest
-        {
-            public string Sid { get; set; }
-            public List<Guid> RoleGuids { get; set; } = new List<Guid>();
-            public List<string> Keys { get; set; } = new List<string>();
-            public int? QueueOption { get; set; }
-            public string Queues { get; set; }
-        }
-
-        private static List<cApiM42TicketQueueInfo> ParseQueues(string queues)
-        {
-            return (queues ?? string.Empty)
-                .Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(part =>
-                {
-                    var segments = part.Split(':');
-                    if (segments.Length != 2)
-                        return null;
-
-                    var name = HttpUtility.UrlDecode(segments[0]);
-                    var idStr = HttpUtility.UrlDecode(segments[1]);
-
-                    return Guid.TryParse(idStr, out var guid)
-                        ? new cApiM42TicketQueueInfo { QueueName = name, QueueID = guid }
-                        : null;
-                })
-                .Where(q => q != null)
-                .ToList();
-        }
+        [Route("getRoleMemberships/{userId}", Order = 1), HttpGet]
+        public async Task<HttpResponseMessage> getRoleMembershipForUser(Guid userId)
+        {
+            var filter = AsqlHelper.BuildInCondition("ID", new Guid[] { userId });
+            return Request.CreateResponse(HttpStatusCode.OK, await _f4stHelperService.UserPermissionsInfo(filter));
+        }
+
+        [Obsolete]
+        public class GetRoleMembershipsRequest
+        {
+            public Guid? Id { get; set; }
+            public string Sid { get; set; }
+            public string Upn { get; set; }
+            public GetRoleMembershipsRequest() { }
+        }
+
+        [Obsolete]
+        public class TicketOverviewCountsByRolesRequest
+        {
+            public string Sid { get; set; }
+            public List<Guid> RoleGuids { get; set; } = new List<Guid>();
+            public List<string> Keys { get; set; } = new List<string>();
+            public int? QueueOption { get; set; }
+            public string Queues { get; set; }
+        }
+
+        public class TicketOverviewCountsByRolesForUserRequest
+        {
+            public Guid userId { get; set; }
+            public List<Guid> RoleGuids { get; set; } = new List<Guid>();
+            public List<string> Keys { get; set; } = new List<string>();
+            public int? QueueOption { get; set; }
+            public string Queues { get; set; }
+        }
+
+        private static List<cApiM42TicketQueueInfo> ParseQueues(string queues)
+        {
+            return (queues ?? string.Empty)
+                .Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(part =>
+                {
+                    var decodedPart = HttpUtility.UrlDecode(part)?.Trim();
+                    if (string.IsNullOrWhiteSpace(decodedPart))
+                        return null;
+
+                    var name = decodedPart;
+                    string idStr = null;
+
+                    var separatorIndex = decodedPart.IndexOf(':');
+                    if (separatorIndex >= 0)
+                    {
+                        name = decodedPart.Substring(0, separatorIndex).Trim();
+                        idStr = decodedPart.Substring(separatorIndex + 1).Trim();
+                    }
+
+                    var queue = new cApiM42TicketQueueInfo();
+                    if (!string.IsNullOrWhiteSpace(name))
+                        queue.QueueName = name;
+
+                    if (!string.IsNullOrWhiteSpace(idStr))
+                    {
+                        if (!Guid.TryParse(idStr, out var guid))
+                            return null;
+
+                        queue.QueueID = guid;
+                        queue.QueueName = null;
+                    }
+
+                    if (queue.QueueID == Guid.Empty && string.IsNullOrWhiteSpace(queue.QueueName))
+                        return null;
+
+                    return queue;
+                })
+                .Where(q => q != null)
+                .ToList();
+        }
 
         [Route("isAlive"), HttpGet]
         public HttpResponseMessage isAlive()
@@ -343,6 +469,7 @@ namespace C4IT.F4SD
             }
         }
     }
+
     [RoutePrefix("api/C4ITF4SDWebApi/Logs")]
     public partial class F4SDM42LogsWebApiController : ApiController
     {
@@ -372,8 +499,6 @@ namespace C4IT.F4SD
             catch { };
         }
 
-
-
         public F4SDM42LogsWebApiController()
         {
             _f4stHelperService = new F4SDHelperService();