serega404/SfeduSchedule
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Рефакторинг

Browse Source
This commit is contained in:
Sergey Karmanov
2025-10-14 23:17:55 +03:00
parent 88dbbbee5d
commit 496def0166
10 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
SfeduSchedule.Abstractions/AttendeesDTO.cs → SfeduSchedule.Abstractions/DTO/AttendeesDTO.cs
View File

0
SfeduSchedule.Abstractions/ModeusScheduleRequestDTO.cs → SfeduSchedule.Abstractions/DTO/ModeusScheduleRequestDTO.cs
View File

0
SfeduSchedule.Abstractions/ScheduleDTO.CS → SfeduSchedule.Abstractions/DTO/ScheduleDTO.CS
View File

4
SfeduSchedule/Playwright/MicrosoftLoginHelper.cs → SfeduSchedule/BrowserScripts/MicrosoftLoginHelper.cs
View File

@@ -1,5 +1,7 @@
using Microsoft.Playwright;
using System.Text.RegularExpressions;
using Microsoft.Playwright;
namespace SfeduSchedule.BrowserScripts;
public static class MicrosoftLoginHelper
{

4
SfeduSchedule/Controllers/ScheduleController.cs
View File

@@ -32,7 +32,7 @@ public class ScheduleController(ModeusService modeusService, ILogger<ScheduleCon
{
logger.LogError("Ошибка при получении расписания\n\n" + e.Message + "\n\n" + e.StackTrace +
"\n\n JSON: " +
JsonSerializer.Serialize(request, GlobalVariables.jsonSerializerOptions));
JsonSerializer.Serialize(request, GlobalVariables.JsonSerializerOptions));
return StatusCode((int)(e.StatusCode ?? HttpStatusCode.InternalServerError),
"Proxied Modeus: " + e.Message);
}
@@ -59,7 +59,7 @@ public class ScheduleController(ModeusService modeusService, ILogger<ScheduleCon
catch (HttpRequestException e)
{
logger.LogError("Ошибка при поиске аудиторий\n\n" + e.Message + "\n\n" + e.StackTrace + "\n\n JSON: " +
JsonSerializer.Serialize(request, GlobalVariables.jsonSerializerOptions));
JsonSerializer.Serialize(request, GlobalVariables.JsonSerializerOptions));
return StatusCode((int)(e.StatusCode ?? HttpStatusCode.InternalServerError),
"Proxied Modeus: " + e.Message);
}

10
SfeduSchedule/Controllers/SfeduController.cs
View File

@@ -5,14 +5,10 @@ using SfeduSchedule.Services;
namespace SfeduSchedule.Controllers
{
[ApiController]
[Route("api/[controller]")]
[Route("api/sfedu")]
[Authorize(AuthenticationSchemes = "OpenIdConnect")]
public class SfeduController : ControllerBase
public class SfeduController(ModeusService modeusService) : ControllerBase
{
private readonly ModeusService _modeusService;
public SfeduController(ModeusService modeusService) =>
_modeusService = modeusService;
/// <summary>
/// Получить GUID пользователя через авторизацию Microsoft.
/// </summary>
@@ -30,7 +26,7 @@ namespace SfeduSchedule.Controllers
if (string.IsNullOrEmpty(name))
return StatusCode(StatusCodes.Status500InternalServerError);
var guid = await _modeusService.GetGuidAsync(name);
var guid = await modeusService.GetGuidAsync(name);
if (string.IsNullOrEmpty(guid))
return NotFound();

2
SfeduSchedule/GlobalVariables.cs
View File

@@ -5,6 +5,6 @@ namespace SfeduSchedule
public static class GlobalVariables
{
public static string JwtFilePath { get; set; } = "data/jwt.txt";
public static readonly JsonSerializerOptions jsonSerializerOptions = new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
public static readonly JsonSerializerOptions JsonSerializerOptions = new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
}
}

1
SfeduSchedule/Jobs/UpdateJWTJob.cs
View File

@@ -1,5 +1,6 @@
using Microsoft.Playwright;
using Quartz;
using SfeduSchedule.BrowserScripts;
namespace SfeduSchedule.Jobs;

11
SfeduSchedule/Program.cs
View File

@@ -20,9 +20,7 @@ string updateJwtCron = configuration["UPDATE_JWT_CRON"] ?? "0 0 4 ? * *";
// Если не указана TZ, ставим Europe/Moscow
if (string.IsNullOrEmpty(configuration["TZ"]))
{
configuration["TZ"] = "Europe/Moscow";
}
int permitLimit = int.TryParse(configuration["PERMIT_LIMIT"], out var parsedPermitLimit) ? parsedPermitLimit : 40;
int timeLimit = int.TryParse(configuration["TIME_LIMIT"], out var parsedTimeLimit) ? parsedTimeLimit : 10;
@@ -67,9 +65,9 @@ builder.Services.AddAuthorization();
builder.Services.AddMicrosoftIdentityWebAppAuthentication(builder.Configuration);
// Загружаем плагины (изолированно), даём им зарегистрировать DI и подключаем контроллеры
var loaded = PluginLoader.LoadPlugins(pluginsPath);
Console.WriteLine("Plugins count: " + loaded.Count);
foreach (var p in loaded)
var loadedPlugins = PluginLoader.LoadPlugins(pluginsPath);
Console.WriteLine("Plugins count: " + loadedPlugins.Count);
foreach (var p in loadedPlugins)
{
Console.WriteLine("Loading plugin: " + p.Instance.Name);
@@ -225,9 +223,8 @@ app.MapGet("/", async context =>
app.MapControllers();
// Маршруты Minimal API из плагинов
foreach (var p in loaded)
foreach (var p in loadedPlugins)
{
logger.LogInformation("Mapping endpoints for plugin: {PluginName}", p.Instance.Name);
p.Instance.MapEndpoints(app);
}

18
SfeduSchedule/Services/ModeusService.cs
View File

@@ -27,7 +27,7 @@ namespace SfeduSchedule.Services
{
var request = new HttpRequestMessage(HttpMethod.Post,
$"schedule-calendar-v2/api/calendar/events/search?tz={_configuration["TZ"]!}");
request.Content = new StringContent(JsonSerializer.Serialize(msr, GlobalVariables.jsonSerializerOptions),
request.Content = new StringContent(JsonSerializer.Serialize(msr, GlobalVariables.JsonSerializerOptions),
System.Text.Encoding.UTF8, "application/json");
var response = await _httpClient.SendAsync(request);
_logger.LogInformation("GetScheduleAsync: Ответ получен: {StatusCode}", response.StatusCode);
@@ -59,7 +59,7 @@ namespace SfeduSchedule.Services
{
var request = new HttpRequestMessage(HttpMethod.Post, $"schedule-calendar-v2/api/campus/rooms/search");
request.Content =
new StringContent(JsonSerializer.Serialize(requestDto, GlobalVariables.jsonSerializerOptions),
new StringContent(JsonSerializer.Serialize(requestDto, GlobalVariables.JsonSerializerOptions),
System.Text.Encoding.UTF8, "application/json");
var response = await _httpClient.SendAsync(request);
_logger.LogInformation("SearchRoomsAsync: Ответ получен: {StatusCode}", response.StatusCode);
@@ -122,22 +122,22 @@ namespace SfeduSchedule.Services
case null:
_logger.LogError(
"GetScheduleJsonAsync: scheduleJson is null. Schedule: {Schedule}\n Request: {msr}",
schedule, JsonSerializer.Serialize(msr, GlobalVariables.jsonSerializerOptions));
schedule, JsonSerializer.Serialize(msr, GlobalVariables.JsonSerializerOptions));
break;
case { Embedded: null }:
_logger.LogError(
"GetScheduleJsonAsync: scheduleJson.Embedded is null. scheduleJson: {@scheduleJson}\n Request: {msr}",
scheduleJson, JsonSerializer.Serialize(msr, GlobalVariables.jsonSerializerOptions));
scheduleJson, JsonSerializer.Serialize(msr, GlobalVariables.JsonSerializerOptions));
break;
case { Embedded.Events: null }:
_logger.LogError(
"GetScheduleJsonAsync: scheduleJson.Embedded.Events is null. Embedded: {@Embedded}\n Request: {msr}",
scheduleJson.Embedded, JsonSerializer.Serialize(msr, GlobalVariables.jsonSerializerOptions));
scheduleJson.Embedded, JsonSerializer.Serialize(msr, GlobalVariables.JsonSerializerOptions));
break;
case { Embedded.Events.Length: 0 }:
_logger.LogWarning(
"GetScheduleJsonAsync: scheduleJson.Embedded.Events is empty. Embedded: {@Embedded}\n Request: {msr}",
scheduleJson.Embedded, JsonSerializer.Serialize(msr, GlobalVariables.jsonSerializerOptions));
scheduleJson.Embedded, JsonSerializer.Serialize(msr, GlobalVariables.JsonSerializerOptions));
break;
default:
return scheduleJson;
@@ -147,7 +147,7 @@ namespace SfeduSchedule.Services
{
_logger.LogError(ex,
"GetScheduleJsonAsync: Deserialization failed. Schedule: {Schedule}\n Request: {msr}", schedule,
JsonSerializer.Serialize(msr, GlobalVariables.jsonSerializerOptions));
JsonSerializer.Serialize(msr, GlobalVariables.JsonSerializerOptions));
}
return null;
@@ -158,7 +158,7 @@ namespace SfeduSchedule.Services
Schedule? scheduleJson = await GetScheduleJsonAsync(msr);
if (scheduleJson == null)
{
_logger.LogError("GetIcsAsync: scheduleJson is null after deserialization. Request: " + JsonSerializer.Serialize(msr, GlobalVariables.jsonSerializerOptions));
_logger.LogError("GetIcsAsync: scheduleJson is null after deserialization. Request: " + JsonSerializer.Serialize(msr, GlobalVariables.JsonSerializerOptions));
return null;
}
@@ -252,7 +252,7 @@ namespace SfeduSchedule.Services
shortNameCourse = courseUnitRealization.NameShort ?? "";
}
}
catch (Exception ex)
catch (Exception)
{
// Ignored
}