Использование Timetable API для получания программ и групп (#583)

* feat: use API instead of HTML parsing

* feat: use async

* fix: remove extra dependency

* feat: use InterruptibleLazy

* fixes

---------

Co-authored-by: Alexey.Berezhnykh <alexey.berezhnykh@jetbrains.com>

Author: Salvatore112

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/CoursesController.cs

@@ -89,9 +89,9 @@ public async Task<IActionResult> GetGroups(string programName)
         [HttpGet("getProgramNames")]
         [Authorize(Roles = Roles.LecturerRole)]
         [ProducesResponseType(typeof(List<ProgramModel>), (int)HttpStatusCode.OK)]
-        public IActionResult GetProgramNames()
+        public async Task<IActionResult> GetProgramNames()
         {
-            return Ok(_studentsInfo.GetProgramNames());
+            return Ok(await _studentsInfo.GetProgramNames());
         }
 
         [HttpPost("create")]

HwProj.StudentInfo/IStudentsInfo/IStudentsInfo.csproj

@@ -4,4 +4,8 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
+    <ItemGroup>
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    </ItemGroup>
+
 </Project>

HwProj.StudentInfo/IStudentsInfo/IStudentsInformation.cs

@@ -35,6 +35,6 @@ public interface IStudentsInformationProvider
         List<StudentModel> GetStudentInformation(string groupName);
 
         /// Возвращает список образовательных программ
-        List<ProgramModel> GetProgramNames();
+        Task<List<ProgramModel>> GetProgramNames();
     }
 }

HwProj.StudentInfo/StudentsInfo.Tests/StudentsInformationTests.cs

@@ -22,9 +22,9 @@ public void SetUp()
         }
 
         [Test]
-        public void Constructor_ShouldPopulateProgramGroups()
+        public async Task Constructor_ShouldPopulateProgramGroups()
         {
-            var programNamesModels = _studentsInformation.GetProgramNames();
+            var programNamesModels = await _studentsInformation.GetProgramNames();
             var programNames = programNamesModels.Select(model => model.ProgramName).ToList();
 
             Assert.IsNotEmpty(programNames);

HwProj.StudentInfo/StudentsInfo/StudentsInformation.cs

@@ -1,43 +1,73 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using HtmlAgilityPack;
-using Novell.Directory.Ldap;
+using System.Net.Http;
 using System.Threading.Tasks;
 using IStudentsInfo;
+using Newtonsoft.Json;
+using Novell.Directory.Ldap;
+using System.Threading;
 
 namespace StudentsInfo
 {
+    public class InterruptibleLazy<T>
+    {
+        private Func<T> _valueFactory;
+        private readonly object _lockObj = new object();
+        private T _value;
+
+        public InterruptibleLazy(Func<T> valueFactory)
+        {
+            _valueFactory = valueFactory;
+        }
+
+        public T Value
+        {
+            get
+            {
+                if (_valueFactory == null) return _value;
+
+                lock (_lockObj)
+                {
+                    if (_valueFactory == null) return _value;
+
+                    _value = _valueFactory();
+                    Interlocked.MemoryBarrier();
+                    _valueFactory = null;
+                }
+
+                return _value;
+            }
+        }
+    }
+
     public class StudentsInformationProvider : IStudentsInformationProvider
     {
-        private readonly Lazy<Dictionary<string, List<string>>> _lazyProgramsGroups;
+        private readonly InterruptibleLazy<Task<Dictionary<string, List<string>>>> _programsGroups;
         private readonly string _ldapHost = "ad.pu.ru";
         private readonly int _ldapPort = 389;
         private readonly string _searchBase = "DC=ad,DC=pu,DC=ru";
+        private readonly HttpClient _httpClient;
 
         private string _username;
         private string _password;
-        
+
         public async Task<List<GroupModel>> GetGroups(string programName)
         {
-            return await Task.Run(() => 
-            {
-                return _lazyProgramsGroups.Value.ContainsKey(programName)
-                    ? _lazyProgramsGroups.Value[programName]
-                        .Aggregate((current, next) => current + "," + next) 
-                        .Split(',')
-                        .Select(group => new GroupModel { GroupName = group.Trim() })
-                        .ToList()
-                    : new List<GroupModel>();
-            });
+            var programsGroups = await _programsGroups.Value;
+            if (!programsGroups.TryGetValue(programName, out var groups))
+                return new List<GroupModel>();
+
+            return groups.Select(group => new GroupModel { GroupName = group }).ToList();
         }
-        
+
         public List<StudentModel> GetStudentInformation(string groupName)
         {
-            var searchFilter = $"(&(objectClass=person)(memberOf=CN=АкадемГруппа_{groupName},OU=АкадемГруппа,OU=Группы,DC=ad,DC=pu,DC=ru))";
+            var searchFilter =
+                $"(&(objectClass=person)(memberOf=CN=АкадемГруппа_{groupName},OU=АкадемГруппа,OU=Группы,DC=ad,DC=pu,DC=ru))";
             var studentsList = new List<StudentModel>();
             LdapConnection connection = null;
-            
+
             try
             {
                 connection = new LdapConnection();
@@ -48,7 +78,7 @@ public List<StudentModel> GetStudentInformation(string groupName)
                 {
                     return studentsList;
                 }
-                
+
                 var results = connection.Search(
                     _searchBase,
                     LdapConnection.SCOPE_SUB,
@@ -62,7 +92,7 @@ public List<StudentModel> GetStudentInformation(string groupName)
                     var entry = results.next();
                     var cn = entry.getAttribute("cn")?.StringValue;
                     var displayName = entry.getAttribute("displayName")?.StringValue;
-                    
+
                     if (cn != null && displayName != null)
                     {
                         string[] splitNames = displayName.Split(' ');
@@ -81,11 +111,11 @@ public List<StudentModel> GetStudentInformation(string groupName)
             {
                 return studentsList;
             }
-            catch (LdapException ldapEx)
+            catch (LdapException)
             {
                 return studentsList;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return studentsList;
             }
@@ -95,12 +125,11 @@ public List<StudentModel> GetStudentInformation(string groupName)
                 {
                     if (connection != null && connection.Connected)
                     {
-                            SafeDisconnect(connection);
+                        SafeDisconnect(connection);
                     }
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
-                    Console.WriteLine($"Error during disconnect: {ex.Message}");
                 }
             }
 
@@ -116,71 +145,69 @@ private void SafeDisconnect(LdapConnection connection)
             catch (PlatformNotSupportedException)
             {
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                Console.WriteLine($"SafeDisconnect error: {ex.Message}");
             }
         }
-        
-        public List<ProgramModel> GetProgramNames()
+
+        public async Task<List<ProgramModel>> GetProgramNames()
         {
-            return _lazyProgramsGroups.Value.Keys
+            var programGroups = await _programsGroups.Value;
+            return programGroups.Keys
                 .Select(key => new ProgramModel { ProgramName = key })
                 .ToList();
         }
 
-        public StudentsInformationProvider(string username, string password, string ldapHost, int ldapPort, string searchBase)
+        public StudentsInformationProvider(string username, string password, string ldapHost, int ldapPort,
+            string searchBase)
         {
-            this._username = username;
-            this._password = password;
-            this._ldapHost = ldapHost;
-            this._ldapPort = ldapPort;
-            this._searchBase = searchBase;
+            _username = username;
+            _password = password;
+            _ldapHost = ldapHost;
+            _ldapPort = ldapPort;
+            _searchBase = searchBase;
+            _httpClient = new HttpClient();
 
-            _lazyProgramsGroups = new Lazy<Dictionary<string, List<string>>>(() =>
+            _programsGroups = new InterruptibleLazy<Task<Dictionary<string, List<string>>>>(async () =>
             {
                 var programsGroups = new Dictionary<string, List<string>>();
-                
+
                 try
                 {
-                    const string url = "https://timetable.spbu.ru/MATH?lang=ru";
-                    var web = new HtmlWeb();
-
-                    web.PreRequest = request =>
+                    var programsResponse =
+                        await _httpClient.GetAsync(
+                            "https://timetable.spbu.ru/api/v1/study/divisions/MATH/programs/levels");
+                    if (programsResponse.IsSuccessStatusCode)
                     {
-                        request.Headers.Add("Accept-Language", "ru");
-                        return true;
-                    };
+                        var content = await programsResponse.Content.ReadAsStringAsync();
+                        var studyLevels = JsonConvert.DeserializeObject<List<StudyLevel>>(content);
 
-                    var doc = web.Load(url);
-                    var programNodes = doc.DocumentNode.SelectNodes("//li[contains(@class, 'common-list-item row')]");
-
-                    foreach (var programNode in programNodes)
-                    {
-                        var programNameNode = programNode.SelectSingleNode(".//div[contains(@class, 'col-sm-5')]");
-                        var programName = programNameNode?.InnerText.Trim();
-
-                        var titleNodes = programNode.SelectNodes(".//div[contains(@class, 'col-sm-1')]");
-
-                        if (titleNodes != null && programName != null)
+                        foreach (var level in studyLevels)
                         {
-                            var titles = new List<string>();
-                            foreach (var titleNode in titleNodes)
+                            foreach (var programCombination in level.StudyProgramCombinations)
                             {
-                                var title = titleNode.SelectSingleNode(".//a")?.Attributes["title"]?.Value;
-                                if (title != null)
+                                foreach (var admissionYear in programCombination.AdmissionYears)
                                 {
-                                    titles.Add(title);
-                                }
-                            }
+                                    var groupsResponse = await _httpClient.GetAsync(
+                                        $"https://timetable.spbu.ru/api/v1/programs/{admissionYear.StudyProgramId}/groups");
+                                    if (groupsResponse.IsSuccessStatusCode)
+                                    {
+                                        var groupsContent = await groupsResponse.Content.ReadAsStringAsync();
+                                        var programGroups = JsonConvert.DeserializeObject<ProgramGroups>(groupsContent);
 
-                            if (programsGroups.ContainsKey(programName))
-                            {
-                                programsGroups[programName].AddRange(titles);
-                            }
-                            else
-                            {
-                                programsGroups[programName] = titles;
+                                        var programName = programCombination.Name;
+                                        var groups = programGroups.Groups.Select(g => g.StudentGroupName).ToList();
+
+                                        if (programsGroups.ContainsKey(programName))
+                                        {
+                                            programsGroups[programName].AddRange(groups);
+                                        }
+                                        else
+                                        {
+                                            programsGroups[programName] = groups;
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
@@ -193,5 +220,32 @@ public StudentsInformationProvider(string username, string password, string ldap
                 return programsGroups;
             });
         }
+
+        private class StudyLevel
+        {
+            public string StudyLevelName { get; set; }
+            public List<StudyProgramCombination> StudyProgramCombinations { get; set; }
+        }
+
+        private class StudyProgramCombination
+        {
+            public string Name { get; set; }
+            public List<AdmissionYear> AdmissionYears { get; set; }
+        }
+
+        private class AdmissionYear
+        {
+            public int StudyProgramId { get; set; }
+        }
+
+        private class ProgramGroups
+        {
+            public List<GroupInfo> Groups { get; set; }
+        }
+
+        private class GroupInfo
+        {
+            public string StudentGroupName { get; set; }
+        }
     }
-}
+}