Compare commits

...

3 Commits

Author SHA1 Message Date
520335c26a Попытка фикса проблем с авторизацией
All checks were successful
Create and publish a Docker image / Publish image (push) Successful in 4m32s
2025-09-12 17:17:41 +03:00
f771dafcde Добавил получение расписания по roomId
All checks were successful
Create and publish a Docker image / Publish image (push) Successful in 2m56s
2025-09-09 17:22:25 +03:00
7e1df403e2 Удалил тестовый запрос 2025-09-09 17:22:06 +03:00
3 changed files with 8 additions and 22 deletions

View File

@@ -12,25 +12,6 @@ namespace SfeduSchedule.Controllers
public class ScheduleController(ModeusService modeusService, ILogger<ScheduleController> logger) : ControllerBase public class ScheduleController(ModeusService modeusService, ILogger<ScheduleController> logger) : ControllerBase
{ {
/// <summary>
/// Получить расписание для указанных пользователей.
/// </summary>
/// <param name="attendeePersonId">Список GUID пользователей, для которых запрашивается расписание.</param>
/// <returns>Список событий расписания.</returns>
/// <response code="200">Возвращает расписание</response>
/// <response code="429">Слишком много запросов</response>
[HttpGet]
[Route("test")]
public async Task<IActionResult> Get([FromQuery] List<Guid> attendeePersonId, [FromQuery] DateTime? startDate, [FromQuery] DateTime? endDate)
{
startDate ??= DateTime.UtcNow;
endDate ??= DateTime.UtcNow.AddDays(20);
var msr = new ModeusScheduleRequest(500, (DateTime)startDate, (DateTime)endDate, attendeePersonId);
var schedule = await modeusService.GetScheduleAsync(msr);
return Ok(schedule);
}
/// <summary> /// <summary>
/// Получить расписание по пользовательскому запросу. /// Получить расписание по пользовательскому запросу.
/// </summary> /// </summary>

View File

@@ -2,12 +2,14 @@ using System.ComponentModel;
namespace SfeduSchedule namespace SfeduSchedule
{ {
public class ModeusScheduleRequest(int size, DateTime timeMin, DateTime timeMax, List<Guid> attendeePersonId) public class ModeusScheduleRequest(int size, DateTime timeMin, DateTime timeMax, List<Guid>? attendeePersonId, List<Guid>? roomId)
{ {
[DefaultValue(10)]
public int Size { get; set; } = size; public int Size { get; set; } = size;
public DateTime TimeMin { get; set; } = timeMin; public DateTime TimeMin { get; set; } = timeMin;
public DateTime TimeMax { get; set; } = timeMax; public DateTime TimeMax { get; set; } = timeMax;
public List<Guid> AttendeePersonId { get; set; } = attendeePersonId; public List<Guid>? AttendeePersonId { get; set; } = attendeePersonId;
public List<Guid>? RoomId { get; set; } = roomId;
} }
public class RoomSearchRequest public class RoomSearchRequest

View File

@@ -150,7 +150,10 @@ var app = builder.Build();
var logger = app.Services.GetRequiredService<ILogger<Program>>(); var logger = app.Services.GetRequiredService<ILogger<Program>>();
app.UseForwardedHeaders(); app.UseForwardedHeaders(new ForwardedHeadersOptions
{
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost
});
if (string.IsNullOrEmpty(preinstalledJwtToken)) if (string.IsNullOrEmpty(preinstalledJwtToken))
{ {