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

fix: restore 26eac54 behavior for 26.1 port

Browse Source
This commit is contained in:
Meik
2026-06-30 14:17:55 +02:00
parent 12ebd1fce9
commit 942473501e
2 changed files with 79 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
F4SDM42WebApi/F4SDM42WebApiController.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -23,6 +23,7 @@ using C4IT.F4SDM;
using C4IT.FASD.Base;
using C4IT.Logging;
using static C4IT.FASD.Base.cF4SDTicket;
using static C4IT.Logging.cLogManager;
namespace C4IT.F4SD
@@ -31,7 +32,6 @@ 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;
@@ -48,6 +48,10 @@ namespace C4IT.F4SD
{
_resolver = resolver ?? throw new ArgumentNullException(nameof(resolver));
defaultInstance = this;
//_objectService = objectService;
//_fragmentService = fragmentService;
//_incidentService = Guard.NullArgument(incidentService, "incidentService");
_globalConfigurationProvider = GlobalConfigurationProvider.Instance;
_f4stHelperService = new F4SDHelperService();
EnsureInitialized();
@@ -58,6 +62,7 @@ namespace C4IT.F4SD
{
try
{
//System.Diagnostics.Debugger.Launch();
lock (initLock)
{
if (IsInitialized || F4SDM42LogsWebApiController.IsInitialized)
@@ -99,14 +104,12 @@ 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,
@@ -126,28 +129,9 @@ namespace C4IT.F4SD
);
}
[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<F4SDHelperService.cF4SDTicket> getTicketDetails(Guid objectId)
public async Task<cF4SDTicket> getTicketDetails(Guid objectId)
{
var tickets = await _f4stHelperService.getTicketDetails(new List<Guid>() { objectId });
if (tickets.Count > 0)
@@ -157,12 +141,11 @@ namespace C4IT.F4SD
}
[Route("getTicketHistory"), HttpGet]
public async Task<List<F4SDHelperService.cF4SDTicket.cTicketJournalItem>> getTicketHistory(Guid objectId)
public async Task<List<cTicketJournalItem>> getTicketHistory(Guid objectId)
{
return await _f4stHelperService.GetJournalEntries(objectId);
}
[Obsolete]
[Route("getTicketOverviewCounts"), HttpGet]
public async Task<F4SDHelperService.TicketOverviewCountsResult> getTicketOverviewCounts(
string sid,
@@ -182,27 +165,6 @@ namespace C4IT.F4SD
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)
{
@@ -227,31 +189,6 @@ namespace C4IT.F4SD
);
}
[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,
@@ -265,22 +202,6 @@ namespace C4IT.F4SD
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)
@@ -293,14 +214,10 @@ namespace C4IT.F4SD
*/
[Route("getPickup/{name}"), HttpGet]
//[CacheOutput(UseETAG = true)]
public async Task<EntityEnumeration> getPickup(string name, [FromUri] EntityEnumerationVisibilityMode mode = EntityEnumerationVisibilityMode.None, [FromUri] Int32 group = -1)
public async Task<HttpResponseMessage> getPickup(string name, [FromUri] EntityEnumerationVisibilityMode mode = EntityEnumerationVisibilityMode.None, [FromUri] Int32 group = -1)
{
await Task.Delay(0);
var pickupName = ResolvePickupName(name);
if (string.IsNullOrWhiteSpace(pickupName))
throw new ArgumentException("Pickup name is required.", nameof(name));
EntityEnumeration enumerationTemp = GetEnumeration(pickupName, mode);
EntityEnumeration enumerationTemp = GetEnumeration(name, mode);
var vals = enumerationTemp.Values;
if (group > -1)
@@ -320,22 +237,22 @@ namespace C4IT.F4SD
Values = vals.ToArray()
};
//CacheOutputAttribute.RegisterResponseEtag($"enum_{enumeration.Name}_{(int)mode}", $"{enumeration.Name}_{(int)mode}", cultureInvariant: false, userInvariant: true, val);
return enumeration;
return Request.CreateResponse(HttpStatusCode.OK, enumeration);
}
[Route("getMyRoleMemberships"), HttpGet]
public async Task<object> getMyRoleMemberships()
public async Task<HttpResponseMessage> getMyRoleMemberships()
{
var userId = GetCurrentUserId();
if (userId == Guid.Empty)
throw new UnauthorizedAccessException("Cannot determine the interactive Matrix42 user.");
var filter = AsqlHelper.BuildInCondition("ID", new Guid[] { userId });
return await _f4stHelperService.UserPermissionsInfo(filter);
return Request.CreateResponse(HttpStatusCode.OK, await _f4stHelperService.UserPermissionsInfo(filter));
}
[Route("getRoleMemberships"), HttpGet]
public async Task<object> getRoleMemberships([FromUri] GetRoleMembershipsRequest req)
[HttpGet]
[Route("getRoleMemberships")]
public async Task<HttpResponseMessage> getRoleMemberships([FromUri] GetRoleMembershipsRequest req)
{
var filter = "";
@@ -354,7 +271,7 @@ namespace C4IT.F4SD
if (!string.IsNullOrEmpty(filter))
{
return await _f4stHelperService.UserPermissionsInfo(filter);
return Request.CreateResponse(HttpStatusCode.OK, await _f4stHelperService.UserPermissionsInfo(filter));
}
else
{
@@ -362,14 +279,6 @@ namespace C4IT.F4SD
}
}
[Route("getRoleMemberships/{userId}"), HttpGet]
public async Task<object> getRoleMembershipForUser(Guid userId)
{
var filter = AsqlHelper.BuildInCondition("ID", new Guid[] { userId });
return await _f4stHelperService.UserPermissionsInfo(filter);
}
[Obsolete]
public class GetRoleMembershipsRequest
{
public Guid? Id { get; set; }
@@ -378,7 +287,6 @@ namespace C4IT.F4SD
public GetRoleMembershipsRequest() { }
}
[Obsolete]
public class TicketOverviewCountsByRolesRequest
{
public string Sid { get; set; }
@@ -388,15 +296,6 @@ namespace C4IT.F4SD
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 EntityEnumeration GetEnumeration(string name, EntityEnumerationVisibilityMode mode)
{
name = name?.Trim();
@@ -432,20 +331,6 @@ namespace C4IT.F4SD
};
}
private string ResolvePickupName(string routeName)
{
if (!string.IsNullOrWhiteSpace(routeName))
return routeName.Trim();
var pathSegment = Request?.RequestUri?.Segments?
.LastOrDefault(segment => !string.IsNullOrWhiteSpace(segment) && segment != "/");
if (string.IsNullOrWhiteSpace(pathSegment))
return null;
return Uri.UnescapeDataString(pathSegment.Trim('/'));
}
private static bool? GetVisibilityFilter(EntityEnumerationVisibilityMode mode)
{
switch (mode)
@@ -506,46 +391,25 @@ namespace C4IT.F4SD
.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
.Select(part =>
{
var decodedPart = WebUtility.UrlDecode(part)?.Trim();
if (string.IsNullOrWhiteSpace(decodedPart))
var segments = part.Split(':');
if (segments.Length != 2)
return null;
var name = decodedPart;
string idStr = null;
var name = WebUtility.UrlDecode(segments[0]);
var idStr = WebUtility.UrlDecode(segments[1]);
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;
return Guid.TryParse(idStr, out var guid)
? new cApiM42TicketQueueInfo { QueueName = name, QueueID = guid }
: null;
})
.Where(q => q != null)
.ToList();
}
[Route("isAlive"), HttpGet]
public IHttpActionResult isAlive()
public HttpResponseMessage isAlive()
{
return new StatusCodeResult(HttpStatusCode.NoContent);
return new HttpResponseMessage(HttpStatusCode.NoContent);
}
[Route("loglevel"), HttpGet]
@@ -584,7 +448,6 @@ namespace C4IT.F4SD
}
}
}
[RoutePrefix("api/C4ITF4SDWebApi/Logs")]
public partial class F4SDM42LogsWebApiController : ApiController
{
@@ -613,6 +476,8 @@ namespace C4IT.F4SD
catch { };
}
public F4SDM42LogsWebApiController()
{
_f4stHelperService = new F4SDHelperService();
@@ -660,12 +525,6 @@ namespace C4IT.F4SD
(entry.Theme?.IndexOf(filter, StringComparison.OrdinalIgnoreCase) ?? -1) >= 0);
}
if (queryOptions?.Skip != null)
result = result.Skip(queryOptions.Skip.Value);
if (queryOptions?.Top != null)
result = result.Take(queryOptions.Top.Value);
return result;
}
}