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-09-25 18:23:34 +03:00
parent 69039a7036
commit 03ee564dc3
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
SfeduSchedule/Services/ModeusService.cs
View File

@@ -25,8 +25,10 @@ namespace SfeduSchedule.Services
public async Task<string?> GetScheduleAsync(ModeusScheduleRequest msr) public async Task<string?> GetScheduleAsync(ModeusScheduleRequest msr)
{ {
var request = new HttpRequestMessage(HttpMethod.Post, $"schedule-calendar-v2/api/calendar/events/search?tz={_configuration["TZ"]!}"); var request = new HttpRequestMessage(HttpMethod.Post,
request.Content = new StringContent(JsonSerializer.Serialize(msr, GlobalVariables.jsonSerializerOptions), System.Text.Encoding.UTF8, "application/json"); $"schedule-calendar-v2/api/calendar/events/search?tz={_configuration["TZ"]!}");
request.Content = new StringContent(JsonSerializer.Serialize(msr, GlobalVariables.jsonSerializerOptions),
System.Text.Encoding.UTF8, "application/json");
var response = await _httpClient.SendAsync(request); var response = await _httpClient.SendAsync(request);
_logger.LogInformation("GetScheduleAsync: Ответ получен: {StatusCode}", response.StatusCode); _logger.LogInformation("GetScheduleAsync: Ответ получен: {StatusCode}", response.StatusCode);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
@@ -36,7 +38,9 @@ namespace SfeduSchedule.Services
public async Task<string?> SearchRoomsAsync(RoomSearchRequest requestDto) public async Task<string?> SearchRoomsAsync(RoomSearchRequest requestDto)
{ {
var request = new HttpRequestMessage(HttpMethod.Post, $"schedule-calendar-v2/api/campus/rooms/search"); var request = new HttpRequestMessage(HttpMethod.Post, $"schedule-calendar-v2/api/campus/rooms/search");
request.Content = new StringContent(JsonSerializer.Serialize(requestDto, GlobalVariables.jsonSerializerOptions), System.Text.Encoding.UTF8, "application/json"); request.Content =
new StringContent(JsonSerializer.Serialize(requestDto, GlobalVariables.jsonSerializerOptions),
System.Text.Encoding.UTF8, "application/json");
var response = await _httpClient.SendAsync(request); var response = await _httpClient.SendAsync(request);
_logger.LogInformation("SearchRoomsAsync: Ответ получен: {StatusCode}", response.StatusCode); _logger.LogInformation("SearchRoomsAsync: Ответ получен: {StatusCode}", response.StatusCode);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
@@ -71,13 +75,15 @@ namespace SfeduSchedule.Services
} }
catch catch
{ {
_logger.LogWarning("GetGuidAsync: Не удалось получить идентификатор пользователя, {FullName}, json: {Json}", fullName, json); _logger.LogWarning(
"GetGuidAsync: Не удалось получить идентификатор пользователя, {FullName}, json: {Json}", fullName,
json);
return null; return null;
} }
return personId; return personId;
} }
public async Task<string?> GetIcsAsync(ModeusScheduleRequest msr) public async Task<string?> GetIcsAsync(ModeusScheduleRequest msr)
{ {
var schedule = await GetScheduleAsync(msr); var schedule = await GetScheduleAsync(msr);
@@ -103,11 +109,14 @@ namespace SfeduSchedule.Services
if (scheduleJson == null) if (scheduleJson == null)
_logger.LogError("GetIcsAsync: scheduleJson is null. Schedule: {Schedule}", schedule); _logger.LogError("GetIcsAsync: scheduleJson is null. Schedule: {Schedule}", schedule);
else if (scheduleJson.Embedded == null) else if (scheduleJson.Embedded == null)
_logger.LogError("GetIcsAsync: scheduleJson.Embedded is null. scheduleJson: {@scheduleJson}", scheduleJson); _logger.LogError("GetIcsAsync: scheduleJson.Embedded is null. scheduleJson: {@scheduleJson}",
scheduleJson);
else if (scheduleJson.Embedded.Events == null) else if (scheduleJson.Embedded.Events == null)
_logger.LogError("GetIcsAsync: scheduleJson.Embedded.Events is null. Embedded: {@Embedded}", scheduleJson.Embedded); _logger.LogError("GetIcsAsync: scheduleJson.Embedded.Events is null. Embedded: {@Embedded}",
scheduleJson.Embedded);
else else
_logger.LogWarning("GetIcsAsync: scheduleJson.Embedded.Events is empty. Embedded: {@Embedded}", scheduleJson.Embedded); _logger.LogWarning("GetIcsAsync: scheduleJson.Embedded.Events is empty. Embedded: {@Embedded}",
scheduleJson.Embedded);
return null; return null;
} }
@@ -124,12 +133,12 @@ namespace SfeduSchedule.Services
End = new CalDateTime(e.EndsAtLocal, _configuration["TZ"]!), End = new CalDateTime(e.EndsAtLocal, _configuration["TZ"]!),
}); });
} }
var serializer = new CalendarSerializer(); var serializer = new CalendarSerializer();
var serializedCalendar = serializer.SerializeToString(calendar); var serializedCalendar = serializer.SerializeToString(calendar);
_logger.LogInformation("GetIcsAsync: Serialized calendar created. Length: {Length}", serializedCalendar?.Length ?? 0); _logger.LogInformation("GetIcsAsync: Serialized calendar created. Length: {Length}",
serializedCalendar?.Length ?? 0);
return serializedCalendar; return serializedCalendar;
} }
} }
} }