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

fix: rev db model, added missing entities and helper functions

Browse Source
This commit is contained in:
eee4
2025-05-18 03:51:50 +02:00
parent ad4743d68e
commit fc1ff88f3d
21 changed files with 1283 additions and 2146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
WebApp/Endpoints/EventsEndpoints.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using WebApp.Data;
using WebApp.DTOs;
using WebApp.Entities;
@@ -8,7 +9,7 @@ namespace WebApp.Endpoints
{
public static class EventsEndpoints
{
const string GetEventEndpointName = "GetEvent";
const string GetEventEndpointName = "GetEvent";
public static RouteGroupBuilder MapEventsEndpoints(this WebApplication app)
{
@@ -16,7 +17,8 @@ namespace WebApp.Endpoints
.WithParameterValidation();
// GET /events
group.MapGet("/", async (ApplicationDbContext dbContext) =>
group.MapGet("/",
async (ApplicationDbContext dbContext, HttpContext httpContext) =>
await dbContext.Events
.Include(Eve => Eve.Organisation)
.OrderByDescending(Eve => Eve.EventId)
@@ -25,7 +27,8 @@ namespace WebApp.Endpoints
.ToListAsync());
// GET /events/1
group.MapGet("/{id}", async (int id, ApplicationDbContext dbContext) =>
group.MapGet("/{id}",
async (int id, ApplicationDbContext dbContext, HttpContext httpContext) =>
{
Event? Eve = await dbContext.Events.FindAsync(id);
@@ -44,11 +47,14 @@ namespace WebApp.Endpoints
.WithName(GetEventEndpointName);
// POST /events
group.MapPost("/", async (EventCreateDto newEvent, ApplicationDbContext dbContext) =>
group.MapPost("/",
async (EventCreateDto newEvent, ApplicationDbContext dbContext, HttpContext httpContext, GeneralUseHelpers guhf) =>
{
// Uzyskaj organizację z tokenu
// ...
Token? token = await guhf.GetTokenFromHTTPContext(httpContext);
Organisation? org = await guhf.GetOrganisationFromToken(token);
if (org is null) return Results.StatusCode(403);
Event Eve = newEvent.ToEntity();
@@ -66,18 +72,21 @@ namespace WebApp.Endpoints
});
// PUT /events/1
group.MapPut("/{id}", async (int id, EventUpdateDto updatedEvent, ApplicationDbContext dbContext) =>
group.MapPut("/{id}",
async (int id, EventUpdateDto updatedEvent, ApplicationDbContext dbContext, GeneralUseHelpers guhf, HttpContext httpContext) =>
{
var existingEvent = await dbContext.Events.FindAsync(id);
// Uzyskaj organizację z tokenu
Token? token = await guhf.GetTokenFromHTTPContext(httpContext);
Organisation? org = await guhf.GetOrganisationFromToken(token);
if (org is null) return Results.StatusCode(403);
var existingEvent = await dbContext.Events.FindAsync(id);
if (existingEvent is null)
{
return Results.NotFound();
}
// Uzyskaj organizację z tokenu
// ...
// Sprawdź, czy organizacja ma prawo
// do zmodyfikowania tego (EventId = id) eventu.
// ...
@@ -101,11 +110,14 @@ namespace WebApp.Endpoints
});
// DELETE /events/1
group.MapDelete("/{id}", async (int id, ApplicationDbContext dbContext) =>
group.MapDelete("/{id}",
async (int id, ApplicationDbContext dbContext, GeneralUseHelpers guhf, HttpContext httpContext) =>
{
// Uzyskaj organizację z tokenu
// ...
Token? token = await guhf.GetTokenFromHTTPContext(httpContext);
Organisation? org = await guhf.GetOrganisationFromToken(token);
if (org is null) return Results.StatusCode(403);
// Sprawdź, czy organizacja ma prawo
// do usunięcia tego (EventId = id) eventu.

69
WebApp/Endpoints/GeneralUseHelperFunctions.cs Normal file
View File

@@ -0,0 +1,69 @@
using Microsoft.EntityFrameworkCore;
using WebApp.Data;
using WebApp.Entities;
namespace WebApp.Endpoints;
public class GeneralUseHelpers
{
private readonly ApplicationDbContext _context;
public GeneralUseHelpers(ApplicationDbContext context)
{
_context = context;
}
async public Task<Token?> FindTokenFromString(string token_str)
{
// foreach (Token t in _context.Tokens) if (t.Value == token) return t;
// return null;
return await _context.Tokens.FirstOrDefaultAsync(t => t.Value == token_str);
}
async public Task<User?> GetUserFromToken(Token? t)
{
// Zwróci null, gdy nie znaleziono użytkownika
if (t is null) return null;
User? user = await _context.WebUsers.FindAsync(t.Value);
return user;
}
async public Task<Organisation?> GetOrganisationFromToken(Token? t)
{
User? user = await GetUserFromToken(t);
if (user is not null && user.IsOrganisation)
{
Organisation? org = await _context.Organisations.FindAsync(t.UserId);
if (org is null)
{
Console.WriteLine("!!!");
}
return org;
}
else return null;
}
public string? GetTokenStrFromHTTPContext(HttpContext httpContext)
{
var cookies = httpContext.Request.Cookies;
string? token = cookies["token"];
return token;
}
async public Task<Token?> GetTokenFromHTTPContext(HttpContext httpContext)
{
var cookies = httpContext.Request.Cookies;
string? token_str = cookies["token"];
if (token_str is not null)
{
Token? token = await FindTokenFromString(token_str);
if (token is not null) return token;
}
return null;
}
}