Fixed endpoints for /users and /messages.
This commit is contained in:
@ -37,10 +37,14 @@ namespace MessengerBroker.Handlers.Endpoint
|
||||
.Where(x => !foreignUserIds.Any(f => f == x.Id))
|
||||
.ToArray();
|
||||
|
||||
var localUserIds = localUsers
|
||||
.Select(x => x.Id)
|
||||
.ToArray();
|
||||
|
||||
var localRoutes = apiCtx.UserRoutes
|
||||
.Include(x => x.From)
|
||||
.Include(x => x.To)
|
||||
.Where(x => localUsers.Any(l => l.Id == x.From.Id) && localUsers.Any(l => l.Id == x.To.Id))
|
||||
.Where(x => localUserIds.Contains(x.From.Id) || localUserIds.Contains(x.To.Id))
|
||||
.ToArray();
|
||||
|
||||
return Task.FromResult(new Users.UsersResponse
|
||||
|
||||
@ -7,6 +7,7 @@ using MessengerBroker.Model.Http;
|
||||
using MessengerBroker.Models.Scoped;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.HttpOverrides;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Net;
|
||||
|
||||
@ -123,9 +124,13 @@ namespace MessengerBroker
|
||||
|
||||
app.MapGet("/messages", async (
|
||||
MessagesEndpointHandler handler,
|
||||
[AsParameters] Messages.MessagesRequest request) =>
|
||||
[FromQuery] Guid ownerBrokerId, DateTime fromUtc) =>
|
||||
{
|
||||
var response = await handler.GetMessages(request);
|
||||
var response = await handler.GetMessages(new Messages.MessagesRequest
|
||||
{
|
||||
OwnerBrokerId = ownerBrokerId,
|
||||
SinceUtc = DateTime.MinValue
|
||||
});
|
||||
return Results.Json(response);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user