diff --git a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs index 28c3e6a..5a77795 100644 --- a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs +++ b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("console_ui")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bc831b38be994c037123ffa50725de305f577b7a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+839362e7d0b5dfb5bcc210987efb21e47bd4ac2f")] [assembly: System.Reflection.AssemblyProductAttribute("console_ui")] [assembly: System.Reflection.AssemblyTitleAttribute("console_ui")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache index 59231da..89c5935 100644 --- a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache +++ b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache @@ -1 +1 @@ -0bf3ed9763fab8ffc4bdb71fe4985bca7b7587e5f39e71ac8713b92d12101222 +6d93ad453d2e7d50d36c9ca04017ca5cd10b3e5ef1de27876bbc4533fa29b306 diff --git a/console_ui/obj/Debug/net8.0/console_ui.GeneratedMSBuildEditorConfig.editorconfig b/console_ui/obj/Debug/net8.0/console_ui.GeneratedMSBuildEditorConfig.editorconfig index 29a1ff8..a92fae3 100644 --- a/console_ui/obj/Debug/net8.0/console_ui.GeneratedMSBuildEditorConfig.editorconfig +++ b/console_ui/obj/Debug/net8.0/console_ui.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = console_ui -build_property.ProjectDir = C:\Users\class_student\source\repos\presence\console_ui\ +build_property.ProjectDir = C:\Users\class_student\Source\Repos\presence\console_ui\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/console_ui/obj/Debug/net8.0/console_ui.assets.cache b/console_ui/obj/Debug/net8.0/console_ui.assets.cache index 4b96818..fb2dd3f 100644 Binary files a/console_ui/obj/Debug/net8.0/console_ui.assets.cache and b/console_ui/obj/Debug/net8.0/console_ui.assets.cache differ diff --git a/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache b/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache index 47bf762..8d344dc 100644 Binary files a/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache and b/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache differ diff --git a/console_ui/obj/console_ui.csproj.nuget.dgspec.json b/console_ui/obj/console_ui.csproj.nuget.dgspec.json index e4a9177..3fd4bbf 100644 --- a/console_ui/obj/console_ui.csproj.nuget.dgspec.json +++ b/console_ui/obj/console_ui.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\class_student\\source\\repos\\presence\\console_ui\\console_ui.csproj": {} + "C:\\Users\\class_student\\Source\\Repos\\presence\\console_ui\\console_ui.csproj": {} }, "projects": { - "C:\\Users\\class_student\\source\\repos\\presence\\console_ui\\console_ui.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\console_ui\\console_ui.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\console_ui\\console_ui.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\console_ui\\console_ui.csproj", "projectName": "console_ui", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\console_ui\\console_ui.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\console_ui\\console_ui.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\console_ui\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\console_ui\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -32,14 +32,14 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj" }, - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj" }, - "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj" } } } @@ -92,14 +92,14 @@ } } }, - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "projectName": "data", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -172,14 +172,14 @@ } } }, - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "projectName": "domain", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -200,8 +200,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj" } } } @@ -246,14 +246,14 @@ } } }, - "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj", "projectName": "ui", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -274,8 +274,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj" } } } diff --git a/console_ui/obj/project.assets.json b/console_ui/obj/project.assets.json index d94b41e..2247ccf 100644 --- a/console_ui/obj/project.assets.json +++ b/console_ui/obj/project.assets.json @@ -1062,9 +1062,9 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\console_ui\\console_ui.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\console_ui\\console_ui.csproj", "projectName": "console_ui", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\console_ui\\console_ui.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\console_ui\\console_ui.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\console_ui\\obj\\", "projectStyle": "PackageReference", @@ -1087,14 +1087,14 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj" }, - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj" }, - "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj" } } } diff --git a/console_ui/obj/project.nuget.cache b/console_ui/obj/project.nuget.cache index 500da23..b31b3c6 100644 --- a/console_ui/obj/project.nuget.cache +++ b/console_ui/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "8SnqRBoHTrXC6zNRgD35iWqKQFrMMB1xnQ0tZsRXiQnDkKksHZdiEnJsZgKSiOtjn3nAN28hgxy0Jfv7jHYl4g==", + "dgSpecHash": "yfJCYMI2ah3sfp2aK6Ke6ce9kWJKxkrL993rMZ5hRfO/n/HG67U+7imrDbnyVEbFgC9j14ziYrduCNKKBW5lDw==", "success": true, - "projectFilePath": "C:\\Users\\class_student\\source\\repos\\presence\\console_ui\\console_ui.csproj", + "projectFilePath": "C:\\Users\\class_student\\Source\\Repos\\presence\\console_ui\\console_ui.csproj", "expectedPackageFiles": [ "C:\\Users\\class_student\\.nuget\\packages\\closedxml\\0.104.1\\closedxml.0.104.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\closedxml.parser\\1.2.0\\closedxml.parser.1.2.0.nupkg.sha512", diff --git a/data/LocalData/Entity/Group.cs b/data/LocalData/Entity/Group.cs index a6d1f5a..550bb8d 100644 --- a/data/LocalData/Entity/Group.cs +++ b/data/LocalData/Entity/Group.cs @@ -11,5 +11,7 @@ namespace domain.Models public required int Id { get; set; } public required string Name { get; set; } + public List Users { get; set; } = new List(); + } -} +} \ No newline at end of file diff --git a/data/LocalData/Entity/Presence.cs b/data/LocalData/Entity/Presence.cs index 1e37e08..f7d0382 100644 --- a/data/LocalData/Entity/Presence.cs +++ b/data/LocalData/Entity/Presence.cs @@ -1,5 +1,4 @@ - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -9,7 +8,7 @@ namespace domain.Models { public class PresenceLocalEntity { - public Guid UserGuid { get; set; } + public Guid UserGuid { get; set; } public int GroupId { get; set; } public int LessonNumber { get; set; } public DateTime Date { get; set; } diff --git a/data/LocalData/Entity/User.cs b/data/LocalData/Entity/User.cs index fcd2fb1..35aa167 100644 --- a/data/LocalData/Entity/User.cs +++ b/data/LocalData/Entity/User.cs @@ -13,7 +13,7 @@ namespace domain.Models public Guid Guid { get; set; } public required int GroupID { get; set; } - + public GroupLocalEntity Group { get; set; } public bool Equals(UserLocalEnity? other) @@ -22,4 +22,4 @@ namespace domain.Models return this.Guid.Equals(other.Guid); } } -} +} \ No newline at end of file diff --git a/data/LocalData/LocalStaticData.cs b/data/LocalData/LocalStaticData.cs deleted file mode 100644 index d257752..0000000 --- a/data/LocalData/LocalStaticData.cs +++ /dev/null @@ -1,36 +0,0 @@ -using domain.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.NetworkInformation; -using System.Text; -using System.Threading.Tasks; - -namespace data.LocalData -{ - public static class LocalStaticData - { - public static List groups => new List - - { - new GroupLocalEntity{ Id = 1, Name = "ИП1-21" }, - new GroupLocalEntity{ Id = 2, Name = "ИП1-22" }, - new GroupLocalEntity{ Id = 3, Name = "ИП1-23" }, - }; - - public static List users => new List - { - new UserLocalEnity{Guid=Guid.Parse("e6b9964d-ea9f-420a-84b9-af9633bbfab9"), FIO = "RandomFio", GroupID = 1 }, - new UserLocalEnity{Guid=Guid.Parse("8388d931-5bef-41be-a152-78f1aca980ed"), FIO = "RandomFio1", GroupID = 2 }, - new UserLocalEnity{Guid=Guid.Parse("ed174548-49ed-4503-a902-c970cbf27173"), FIO = "RandomFio2", GroupID = 3 }, - new UserLocalEnity{Guid=Guid.Parse("614c0a23-5bd5-43ae-b48e-d5750afbc282"), FIO = "RandomFio3", GroupID = 1 }, - new UserLocalEnity{Guid=Guid.Parse("efcc1473-c116-4244-b3f7-f2341a5c3003"), FIO = "RandomFio4", GroupID = 2 }, - new UserLocalEnity{Guid=Guid.Parse("60640fb3-ace2-4cad-81d5-a0a58bc2dbbd"), FIO = "RandomFio5", GroupID = 3 }, - }; - - public static List presences => new List - { - - }; - } -} diff --git a/data/Repository/GroupRepositoryImpl.cs b/data/Repository/GroupRepositoryImpl.cs deleted file mode 100644 index c67d80b..0000000 --- a/data/Repository/GroupRepositoryImpl.cs +++ /dev/null @@ -1,53 +0,0 @@ -using data.Exception; -using data.LocalData; -using data.RemoteData.RemoteDataBase.DAO; -using data.Repository; -using domain.Models; -using System.Collections.Generic; -using System.Linq; - -public class GroupRepositoryImpl : IGroupRepository -{ - private List _groups = LocalStaticData.groups; - - public GroupLocalEntity? GetGroupById(int groupId) - { - return _groups.FirstOrDefault(g => g.Id == groupId); - } - - // Метод для получения всех групп - public List GetAllGroup() => _groups; - - // Метод для добавления новой группы - public bool AddGroup(GroupLocalEntity group) - { - if (_groups.Any(g => g.Id == group.Id)) - return false; - - group.Id = _groups.Any() ? _groups.Max(g => g.Id) + 1 : 1; - _groups.Add(group); - return true; - } - - // Метод для обновления существующей группы - public bool UpdateGroupById(int groupID, GroupLocalEntity updatedGroup) - { - var existingGroup = GetGroupById(groupID); - if (existingGroup == null) - return false; - - existingGroup.Name = updatedGroup.Name; - return true; - } - - - public bool RemoveGroupById(int groupID) - { - var existingGroup = GetGroupById(groupID); - if (existingGroup == null) - return false; - - _groups.Remove(existingGroup); - return true; - } -} diff --git a/data/Repository/IGroupRepository.cs b/data/Repository/IGroupRepository.cs index 7e099bf..2a3d1de 100644 --- a/data/Repository/IGroupRepository.cs +++ b/data/Repository/IGroupRepository.cs @@ -16,5 +16,7 @@ namespace data.Repository GroupLocalEntity GetGroupById(int groupID); bool AddGroup(GroupLocalEntity newGroup); + public List GetAllGroupWithStident(); + } } \ No newline at end of file diff --git a/data/Repository/IUserRepository.cs b/data/Repository/IUserRepository.cs index b4cb8b8..3b50a73 100644 --- a/data/Repository/IUserRepository.cs +++ b/data/Repository/IUserRepository.cs @@ -15,6 +15,8 @@ namespace data.Repository UserLocalEnity? UpdateUser(UserLocalEnity user); List GetUserNames(); + public UserDao GetUserInfo(Guid userGuid); + } } diff --git a/data/Repository/PresenceRepositoryImpl.cs b/data/Repository/PresenceRepositoryImpl.cs deleted file mode 100644 index a071263..0000000 --- a/data/Repository/PresenceRepositoryImpl.cs +++ /dev/null @@ -1,62 +0,0 @@ -using data.RemoteData.RemoteDataBase.DAO; -using domain.Models; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace data.Repository -{ - public class PresenceRepositoryImpl - { - private readonly List _presences = new List(); - - public void SavePresence(List presences) - { - foreach (var presence in presences) - { - var existing = _presences.FirstOrDefault(p => - p.Date == presence.Date && - p.UserGuid == presence.UserGuid && - p.LessonNumber == presence.LessonNumber); - - if (existing == null) - { - _presences.Add(presence); - } - else - { - existing.IsAttedance = presence.IsAttedance; - } - } - } - - public void AddPresence(PresenceLocalEntity presence) - { - if (presence == null) throw new ArgumentNullException(nameof(presence)); - - _presences.Add(presence); - } - - public List GetPresenceByGroup(int groupId) - { - return _presences.Where(p => p.GroupId == groupId).ToList(); - } - - public List GetPresenceByGroupAndDate(int groupId, DateTime date) - { - return _presences.Where(p => p.GroupId == groupId && p.Date.Date == date.Date).ToList(); - } - - public void MarkUserAsAbsent(Guid userGuid, int firstLessonNumber, int lastLessonNumber) - { - foreach (var lesson in Enumerable.Range(firstLessonNumber, lastLessonNumber - firstLessonNumber + 1)) - { - var presence = _presences.FirstOrDefault(p => p.UserGuid == userGuid && p.LessonNumber == lesson); - if (presence != null) - { - presence.IsAttedance = false; // Помечаем как отсутствующего - } - } - } - } -} diff --git a/data/Repository/SQLGroupRepositoryImpl.cs b/data/Repository/SQLGroupRepositoryImpl.cs index 3a3de64..538737a 100644 --- a/data/Repository/SQLGroupRepositoryImpl.cs +++ b/data/Repository/SQLGroupRepositoryImpl.cs @@ -1,9 +1,9 @@ using data.Exception; -using data.LocalData; using data.RemoteData.RemoteDataBase; using data.RemoteData.RemoteDataBase.DAO; using data.Repository; using domain.Models; +using Microsoft.EntityFrameworkCore; using System.Collections.Generic; using System.Linq; @@ -66,4 +66,13 @@ public class SQLGroupRepositoryImpl : IGroupRepository _remoteDatabaseContext.SaveChanges(); return true; } + + public List GetAllGroupWithStident() + { + // Убедитесь, что загружаются все пользователи, связанные с группами + return _remoteDatabaseContext.Groups + .Include(g => g.Users) // Загружаем пользователей вместе с группами + .ToList(); + } + } diff --git a/data/Repository/SQLUserRepositoryImpl.cs b/data/Repository/SQLUserRepositoryImpl.cs index 00c4cb6..03dd8e2 100644 --- a/data/Repository/SQLUserRepositoryImpl.cs +++ b/data/Repository/SQLUserRepositoryImpl.cs @@ -2,6 +2,7 @@ using data.RemoteData.RemoteDataBase; using data.RemoteData.RemoteDataBase.DAO; using domain.Models; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Linq; @@ -65,5 +66,13 @@ namespace data.Repository .ToList(); } + + public UserDao GetUserInfo(Guid userGuid) + { + return _remoteDatabaseContext.Users + .Include(u => u.Group) + .FirstOrDefault(u => u.Guid == userGuid); + } + } } diff --git a/data/Repository/UserRepositoryImpl.cs b/data/Repository/UserRepositoryImpl.cs deleted file mode 100644 index 886bce0..0000000 --- a/data/Repository/UserRepositoryImpl.cs +++ /dev/null @@ -1,53 +0,0 @@ -using data.Exception; -using data.LocalData; -using data.RemoteData.RemoteDataBase.DAO; -using domain.Models; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace data.Repository -{ - public class UserRepositoryImpl : IUserRepository - { - private List _users; - - public UserRepositoryImpl() - { - _users = LocalStaticData.users; - } - - public IEnumerable GetAllUsers => _users; - - public bool RemoveUserByGuid(Guid userGuid) - { - var user = _users.FirstOrDefault(u => u.Guid == userGuid); - if (user == null) throw new UserNotFoundException(userGuid); - - _users.Remove(user); - return true; - } - - public UserLocalEnity? UpdateUser(UserLocalEnity user) - { - var existingUser = _users.FirstOrDefault(u => u.Guid == user.Guid); - if (existingUser == null) throw new UserNotFoundException(user.Guid); - - existingUser.FIO = user.FIO; - existingUser.GroupID = user.GroupID; - - return existingUser; - } - - public List GetUserNames() - { - return _users - .Select(u => new UserDao - { - Guid = u.Guid, - FIO = u.FIO - }) - .ToList(); - } - } -} diff --git a/data/bin/Debug/net8.0/data.dll b/data/bin/Debug/net8.0/data.dll index 6d875ac..23b3d0c 100644 Binary files a/data/bin/Debug/net8.0/data.dll and b/data/bin/Debug/net8.0/data.dll differ diff --git a/data/bin/Debug/net8.0/data.pdb b/data/bin/Debug/net8.0/data.pdb index d64ba62..fa9e2d8 100644 Binary files a/data/bin/Debug/net8.0/data.pdb and b/data/bin/Debug/net8.0/data.pdb differ diff --git a/data/obj/Debug/net8.0/data.AssemblyInfo.cs b/data/obj/Debug/net8.0/data.AssemblyInfo.cs index cfada66..e405095 100644 --- a/data/obj/Debug/net8.0/data.AssemblyInfo.cs +++ b/data/obj/Debug/net8.0/data.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("data")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bc831b38be994c037123ffa50725de305f577b7a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+839362e7d0b5dfb5bcc210987efb21e47bd4ac2f")] [assembly: System.Reflection.AssemblyProductAttribute("data")] [assembly: System.Reflection.AssemblyTitleAttribute("data")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache b/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache index 86f53b8..02af07d 100644 --- a/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache +++ b/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache @@ -1 +1 @@ -a50be90752b8b6d77c677de08d0b1988eba5f1a43137c89ef90e1362d9c48efc +3477ca2dab72974277df7dd17d47bbf7d5922c6bd6f9dc0ad19320b22ad1bbc1 diff --git a/data/obj/Debug/net8.0/data.GeneratedMSBuildEditorConfig.editorconfig b/data/obj/Debug/net8.0/data.GeneratedMSBuildEditorConfig.editorconfig index 7cde3f1..c4120f6 100644 --- a/data/obj/Debug/net8.0/data.GeneratedMSBuildEditorConfig.editorconfig +++ b/data/obj/Debug/net8.0/data.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = data -build_property.ProjectDir = C:\Users\class_student\source\repos\presence\data\ +build_property.ProjectDir = C:\Users\class_student\Source\Repos\presence\data\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/data/obj/Debug/net8.0/data.assets.cache b/data/obj/Debug/net8.0/data.assets.cache index 9d92053..3c28687 100644 Binary files a/data/obj/Debug/net8.0/data.assets.cache and b/data/obj/Debug/net8.0/data.assets.cache differ diff --git a/data/obj/Debug/net8.0/data.csproj.CoreCompileInputs.cache b/data/obj/Debug/net8.0/data.csproj.CoreCompileInputs.cache index 925ba5f..18a061f 100644 --- a/data/obj/Debug/net8.0/data.csproj.CoreCompileInputs.cache +++ b/data/obj/Debug/net8.0/data.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4373816ab2adca26ada772cfa898e94678cd01f9279b64536132365dfacb7c33 +44f0f497ad532821c249ae48a589e57b8bf7c3cd511fdcbf3c37d67827ab5aa9 diff --git a/data/obj/Debug/net8.0/data.dll b/data/obj/Debug/net8.0/data.dll index 6d875ac..23b3d0c 100644 Binary files a/data/obj/Debug/net8.0/data.dll and b/data/obj/Debug/net8.0/data.dll differ diff --git a/data/obj/Debug/net8.0/data.genruntimeconfig.cache b/data/obj/Debug/net8.0/data.genruntimeconfig.cache index db67133..b6c23e1 100644 --- a/data/obj/Debug/net8.0/data.genruntimeconfig.cache +++ b/data/obj/Debug/net8.0/data.genruntimeconfig.cache @@ -1 +1 @@ -b84345f992d3666be6b0e025aa74afc1a71aca079d190d689c0864402727cdd0 +ad0a4479b59a7ef873597a5be47af04d30bf61b8a15ec5b82893655c935f039d diff --git a/data/obj/Debug/net8.0/data.pdb b/data/obj/Debug/net8.0/data.pdb index d64ba62..fa9e2d8 100644 Binary files a/data/obj/Debug/net8.0/data.pdb and b/data/obj/Debug/net8.0/data.pdb differ diff --git a/data/obj/Debug/net8.0/ref/data.dll b/data/obj/Debug/net8.0/ref/data.dll index 59b61a5..fa3a5c7 100644 Binary files a/data/obj/Debug/net8.0/ref/data.dll and b/data/obj/Debug/net8.0/ref/data.dll differ diff --git a/data/obj/Debug/net8.0/refint/data.dll b/data/obj/Debug/net8.0/refint/data.dll index 59b61a5..fa3a5c7 100644 Binary files a/data/obj/Debug/net8.0/refint/data.dll and b/data/obj/Debug/net8.0/refint/data.dll differ diff --git a/data/obj/data.csproj.nuget.dgspec.json b/data/obj/data.csproj.nuget.dgspec.json index 2cf3b8c..d1937e5 100644 --- a/data/obj/data.csproj.nuget.dgspec.json +++ b/data/obj/data.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": {} + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": {} }, "projects": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "projectName": "data", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/data/obj/project.nuget.cache b/data/obj/project.nuget.cache index ab1c6bf..3caceb6 100644 --- a/data/obj/project.nuget.cache +++ b/data/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "dq+xJQNSo82BcvI1YOEsRM5SyN3J419X1oAn1yZywg6ptvxskzy0YvsVYIchdWZwskiwWAGbewHiRF0FFD64Gg==", + "dgSpecHash": "dBPobGZbW4jKftpopDdOdvwpbzROWoiPzYBMGL/hXvUgdi/u/sEl0RkoQlrjuHoJDOWHTVpRo8RBVk4zjt8Z3g==", "success": true, - "projectFilePath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectFilePath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "expectedPackageFiles": [ "C:\\Users\\class_student\\.nuget\\packages\\humanizer.core\\2.14.1\\humanizer.core.2.14.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\6.0.0\\microsoft.bcl.asyncinterfaces.6.0.0.nupkg.sha512", diff --git a/domain/Models/Group.cs b/domain/Models/Group.cs index 769b2ca..e34f24e 100644 --- a/domain/Models/Group.cs +++ b/domain/Models/Group.cs @@ -10,5 +10,7 @@ namespace domain.Models { public required int Id { get; set; } public required string Name { get; set; } + + public List Users { get; set; } = new List(); } } diff --git a/domain/Models/GroupWithUsersDto.cs b/domain/Models/GroupWithUsersDto.cs new file mode 100644 index 0000000..67d82ca --- /dev/null +++ b/domain/Models/GroupWithUsersDto.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace domain.Models +{ + public class GroupWithUsersDto + { + public string GroupName { get; set; } + public List Students { get; set; } + + + } +} diff --git a/domain/Models/User.cs b/domain/Models/User.cs index cd35dc6..8938176 100644 --- a/domain/Models/User.cs +++ b/domain/Models/User.cs @@ -10,6 +10,7 @@ namespace domain.Models { public required string FIO { get; set; } public Guid Guid { get; set; } - public required Group Group { get; set; } + public int GroupId { get; set; } + public Group? Group { get; set; } } } diff --git a/domain/UseCase/GroupUseCase.cs b/domain/UseCase/GroupUseCase.cs index 13db027..48e6ab0 100644 --- a/domain/UseCase/GroupUseCase.cs +++ b/domain/UseCase/GroupUseCase.cs @@ -1,4 +1,5 @@ -using data.LocalData; + +using data.RemoteData.RemoteDataBase.DAO; using data.Repository; using domain.Models; @@ -106,6 +107,25 @@ namespace domain.UseCase _repositoryGroupImpl.UpdateGroupById(existingGroup.Id, existingGroup); return true; // Успешное обновление } + public List GetAllGroupWithStident() + { + // Загружаем группы с пользователями + var groups = _repositoryGroupImpl.GetAllGroupWithStident() + .Select(g => new Group + { + Id = g.Id, + Name = g.Name, + Users = g.Users.Select(u => new User + { + Guid = u.Guid, + FIO = u.FIO + }).ToList() + }) + .ToList(); + + return groups; + } + } } \ No newline at end of file diff --git a/domain/UseCase/UserUseCase.cs b/domain/UseCase/UserUseCase.cs index 46efcd8..368eada 100644 --- a/domain/UseCase/UserUseCase.cs +++ b/domain/UseCase/UserUseCase.cs @@ -1,4 +1,5 @@ using data.Exception; +using data.RemoteData.RemoteDataBase.DAO; using data.Repository; using domain.Models; @@ -105,6 +106,10 @@ namespace domain.UseCase Group = new Group { Id = group.Id, Name = group.Name } }; } + public UserDao GetUserInfo(Guid userGuid) + { + return _repositoryUserImpl.GetUserInfo(userGuid); + } } } diff --git a/domain/bin/Debug/net8.0/data.dll b/domain/bin/Debug/net8.0/data.dll index 6d875ac..23b3d0c 100644 Binary files a/domain/bin/Debug/net8.0/data.dll and b/domain/bin/Debug/net8.0/data.dll differ diff --git a/domain/bin/Debug/net8.0/data.pdb b/domain/bin/Debug/net8.0/data.pdb index d64ba62..fa9e2d8 100644 Binary files a/domain/bin/Debug/net8.0/data.pdb and b/domain/bin/Debug/net8.0/data.pdb differ diff --git a/domain/bin/Debug/net8.0/domain.dll b/domain/bin/Debug/net8.0/domain.dll index 037b9e5..5b05b34 100644 Binary files a/domain/bin/Debug/net8.0/domain.dll and b/domain/bin/Debug/net8.0/domain.dll differ diff --git a/domain/bin/Debug/net8.0/domain.pdb b/domain/bin/Debug/net8.0/domain.pdb index 7796988..9d0bfc6 100644 Binary files a/domain/bin/Debug/net8.0/domain.pdb and b/domain/bin/Debug/net8.0/domain.pdb differ diff --git a/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs b/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs index 6ef8ea3..844d320 100644 --- a/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs +++ b/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("domain")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bc831b38be994c037123ffa50725de305f577b7a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+839362e7d0b5dfb5bcc210987efb21e47bd4ac2f")] [assembly: System.Reflection.AssemblyProductAttribute("domain")] [assembly: System.Reflection.AssemblyTitleAttribute("domain")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache b/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache index 8c68db4..681929b 100644 --- a/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache +++ b/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache @@ -1 +1 @@ -9bf776f5a1569c6c8e87b4e7850c65a45203e6fdec27c7106df7a51414d23f6f +d600c8be21c77e7a8016045fd7b23df7c522f9ffb1c956a2ec504417ddef5e8d diff --git a/domain/obj/Debug/net8.0/domain.GeneratedMSBuildEditorConfig.editorconfig b/domain/obj/Debug/net8.0/domain.GeneratedMSBuildEditorConfig.editorconfig index 65a1010..d9f9575 100644 --- a/domain/obj/Debug/net8.0/domain.GeneratedMSBuildEditorConfig.editorconfig +++ b/domain/obj/Debug/net8.0/domain.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = domain -build_property.ProjectDir = C:\Users\class_student\source\repos\presence\domain\ +build_property.ProjectDir = C:\Users\class_student\Source\Repos\presence\domain\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/domain/obj/Debug/net8.0/domain.assets.cache b/domain/obj/Debug/net8.0/domain.assets.cache index a98c6a8..5cfed49 100644 Binary files a/domain/obj/Debug/net8.0/domain.assets.cache and b/domain/obj/Debug/net8.0/domain.assets.cache differ diff --git a/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache b/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache index 3e57705..a623b5a 100644 Binary files a/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache and b/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache differ diff --git a/domain/obj/Debug/net8.0/domain.csproj.CoreCompileInputs.cache b/domain/obj/Debug/net8.0/domain.csproj.CoreCompileInputs.cache index dd1e04e..41311de 100644 --- a/domain/obj/Debug/net8.0/domain.csproj.CoreCompileInputs.cache +++ b/domain/obj/Debug/net8.0/domain.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -453945b803e89ca4588b6cd51981fa97af203a288488c65947af1a52395b3af8 +25ffdbef0fe18e9f0b7cdfa9979510573163885468d7e3c18828a7f8ac0111c7 diff --git a/domain/obj/Debug/net8.0/domain.dll b/domain/obj/Debug/net8.0/domain.dll index 037b9e5..5b05b34 100644 Binary files a/domain/obj/Debug/net8.0/domain.dll and b/domain/obj/Debug/net8.0/domain.dll differ diff --git a/domain/obj/Debug/net8.0/domain.pdb b/domain/obj/Debug/net8.0/domain.pdb index 7796988..9d0bfc6 100644 Binary files a/domain/obj/Debug/net8.0/domain.pdb and b/domain/obj/Debug/net8.0/domain.pdb differ diff --git a/domain/obj/Debug/net8.0/ref/domain.dll b/domain/obj/Debug/net8.0/ref/domain.dll index 81b23c7..86da7b5 100644 Binary files a/domain/obj/Debug/net8.0/ref/domain.dll and b/domain/obj/Debug/net8.0/ref/domain.dll differ diff --git a/domain/obj/Debug/net8.0/refint/domain.dll b/domain/obj/Debug/net8.0/refint/domain.dll index 81b23c7..86da7b5 100644 Binary files a/domain/obj/Debug/net8.0/refint/domain.dll and b/domain/obj/Debug/net8.0/refint/domain.dll differ diff --git a/domain/obj/domain.csproj.nuget.dgspec.json b/domain/obj/domain.csproj.nuget.dgspec.json index 946f38d..60bdba5 100644 --- a/domain/obj/domain.csproj.nuget.dgspec.json +++ b/domain/obj/domain.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": {} + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": {} }, "projects": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "projectName": "data", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -84,14 +84,14 @@ } } }, - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "projectName": "domain", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -112,8 +112,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj" } } } diff --git a/domain/obj/project.assets.json b/domain/obj/project.assets.json index 0d65821..d31ed5f 100644 --- a/domain/obj/project.assets.json +++ b/domain/obj/project.assets.json @@ -1025,9 +1025,9 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "projectName": "domain", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\obj\\", "projectStyle": "PackageReference", @@ -1050,8 +1050,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj" } } } diff --git a/domain/obj/project.nuget.cache b/domain/obj/project.nuget.cache index e76a5a5..dab4b89 100644 --- a/domain/obj/project.nuget.cache +++ b/domain/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "lJTJ14wBwjXFnaVaxoabnlDogMX3Sp0lQVlqyaedGyWhAz5YJhifXah8drXyM7t4sf35FH72dxhiyf+6Qi+IXA==", + "dgSpecHash": "huTb6uPnY4Oy6459ePz3VJW91KIPhP3IHAaAETusVV7WDseLI/x2QkHrEeLo/1s2QMdcVBzKbOVfAT7f8Vi3Cw==", "success": true, - "projectFilePath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectFilePath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "expectedPackageFiles": [ "C:\\Users\\class_student\\.nuget\\packages\\closedxml\\0.104.1\\closedxml.0.104.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\closedxml.parser\\1.2.0\\closedxml.parser.1.2.0.nupkg.sha512", diff --git a/presence_api/Controllers/AdminPanelController.cs b/presence_api/Controllers/AdminPanelController.cs index 97654a8..3489106 100644 --- a/presence_api/Controllers/AdminPanelController.cs +++ b/presence_api/Controllers/AdminPanelController.cs @@ -21,6 +21,50 @@ public class AdminPanelController : ControllerBase _presenceUseCase = presenceUseCase; } - + [HttpGet("student/{userGuid}")] + public ActionResult GetStudentInfo(Guid userGuid) + { + // Получаем информацию о студенте + var user = _userUseCase.GetUserInfo(userGuid); // Используем UserUseCase для получения данных о студенте + + if (user == null) + { + return NotFound("Студент не найден"); + } + + + + // Формируем результат + var result = new + { + FIO = user.FIO, + Guid = user.Guid, + GroupName = user.Group?.Name ?? "Не указана", + + }; + + return Ok(result); + } + + [HttpGet("groups")] + public ActionResult> GetAllGroupsWithUsers() + { + try + { + // Получаем группы с пользователями + var groupsWithUsers = _groupUseCase.GetAllGroupWithStident().Select(group => new GroupWithUsersDto + { + GroupName = group.Name, // Название группы + Students = group.Users.Select(u => u.FIO).ToList() // Список студентов + }).ToList(); + + return Ok(groupsWithUsers); // Возвращаем результат + } + catch (Exception ex) + { + // Логируем ошибку и возвращаем ошибку + return BadRequest(new { message = ex.Message }); + } + } } \ No newline at end of file diff --git a/presence_api/Controllers/GroupController.cs b/presence_api/Controllers/GroupController.cs deleted file mode 100644 index 1a358a2..0000000 --- a/presence_api/Controllers/GroupController.cs +++ /dev/null @@ -1,26 +0,0 @@ -using domain.Models; -using domain.UseCase; -using Microsoft.AspNetCore.Mvc; - -namespace presence_api.Controllers; -[ApiController] -[Route ("api/[controller]")] - -public class GroupController: ControllerBase -{ - private readonly GroupUseCase _groupUseCase; - - public GroupController(GroupUseCase groupUseCase) - { - _groupUseCase = groupUseCase; - } - - [HttpGet] - public ActionResult> getGroups() - { - return Ok(_groupUseCase.GetAllGroups()); - } -} - - - diff --git a/presence_api/Program.cs b/presence_api/Program.cs index fc712a8..65520f9 100644 --- a/presence_api/Program.cs +++ b/presence_api/Program.cs @@ -1,22 +1,24 @@ - - - using data.RemoteData.RemoteDataBase; var builder = WebApplication.CreateBuilder(args); - +// builder.Services.AddControllers(); builder.Services.AddDbContext(); + +// builder.Services.ConfigurateRepositories(); + +// , +builder.Services.ConfigurateGroup(); +builder.Services.ConfigurateUser(); // +builder.Services.ConfiguratePresence(); // + builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); -builder.Services.ConfigurateGroup(); - var app = builder.Build(); - if (app.Environment.IsDevelopment()) { app.UseSwagger(); @@ -26,7 +28,4 @@ if (app.Environment.IsDevelopment()) app.UseHttpsRedirection(); app.MapControllers(); - - app.Run(); - diff --git a/presence_api/bin/Debug/net8.0/data.dll b/presence_api/bin/Debug/net8.0/data.dll index 83cf532..23b3d0c 100644 Binary files a/presence_api/bin/Debug/net8.0/data.dll and b/presence_api/bin/Debug/net8.0/data.dll differ diff --git a/presence_api/bin/Debug/net8.0/data.pdb b/presence_api/bin/Debug/net8.0/data.pdb index e972b60..fa9e2d8 100644 Binary files a/presence_api/bin/Debug/net8.0/data.pdb and b/presence_api/bin/Debug/net8.0/data.pdb differ diff --git a/presence_api/bin/Debug/net8.0/domain.dll b/presence_api/bin/Debug/net8.0/domain.dll index e99f4c2..5b05b34 100644 Binary files a/presence_api/bin/Debug/net8.0/domain.dll and b/presence_api/bin/Debug/net8.0/domain.dll differ diff --git a/presence_api/bin/Debug/net8.0/domain.pdb b/presence_api/bin/Debug/net8.0/domain.pdb index 15047c4..9d0bfc6 100644 Binary files a/presence_api/bin/Debug/net8.0/domain.pdb and b/presence_api/bin/Debug/net8.0/domain.pdb differ diff --git a/presence_api/bin/Debug/net8.0/presence_api.deps.json b/presence_api/bin/Debug/net8.0/presence_api.deps.json index b1314bb..1f9742b 100644 --- a/presence_api/bin/Debug/net8.0/presence_api.deps.json +++ b/presence_api/bin/Debug/net8.0/presence_api.deps.json @@ -299,10 +299,7 @@ "Npgsql.EntityFrameworkCore.PostgreSQL": "8.0.10" }, "runtime": { - "data.dll": { - "assemblyVersion": "1.0.0", - "fileVersion": "1.0.0.0" - } + "data.dll": {} } }, "domain/1.0.0": { @@ -311,10 +308,7 @@ "data": "1.0.0" }, "runtime": { - "domain.dll": { - "assemblyVersion": "1.0.0", - "fileVersion": "1.0.0.0" - } + "domain.dll": {} } } } diff --git a/presence_api/bin/Debug/net8.0/presence_api.dll b/presence_api/bin/Debug/net8.0/presence_api.dll index 5a01b10..4ae7781 100644 Binary files a/presence_api/bin/Debug/net8.0/presence_api.dll and b/presence_api/bin/Debug/net8.0/presence_api.dll differ diff --git a/presence_api/bin/Debug/net8.0/presence_api.exe b/presence_api/bin/Debug/net8.0/presence_api.exe index 8cfbcd4..1b1c105 100644 Binary files a/presence_api/bin/Debug/net8.0/presence_api.exe and b/presence_api/bin/Debug/net8.0/presence_api.exe differ diff --git a/presence_api/bin/Debug/net8.0/presence_api.pdb b/presence_api/bin/Debug/net8.0/presence_api.pdb index b82e154..a7b3110 100644 Binary files a/presence_api/bin/Debug/net8.0/presence_api.pdb and b/presence_api/bin/Debug/net8.0/presence_api.pdb differ diff --git a/presence_api/obj/Debug/net8.0/apphost.exe b/presence_api/obj/Debug/net8.0/apphost.exe index e9c9a32..1b1c105 100644 Binary files a/presence_api/obj/Debug/net8.0/apphost.exe and b/presence_api/obj/Debug/net8.0/apphost.exe differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs index 2629ce0..bf00c91 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs +++ b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("presence_api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bc831b38be994c037123ffa50725de305f577b7a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+839362e7d0b5dfb5bcc210987efb21e47bd4ac2f")] [assembly: System.Reflection.AssemblyProductAttribute("presence_api")] [assembly: System.Reflection.AssemblyTitleAttribute("presence_api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache index 0e953b7..c45c992 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache +++ b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache @@ -1 +1 @@ -afb0cb8503e2fdb8b3596501bd1a905aa03a31b0bb50d5335264e3468a454092 +58dd6509641082616d79aa48f9065490a199f2bf5e7bbe8dca45bc53fd028443 diff --git a/presence_api/obj/Debug/net8.0/presence_api.GeneratedMSBuildEditorConfig.editorconfig b/presence_api/obj/Debug/net8.0/presence_api.GeneratedMSBuildEditorConfig.editorconfig index 4133ff1..5d41b90 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.GeneratedMSBuildEditorConfig.editorconfig +++ b/presence_api/obj/Debug/net8.0/presence_api.GeneratedMSBuildEditorConfig.editorconfig @@ -9,11 +9,11 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = presence_api build_property.RootNamespace = presence_api -build_property.ProjectDir = C:\Users\class_student\source\repos\presence\presence_api\ +build_property.ProjectDir = C:\Users\class_student\Source\Repos\presence\presence_api\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 8.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = C:\Users\class_student\source\repos\presence\presence_api +build_property.MSBuildProjectDirectory = C:\Users\class_student\Source\Repos\presence\presence_api build_property._RazorSourceGeneratorDebug = diff --git a/presence_api/obj/Debug/net8.0/presence_api.assets.cache b/presence_api/obj/Debug/net8.0/presence_api.assets.cache index a9ff107..b6d2398 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.assets.cache and b/presence_api/obj/Debug/net8.0/presence_api.assets.cache differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache b/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache index 03cc097..a7c5417 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache and b/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.csproj.CoreCompileInputs.cache b/presence_api/obj/Debug/net8.0/presence_api.csproj.CoreCompileInputs.cache index b0cf441..23595ab 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.csproj.CoreCompileInputs.cache +++ b/presence_api/obj/Debug/net8.0/presence_api.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d2210b6d19d8ce12507f3ddb743d622a228c732f769ac94a2e89169bf9eff900 +42cd786d8fef4959fec2fd8abd8ea0720f32d40cfaa49e4dd15343a1fd3abcfe diff --git a/presence_api/obj/Debug/net8.0/presence_api.csproj.FileListAbsolute.txt b/presence_api/obj/Debug/net8.0/presence_api.csproj.FileListAbsolute.txt index 0ce6b8e..b2ad81c 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.csproj.FileListAbsolute.txt +++ b/presence_api/obj/Debug/net8.0/presence_api.csproj.FileListAbsolute.txt @@ -54,3 +54,59 @@ C:\Users\prdb\Source\Repos\presence\presence_api\obj\Debug\net8.0\refint\presenc C:\Users\prdb\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.pdb C:\Users\prdb\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.genruntimeconfig.cache C:\Users\prdb\Source\Repos\presence\presence_api\obj\Debug\net8.0\ref\presence_api.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\appsettings.Development.json +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\appsettings.json +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\presence_api.exe +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\presence_api.deps.json +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\presence_api.runtimeconfig.json +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\presence_api.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\presence_api.pdb +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\ClosedXML.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\ClosedXML.Parser.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\DocumentFormat.OpenXml.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\DocumentFormat.OpenXml.Framework.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\ExcelNumberFormat.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.AspNetCore.OpenApi.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.EntityFrameworkCore.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.EntityFrameworkCore.Abstractions.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.EntityFrameworkCore.Relational.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.Extensions.Caching.Memory.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.Extensions.DependencyInjection.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.Extensions.Logging.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.Extensions.Logging.Abstractions.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.Extensions.Options.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Microsoft.OpenApi.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Npgsql.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Npgsql.EntityFrameworkCore.PostgreSQL.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\RBush.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\SixLabors.Fonts.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Swashbuckle.AspNetCore.Swagger.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Swashbuckle.AspNetCore.SwaggerGen.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\Swashbuckle.AspNetCore.SwaggerUI.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\System.IO.Packaging.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\data.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\domain.dll +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\domain.pdb +C:\Users\class_student\Source\Repos\presence\presence_api\bin\Debug\net8.0\data.pdb +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.csproj.AssemblyReference.cache +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.AssemblyInfoInputs.cache +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.AssemblyInfo.cs +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.csproj.CoreCompileInputs.cache +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.MvcApplicationPartsAssemblyInfo.cs +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.MvcApplicationPartsAssemblyInfo.cache +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\staticwebassets.build.json +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\staticwebassets.development.json +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\staticwebassets\msbuild.presence_api.Microsoft.AspNetCore.StaticWebAssets.props +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\staticwebassets\msbuild.build.presence_api.props +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\staticwebassets\msbuild.buildMultiTargeting.presence_api.props +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\staticwebassets\msbuild.buildTransitive.presence_api.props +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\staticwebassets.pack.json +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\scopedcss\bundle\presence_api.styles.css +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence.6C935717.Up2Date +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.dll +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\refint\presence_api.dll +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.pdb +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\presence_api.genruntimeconfig.cache +C:\Users\class_student\Source\Repos\presence\presence_api\obj\Debug\net8.0\ref\presence_api.dll diff --git a/presence_api/obj/Debug/net8.0/presence_api.dll b/presence_api/obj/Debug/net8.0/presence_api.dll index 5a01b10..4ae7781 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.dll and b/presence_api/obj/Debug/net8.0/presence_api.dll differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.genruntimeconfig.cache b/presence_api/obj/Debug/net8.0/presence_api.genruntimeconfig.cache index 79c5448..cf879f2 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.genruntimeconfig.cache +++ b/presence_api/obj/Debug/net8.0/presence_api.genruntimeconfig.cache @@ -1 +1 @@ -928f2d3632a04ed91ef0d37eed15f12807db8500ccf7327f64fcfa344c253b1f +6ecd3068866734fc03c93de85f2d75c0ad3492267871c9c6bbb55afbef02fa85 diff --git a/presence_api/obj/Debug/net8.0/presence_api.pdb b/presence_api/obj/Debug/net8.0/presence_api.pdb index b82e154..a7b3110 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.pdb and b/presence_api/obj/Debug/net8.0/presence_api.pdb differ diff --git a/presence_api/obj/Debug/net8.0/ref/presence_api.dll b/presence_api/obj/Debug/net8.0/ref/presence_api.dll index c740891..c930158 100644 Binary files a/presence_api/obj/Debug/net8.0/ref/presence_api.dll and b/presence_api/obj/Debug/net8.0/ref/presence_api.dll differ diff --git a/presence_api/obj/Debug/net8.0/refint/presence_api.dll b/presence_api/obj/Debug/net8.0/refint/presence_api.dll index c740891..c930158 100644 Binary files a/presence_api/obj/Debug/net8.0/refint/presence_api.dll and b/presence_api/obj/Debug/net8.0/refint/presence_api.dll differ diff --git a/presence_api/obj/presence_api.csproj.nuget.dgspec.json b/presence_api/obj/presence_api.csproj.nuget.dgspec.json index 5cc3302..e47597c 100644 --- a/presence_api/obj/presence_api.csproj.nuget.dgspec.json +++ b/presence_api/obj/presence_api.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj": {} + "C:\\Users\\class_student\\Source\\Repos\\presence\\presence_api\\presence_api.csproj": {} }, "projects": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "projectName": "data", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -84,14 +84,14 @@ } } }, - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "projectName": "domain", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -112,8 +112,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj" } } } @@ -158,14 +158,14 @@ } } }, - "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\presence_api\\presence_api.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\presence_api\\presence_api.csproj", "projectName": "presence_api", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\presence_api\\presence_api.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\presence_api\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -186,8 +186,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj" } } } diff --git a/presence_api/obj/project.assets.json b/presence_api/obj/project.assets.json index 87e88ad..e8e6621 100644 --- a/presence_api/obj/project.assets.json +++ b/presence_api/obj/project.assets.json @@ -1492,11 +1492,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\presence_api\\presence_api.csproj", "projectName": "presence_api", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\presence_api\\presence_api.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\presence_api\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -1517,8 +1517,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj" } } } diff --git a/presence_api/obj/project.nuget.cache b/presence_api/obj/project.nuget.cache index 4387149..7eab131 100644 --- a/presence_api/obj/project.nuget.cache +++ b/presence_api/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "ikXvASXc/Rkexe7ERiMNgD/DommsZr1j88s5EJUieLBAudeu/FD9X4LPlK0fHIJzxjo0vjxrOMWzCnQeUxzzbA==", + "dgSpecHash": "Wpv0GgUqF9c3N+U/qXq9dDp6NW5DUXDhQiVLWU04sXnDJSo9hDp27+WDSWo9VMpqc8dm6ZwhSi9it6pDrxY7Cw==", "success": true, - "projectFilePath": "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj", + "projectFilePath": "C:\\Users\\class_student\\Source\\Repos\\presence\\presence_api\\presence_api.csproj", "expectedPackageFiles": [ "C:\\Users\\class_student\\.nuget\\packages\\closedxml\\0.104.1\\closedxml.0.104.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\closedxml.parser\\1.2.0\\closedxml.parser.1.2.0.nupkg.sha512", diff --git a/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs b/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs index 3774552..4017776 100644 --- a/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs +++ b/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("ui")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bc831b38be994c037123ffa50725de305f577b7a")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+839362e7d0b5dfb5bcc210987efb21e47bd4ac2f")] [assembly: System.Reflection.AssemblyProductAttribute("ui")] [assembly: System.Reflection.AssemblyTitleAttribute("ui")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache b/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache index 4d57fef..4c9eb75 100644 --- a/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache +++ b/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache @@ -1 +1 @@ -fc0ee0e6e9c041021fa5120954c8ad79bd39a88413e329fab3af6c3e3c806ea1 +391e9260e62d6e70cb3fd6bb9205911949f0312befb654116889de2875e9e771 diff --git a/ui/obj/Debug/net8.0/ui.GeneratedMSBuildEditorConfig.editorconfig b/ui/obj/Debug/net8.0/ui.GeneratedMSBuildEditorConfig.editorconfig index 2224203..495c9ac 100644 --- a/ui/obj/Debug/net8.0/ui.GeneratedMSBuildEditorConfig.editorconfig +++ b/ui/obj/Debug/net8.0/ui.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = ui -build_property.ProjectDir = C:\Users\class_student\source\repos\presence\ui\ +build_property.ProjectDir = C:\Users\class_student\Source\Repos\presence\ui\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/ui/obj/Debug/net8.0/ui.assets.cache b/ui/obj/Debug/net8.0/ui.assets.cache index 8fab053..91caa0d 100644 Binary files a/ui/obj/Debug/net8.0/ui.assets.cache and b/ui/obj/Debug/net8.0/ui.assets.cache differ diff --git a/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache b/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache index df48bbc..ee4d1ff 100644 Binary files a/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache and b/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache differ diff --git a/ui/obj/project.assets.json b/ui/obj/project.assets.json index 4aecff8..2c044cb 100644 --- a/ui/obj/project.assets.json +++ b/ui/obj/project.assets.json @@ -1043,11 +1043,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj", "projectName": "ui", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -1068,8 +1068,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj" } } } diff --git a/ui/obj/project.nuget.cache b/ui/obj/project.nuget.cache index 9d6a3e9..c0e1490 100644 --- a/ui/obj/project.nuget.cache +++ b/ui/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "dNHY0PWkVJ9yqh4r350Pq7u6mnT7d9z4cJfYez8zScnFgIivUdw2P/yHSkjOeyGZ9zBEiinHHbXHbVE6f2TWUw==", + "dgSpecHash": "UDtkAdRAUkdfKYnXSV9thbENks9XnkdqJxQzV8WJrz/dXRAhXe29BSoGinF9t/xt0yLNRfkZq+UZ5giwkN+pjQ==", "success": true, - "projectFilePath": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj", + "projectFilePath": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj", "expectedPackageFiles": [ "C:\\Users\\class_student\\.nuget\\packages\\closedxml\\0.104.1\\closedxml.0.104.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\closedxml.parser\\1.2.0\\closedxml.parser.1.2.0.nupkg.sha512", diff --git a/ui/obj/ui.csproj.nuget.dgspec.json b/ui/obj/ui.csproj.nuget.dgspec.json index e69e4c2..ab47258 100644 --- a/ui/obj/ui.csproj.nuget.dgspec.json +++ b/ui/obj/ui.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj": {} + "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj": {} }, "projects": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "projectName": "data", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -84,14 +84,14 @@ } } }, - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "projectName": "domain", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -112,8 +112,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\data\\data.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\data\\data.csproj" } } } @@ -158,14 +158,14 @@ } } }, - "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj": { + "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj", + "projectUniqueName": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj", "projectName": "ui", - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\ui.csproj", + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\ui.csproj", "packagesPath": "C:\\Users\\class_student\\.nuget\\packages\\", - "outputPath": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\obj\\", + "outputPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\ui\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -186,8 +186,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj": { - "projectPath": "C:\\Users\\class_student\\source\\repos\\presence\\domain\\domain.csproj" + "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj": { + "projectPath": "C:\\Users\\class_student\\Source\\Repos\\presence\\domain\\domain.csproj" } } }