sherl/hermes
1
0
Fork 0
mirror of https://github.com/GCMatters/hermes.git synced 2026-02-04 13:40:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: replace manual event search in favor of dto builders

Browse Source
This commit is contained in:
eee4
2025-06-01 23:55:43 +02:00
parent 07128948b0
commit 42fd94e5ac
6 changed files with 118 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
WebApp/Endpoints/GeneralUseHelperFunctions.cs
View File

@@ -36,12 +36,7 @@ public class GeneralUseHelpers
User? user = await GetUserFromToken(t);
if (user is not null && user.IsOrganisation)
{
Organisation? org = await _context.Organisations.FirstOrDefaultAsync(o => o.UserId == t.UserId);
if (org is null)
{
Console.WriteLine("!!!");
}
Organisation? org = await _context.Organisations.FirstOrDefaultAsync(o => o.UserId == t!.UserId);
return org;
}
@@ -114,36 +109,26 @@ public class GeneralUseHelpers
return words.Any(word => word.Contains(searchTerm, StringComparison.OrdinalIgnoreCase));
}
public async Task<List<EventDetailsDto>> BuildDetailedEventsDto(ApplicationDbContext context, bool includeEventRegistrations = false)
public async Task<List<EventDetailsDto>> BuildDetailedEventsDto(
ApplicationDbContext context,
Organisation? org,
bool sortAscending = false)
{
// https://khalidabuhakmeh.com/ef-core-and-aspnet-core-cycle-issue-and-solution
// Jeśli token należy do organizacji, która utworzyła to wydarzenie,
// to zwróć także EventRegistrations. W przeciwnym razie niech będzie to
// puste pole.
ICollection<EventRegistrationDto> ERs = new List<EventRegistrationDto>();
if (includeEventRegistrations)
{
ERs = await context
.EventRegistrations
.Select(er => new EventRegistrationDto
{
EventId = er.EventId,
UserId = er.UserId,
UserName = er.User.FirstName + " " + er.User.LastName,
RegisteredAt = er.RegisteredAt
}).ToListAsync();
}
List<EventDetailsDto> result = await context
IQueryable<EventDetailsDto> result_iq = context
.Events
.Select(e => new EventDetailsDto
{
EventId = e.EventId,
OrganisationId = e.OrganisationId,
OrganisationName = e.Organisation.Name,
OrganisationName = e.Organisation!.Name,
Title = e.Title,
Description = e.Description,
Description = e.Description ?? "",
Location = e.Location,
EventDate = e.EventDate,
EventSkills = e
@@ -151,11 +136,69 @@ public class GeneralUseHelpers
.Select(es => new SkillSummaryDto
{
SkillId = es.SkillId,
SkillName = es.Skill.Name
SkillName = es.Skill!.Name
}).ToList(),
EventRegistrations = ERs
}).ToListAsync();
EventRegistrations = e.Organisation == org ?
e.EventRegistrations
.Select(er => new EventRegistrationDto
{
EventId = er.EventId,
UserId = er.UserId,
UserName = er.User!.FirstName + " " + er.User.LastName,
RegisteredAt = er.RegisteredAt
}).ToList() : null!
});
return result;
if (sortAscending) result_iq = result_iq.OrderBy(e => e.EventId);
else result_iq = result_iq.OrderByDescending(e => e.EventId);
return await result_iq.ToListAsync();
}
public async Task<List<EventSummaryDto>> BuildSummaryEventsDto(
ApplicationDbContext context,
Organisation? org,
bool sortAscending = false)
{
// https://khalidabuhakmeh.com/ef-core-and-aspnet-core-cycle-issue-and-solution
// Jeśli token należy do organizacji, która utworzyła to wydarzenie,
// to zwróć także EventRegistrations. W przeciwnym razie niech będzie to
// puste pole.
IQueryable<EventSummaryDto> result_iq = context
.Events
.Select(e => new EventSummaryDto
{
EventId = e.EventId,
OrganisationId = e.OrganisationId,
Organisation = e.Organisation!.Name,
Title = e.Title,
Description = e.Description ?? "",
Location = e.Location,
EventDate = e.EventDate,
EventSkills = e
.EventSkills
.Select(es => new SkillSummaryDto
{
SkillId = es.SkillId,
SkillName = es.Skill!.Name
}).ToList(),
EventRegistrations = e.Organisation == org ?
e.EventRegistrations
.Select(er => new EventRegistrationDto
{
EventId = er.EventId,
UserId = er.UserId,
UserName = er.User!.FirstName + " " + er.User.LastName,
RegisteredAt = er.RegisteredAt
}).ToList() : null!
});
if (sortAscending) result_iq = result_iq.OrderBy(e => e.EventId);
else result_iq = result_iq.OrderByDescending(e => e.EventId);
return await result_iq.ToListAsync();
}
}