hi

123/Data/LocalData/Entity/Presence.cs

@@ -8,7 +8,7 @@ namespace _123.Data.LocalData.Entity
 {
     public class PresenceLocalEntity
     {
-        public required Guid UserGuid { get; set; }
+        public required int UserID { get; set; }
         public bool IsAttedance { get; set; } = true;
         public required DateOnly Date { get; set; }
 

123/Data/LocalData/Entity/User.cs

@@ -6,16 +6,12 @@ using System.Threading.Tasks;
 
 namespace _123.Data.LocalData.Entity
 {
-    public class UserLocalEntity : IEquatable<UserLocalEntity>
+    public class UserLocalEntity 
     {
         public required string UserFIO { get; set; }
-        public Guid UserGuid { get; set; }
+        public int UserId { get; set; }
 
         public required int GroupID { get; set; }
-        public bool Equals(UserLocalEntity? other)
+        
-        {
-            if (other == null) return false;
-            return this.UserGuid.Equals(other.UserGuid);
-        }
     }
 }

123/Data/LocalData/LocalStaticData.cs

@@ -18,12 +18,12 @@ namespace _123.Data.LocalData
         };
         public static List<UserLocalEntity> users => new List<UserLocalEntity>
         {
-            new UserLocalEntity{UserGuid=Guid.Parse("e6b9964d-ea9f-420a-84b9-af9633bbfab9"), UserFIO = "RandomFio", GroupID = 1 },
+            new UserLocalEntity{UserId = 1, UserFIO = "RandomFio", GroupID = 1 },
-            new UserLocalEntity{UserGuid=Guid.Parse("8388d931-5bef-41be-a152-78f1aca980ed"), UserFIO = "RandomFio1", GroupID = 2 },
+            new UserLocalEntity{UserId = 2, UserFIO = "RandomFio1", GroupID = 2 },
-            new UserLocalEntity{UserGuid=Guid.Parse("ed174548-49ed-4503-a902-c970cbf27173"), UserFIO = "RandomFio2", GroupID = 3 },
+            new UserLocalEntity{UserId = 3, UserFIO = "RandomFio2", GroupID = 3 },
-            new UserLocalEntity{UserGuid=Guid.Parse("614c0a23-5bd5-43ae-b48e-d5750afbc282"), UserFIO = "RandomFio3", GroupID = 1 },
+            new UserLocalEntity{UserId = 4, UserFIO = "RandomFio3", GroupID = 1 },
-            new UserLocalEntity{UserGuid=Guid.Parse("efcc1473-c116-4244-b3f7-f2341a5c3003"), UserFIO = "RandomFio4", GroupID = 2 },
+            new UserLocalEntity{UserId = 5, UserFIO = "RandomFio4", GroupID = 2 },
-            new UserLocalEntity{UserGuid=Guid.Parse("60640fb3-ace2-4cad-81d5-a0a58bc2dbbd"), UserFIO = "RandomFio5", GroupID = 3 },
+            new UserLocalEntity{UserId = 6, UserFIO = "RandomFio5", GroupID = 3 },
         };
         public static List<PresenceLocalEntity> presences => new List<PresenceLocalEntity>
         {

123/Data/RemoteData/RemoteDatabase/DAO/Presence.cs

@@ -13,7 +13,7 @@ namespace _123.Data.RemoteData.RemoteDatabase.DAO
 
         public required int LessonNumber { get; set; }
         public UserDao UserDao { get; set; }
-        public int UserId { get; set; }
+        public int UserID { get; set; }
         public int GroupId { get; set; }
     }
 }

123/Data/RemoteData/RemoteDatabase/RemoteDatabaseContext.cs

@@ -12,17 +12,17 @@ namespace _123.Data.RemoteData.RemoteDatabase
     {
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder.UseNpgsql();
+            optionsBuilder.UseNpgsql("Host = 45.67.56.214; Port = 5421; Username = user3; Database = user3; Password = VOTfZ8PQ");
         }
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<GroupDao>().HasKey(group => group.ID);
             modelBuilder.Entity<GroupDao>().Property(group => group.ID).ValueGeneratedOnAdd();
-            modelBuilder.Entity<UserDao>().HasKey(user => user.UserGuid);
+            modelBuilder.Entity<UserDao>().HasKey(user => user.UserID);
-            modelBuilder.Entity<UserDao>().Property(user => user.UserGuid).ValueGeneratedOnAdd();
+            modelBuilder.Entity<UserDao>().Property(user => user.UserID).ValueGeneratedOnAdd();
             modelBuilder.Entity<PresenceDao>().HasKey(presence => new
             {
-                presence.UserGuid,
+                presence.UserID,
                 presence.Date,
                 presence.IsAttedance,
                 presence.LessonNumber

123/Data/ReportsHistory/GroupRepositoty.cs

@@ -1,33 +0,0 @@
-using _123.Data.LocalData.Entity;
-using _123.Data.LocalData;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace _123.Data.ReportsHistory
-{
-
-        public class GroupRepositoryImpl
-        {
-            public List<GroupLocalEntity> GetAllGroups() => LocalStaticData.groups;
-
-        public GroupLocalEntity? UpdateGroup(String name)
-        {
-            GroupLocalEntity? groupLocal = GetAllGroups()
-                .Where(x => x.Name == name).FirstOrDefault();
-            if (groupLocal == null) return null;
-            groupLocal.Name = name;
-            return groupLocal;
-        }
-        public GroupLocalEntity AddGroup(String  name, String id)
-        {
-            GroupLocalEntity? groupLocal = GetAllGroups().FirstOrDefault();
-            groupLocal.Name = name;
-            groupLocal.ID = int.Parse(id);
-            return groupLocal;
-
-        }
-        }
-    }

123/Data/Repository/GroupRepositoty.cs

@@ -50,6 +50,16 @@ namespace _123.Data.Repository
            groupLocal.Name = name;
            return true;
         }
+
+        List<GroupDao> IGroupRepository.GetAllGroup()
+        {
+            throw new NotImplementedException();
+        }
+
+        GroupDao IGroupRepository.GetGroupById(int groupID)
+        {
+            throw new NotImplementedException();
+        }
     }
         }
     

123/Data/Repository/IGroupRepository.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace _123.Data.Repository
 {
-    internal interface IGroupRepository
+    public interface IGroupRepository
     {
         List<GroupDao> GetAllGroup();
         bool RemoveGroupById(int groupID);

123/Data/Repository/IPresenceRepository.cs

@@ -1,4 +1,5 @@
 using _123.Data.LocalData.Entity;
+using _123.Data.RemoteData.RemoteDatabase.DAO;
 using _123.Domain.Models;
 using System;
 using System.Collections.Generic;
@@ -8,11 +9,11 @@ using System.Threading.Tasks;
 
 namespace _123.Data.Repository
 {
-    internal interface IPresenceRepository
+    public interface IPresenceRepository
     {
         List<PresenceDao> GetPresenceByGroup(int groupId);
         List<PresenceDao>  GetPresenceByGroupAndDate(int groupId, DateOnly date);
-        bool UnCheckAttendence (int firstClass, int lastClass,  DateOnly date, Guid userGuid);
+        bool UnCheckAttendence (int firstClass, int lastClass,  DateOnly date, int UserId);
         void  AddPresence (PresenceDao presence);
 
     }

123/Data/Repository/IUserRepository.cs

@@ -8,13 +8,13 @@ using System.Threading.Tasks;
 
 namespace _123.Data.Repository
 {
-    internal interface IUserRepository
+    public interface IUserRepository
     {
         List<UserDao> GetAllUser();
-        bool RemoveUserByGuid(int userId);
+        bool RemoveUserById(int userId);
-        UserDao FindUserByGuid(Guid userGuid);
+        UserDao FindUserById(int userId);
-        UserDao? GetUserByGuid(int userId);
+        UserDao? GetUserById(int userId);
         UserDao? UpdateUser(UserDao userUpdate);
-        UserDao? UpdateUserByGuid(int userId);
+        UserDao? UpdateUserById(int userId);
     }
 }

123/Data/Repository/PresenceRepository.cs

@@ -1,5 +1,6 @@
 using _123.Data.LocalData;
 using _123.Data.LocalData.Entity;
+using _123.Data.RemoteData.RemoteDatabase.DAO;
 using _123.Domain.Models;
 using System;
 using System.Collections.Generic;
@@ -14,37 +15,33 @@ namespace _123.Data.Repository
     public class PresenceRepositoryImpl : IPresenceRepository
 
     {
-        public PresenceRepositoryImpl()
+        public List<PresenceDao> GetAllPresences
-        {
-            GetAllPresences = LocalStaticData.presences;
-        }
-        public List<PresenceLocalEntity> GetAllPresences
         { get; set; }
 
-        public void AddPresence(PresenceLocalEntity presence)
+        public void AddPresence(PresenceDao presence)
         {
-            PresenceLocalEntity? presenceLocal = GetAllPresences.FirstOrDefault();
+            PresenceDao? presenceLocal = GetAllPresences.FirstOrDefault();
-            presenceLocal.UserGuid = presence.UserGuid;
+            presenceLocal.UserID = presence.UserID;
             presenceLocal.Date = presence.Date;
             presenceLocal.IsAttedance = presence.IsAttedance;
             presenceLocal.LessonNumber = presence.LessonNumber;
 
         }
 
-        public List<PresenceLocalEntity> GetPresenceByGroup(int groupId)
+        public List<PresenceDao> GetPresenceByGroup(int groupId)
         {
             return GetAllPresences;
         }
 
-        public List<PresenceLocalEntity> GetPresenceByGroupAndDate(int groupId, DateOnly date)
+        public List<PresenceDao> GetPresenceByGroupAndDate(int groupId, DateOnly date)
         {
             return GetAllPresences;
         }
 
-        public bool UnCheckAttendence(int firstClass, int lastClass, DateOnly date, Guid userGuid)
+        public bool UnCheckAttendence(int firstClass, int lastClass, DateOnly date, int userId)
         {
             var presToUpdate = GetAllPresences
-                .Where(x => x.UserGuid == userGuid && x.LessonNumber >= firstClass
+                .Where(x => x.UserID == userId && x.LessonNumber >= firstClass
                 && x.LessonNumber <= lastClass && x.Date == date).ToList();
             foreach (var presence in presToUpdate)
             {

123/Data/Repository/SQLGroupRepository.cs

@@ -1,11 +1,13 @@
 using _123.Data.LocalData;
 using _123.Data.LocalData.Entity;
 using _123.Data.RemoteData.RemoteDatabase;
+using _123.Data.RemoteData.RemoteDatabase.DAO;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Xml.Linq;
 
 namespace _123.Data.Repository
 {
@@ -65,7 +67,13 @@ namespace _123.Data.Repository
             return new GroupDao
             {
                 ID = group.ID,
-                Name = group.Name
+                Name = group.Name,
+                Users = group.Users?.Select(u => new UserDao
+                {
+                    UserID = u.UserID,
+                    UserFIO = u.UserFIO,
+                    GroupID = group.ID
+                }).ToList() ?? new List<UserDao>()
             };
         }
 
@@ -77,10 +85,9 @@ namespace _123.Data.Repository
                     .FirstOrDefault(x => x.ID == groupID);
                 if (group == null) return false;
 
-                // Проверяем, есть ли связанные пользователи
                 if (group.Users != null && group.Users.Any())
                 {
-                    return false; // Нельзя удалить группу с пользователями
+                    return false;
                 }
 
                 _remoteDatabaseContext.Groups.Remove(group);

123/Data/Repository/SQLPresenceRepository.cs

@@ -1,6 +1,7 @@
 using _123.Data.LocalData;
 using _123.Data.LocalData.Entity;
 using _123.Data.RemoteData.RemoteDatabase;
+using _123.Data.RemoteData.RemoteDatabase.DAO;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,28 +21,28 @@ namespace _123.Data.Repository
 
         public void AddPresence(PresenceDao presence)
         {
-            _remoteDatabaseContext.Presences.Add(presence);
+            _remoteDatabaseContext.PresencesDaos.Add(presence);
             _remoteDatabaseContext.SaveChanges();
         }
 
         public List<PresenceDao> GetPresenceByGroup(int groupId)
         {
-            return _remoteDatabaseContext.Presences
+            return _remoteDatabaseContext.PresencesDaos
                 .Where(p => p.GroupId == groupId)
                 .ToList();
         }
 
         public List<PresenceDao> GetPresenceByGroupAndDate(int groupId, DateOnly date)
         {
-            return _remoteDatabaseContext.Presences
+            return _remoteDatabaseContext.PresencesDaos
                 .Where(p => p.GroupId == groupId && p.Date == date)
                 .ToList();
         }
 
-        public bool UnCheckAttendence(int firstClass, int lastClass, DateOnly date, Guid userGuid)
+        public bool UnCheckAttendence(int firstClass, int lastClass, DateOnly date, int userId)
         {
-            var presToUpdate = _remoteDatabaseContext.Presences
+            var presToUpdate = _remoteDatabaseContext.PresencesDaos
-                .Where(x => x.UserGuid == userGuid && x.LessonNumber >= firstClass
+                .Where(x => x.UserID == userId && x.LessonNumber >= firstClass
                 && x.LessonNumber <= lastClass && x.Date == date).ToList();
 
             foreach (var presence in presToUpdate)

123/Data/Repository/SQLUserRepository.cs

@@ -1,6 +1,7 @@
 using _123.Data.LocalData;
 using _123.Data.LocalData.Entity;
 using _123.Data.RemoteData.RemoteDatabase;
+using _123.Data.RemoteData.RemoteDatabase.DAO;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,10 +19,10 @@ namespace _123.Data.Repository
             _remoteDatabaseContext = remoteDatabaseContext;
         }
 
-        public UserDao FindUserByGuid(Guid userGuid)
+        public UserDao FindUserById(int userId)
         {
             var user = _remoteDatabaseContext.Users
-                .FirstOrDefault(x => x.UserID == userGuid);
+                .FirstOrDefault(x => x.UserID == userId);
             if (user == null) throw new Exception("Пользователь не найден");
             return user;
         }
@@ -39,13 +40,13 @@ namespace _123.Data.Repository
                 .ToList();
         }
 
-        public UserDao? GetUserByGuid(int userId)
+        public UserDao? GetUserById(int userId)
         {
             return _remoteDatabaseContext.Users
                 .FirstOrDefault(x => x.UserID == userId);
         }
 
-        public bool RemoveUserByGuid(int userId)
+        public bool RemoveUserById(int userId)
         {
             try
             {
@@ -83,7 +84,7 @@ namespace _123.Data.Repository
             }
         }
 
-        public UserDao? UpdateUserByGuid(int userId)
+        public UserDao? UpdateUserById(int userId)
         {
             return _remoteDatabaseContext.Users
                 .FirstOrDefault(x => x.UserID == userId);

123/Data/Repository/UserRepositoty.cs

@@ -16,55 +16,55 @@ namespace _123.Data.ReportsHistory
         public UserRepositoryImpl()
         {
 
-            GetAllUsers = LocalStaticData.users;
+            GetAllUsers = LocalStaticData.users.Select(it => new UserDao { GroupID  = it.GroupID, UserFIO = it.UserFIO, UserID = it.UserId}).ToList();
         }
-        public List<UserLocalEntity> GetAllUsers
+        public List<UserDao> GetAllUsers
         { get; set; }
 
-        public List<UserLocalEntity> GetAllUser()
+        public List<UserDao> GetAllUser()
         {
             return GetAllUsers;
         }
-        public bool RemoveUserByGuid(Guid userGuid)
+        public bool RemoveUserById(int userId)
         {
-            UserLocalEntity? userLocal = GetAllUsers
+            UserDao? userLocal = GetAllUsers
-                .Where(x => x.UserGuid == userGuid).FirstOrDefault();
+                .Where(x => x.UserID == userId).FirstOrDefault();
             if (userLocal == null) return false;
 
             return GetAllUsers.Remove(userLocal);
         }
-        public UserLocalEntity FindUserByGuid(Guid userGuid)
+        public UserDao FindUserById(int userId)
         {
-            UserLocalEntity? userLocal = GetAllUsers
+            UserDao? userLocal = GetAllUsers
-                .Where(x => x.UserGuid == userGuid).FirstOrDefault();
+                .Where(x => x.UserID == userId).FirstOrDefault();
             if (userLocal == null) throw new Exception("Пользователь не найден");
             return userLocal; 
         }
 
 
-        public UserLocalEntity? GetUserByGuid(Guid userGuid)
+        public UserDao? GetUserById(int userId)
         {
-            UserLocalEntity? userLocal = GetAllUsers
+            UserDao? userLocal = GetAllUsers
-                    .Where(x => x.UserGuid == userGuid).FirstOrDefault();
+                    .Where(x => x.UserID == userId).FirstOrDefault();
             if (userLocal == null) return null;
 
             return userLocal;
         }
 
-        public UserLocalEntity? UpdateUser(UserLocalEntity userUpdateLocalEnity)
+        public UserDao? UpdateUser(UserDao userUpdateDao)
         {
-            UserLocalEntity? userLocal = GetAllUsers
+            UserDao? userLocal = GetAllUsers
-                    .Where(x => x.UserGuid == userUpdateLocalEnity.UserGuid).FirstOrDefault();
+                    .Where(x => x.UserID == userUpdateDao.UserID).FirstOrDefault();
             if (userLocal == null) return null;
-            userLocal.UserFIO = userUpdateLocalEnity.UserFIO;
+            userLocal.UserFIO = userUpdateDao.UserFIO;
-            userLocal.GroupID = userUpdateLocalEnity.GroupID;
+            userLocal.GroupID = userUpdateDao.GroupID;
             return userLocal;
 
         }
-        public UserLocalEntity? UpdateUserByGuid(Guid userGuid)
+        public UserDao? UpdateUserById(int userId)
         {
-            UserLocalEntity? userLocal = GetAllUsers
+            UserDao? userLocal = GetAllUsers
-                    .Where(x => x.UserGuid == userGuid).FirstOrDefault();
+                    .Where(x => x.UserID == userId).FirstOrDefault();
             if (userLocal == null) return null;
             return userLocal;
 

123/Domain/Models/User.cs

@@ -9,7 +9,7 @@ namespace _123.Domain.Models
     public class User
     {
         public required string UserFIO { get; set; }
-        public Guid UserGuid { get; set; }
+        public int UserID { get; set; }
 
         public required Group UserGroup { get; set; }
     }

123/Domain/UseCase/GroupUseCase.cs

@@ -12,13 +12,13 @@ namespace _123.Domain.UseCase
 {
     public class GroupUseCase
     {
-        private readonly SQLGroupRepositoryImpl _repositoryGroupImpl;
+        private readonly IGroupRepository _repositoryGroupImpl;
-        public GroupUseCase(SQLGroupRepositoryImpl repositoryGroupImpl)
+        public GroupUseCase(IGroupRepository repositoryGroupImpl)
         {
             _repositoryGroupImpl = repositoryGroupImpl;
         }
 
-        public List<Group> GetAllGroups() => _repositoryGroupImpl.GetAllGroups()
+        public List<Group> GetAllGroups() => _repositoryGroupImpl.GetAllGroup()
              .Select(it => new Group { ID = it.ID, Name = it.Name }).ToList();
 
         public bool UpdateGroupName(string id, string name)
@@ -42,9 +42,5 @@ namespace _123.Domain.UseCase
         {
             return _repositoryGroupImpl.RemoveGroupById(id);
         }
-        public GroupLocalEntity AddGroup(String name, string id)
-        {
-            return _repositoryGroupImpl.AddGroup(name, id);
-        }
     }
 }

123/Domain/UseCase/PresenceUseCase.cs

@@ -13,50 +13,50 @@ namespace _123.Domain.UseCase
 {
     public class PresenceUseCase
     {
-        private readonly SQLPresenceRepositoryImpl _presenceRepositoryImpl;
+        private readonly IPresenceRepository _presenceRepositoryImpl;
-        private readonly SQLGroupRepositoryImpl _groupRepositoryImpl;
+        private readonly IGroupRepository _groupRepositoryImpl;
-        private readonly SQLUserRepositoryImpl _userRepositoryImpl;
+        private readonly IUserRepository _userRepositoryImpl;
         public List<Presence> GetPresenceByGroup(int groupId)
         {
-            var users = _userRepositoryImpl.GetAllUsers.Where(x => x.GroupID == groupId).ToList();
+            var users = _userRepositoryImpl.GetAllUser().Where(x => x.GroupID == groupId).ToList();
 
             var presenceByGroup = _presenceRepositoryImpl.GetPresenceByGroup(groupId)
-            .Where(x => users.Any(user => user.UserGuid == x.UserGuid))
+            .Where(x => users.Any(user => user.UserID == x.UserID))
             .Select(presence => new Presence
             {
                 User = new User
                 {
-                    UserGuid = presence.UserGuid,
+                    UserID = presence.UserID,
                     UserGroup = new Group
                     {
                         ID = groupId,
-                        Name = _groupRepositoryImpl.GetAllGroups().First(group => group.ID == groupId).Name
+                        Name = _groupRepositoryImpl.GetAllGroup().First(group => group.ID == groupId).Name
                     },
-                    UserFIO = users.First(user => user.UserGuid == presence.UserGuid).UserFIO,
+                    UserFIO = users.First(user => user.UserID == presence.UserID).UserFIO,
                 },
                 ClassNum = presence.LessonNumber,
                 Date = presence.Date,
                 IsAttedance = presence.IsAttedance,
             }).ToList();
-            return presenceByGroup;
+            return (List<Presence>)presenceByGroup;
         }
         public List<Presence> GetPresenceByGroupAndDate(int groupId, DateOnly date)
         {
-            var users = _userRepositoryImpl.GetAllUsers.Where(x => x.GroupID == groupId).ToList();
+            var users = _userRepositoryImpl.GetAllUser().Where(x => x.GroupID == groupId).ToList();
 
             var presenceByGroup = _presenceRepositoryImpl.GetPresenceByGroup(groupId)
-            .Where(x => users.Any(user => user.UserGuid == x.UserGuid && x.Date == date))
+            .Where(x => users.Any(user => user.UserID == x.UserID && x.Date == date))
             .Select(presence => new Presence
             {
                 User = new User
                 {
-                    UserGuid = presence.UserGuid,
+                    UserID = presence.UserID,
                     UserGroup = new Group
                     {
                         ID = groupId,
-                        Name = _groupRepositoryImpl.GetAllGroups().First(group => group.ID == groupId).Name
+                        Name = _groupRepositoryImpl.GetAllGroup().First(group => group.ID == groupId).Name
                     },
-                    UserFIO = users.First(user => user.UserGuid == presence.UserGuid).UserFIO,
+                    UserFIO = users.First(user => user.UserID == presence.UserID).UserFIO,
                 },
                 ClassNum = presence.LessonNumber,
                 Date = presence.Date,
@@ -64,10 +64,44 @@ namespace _123.Domain.UseCase
             }).ToList();
             return presenceByGroup;
         }
-        public bool UnCheckAttendance(int firstClass, int lastClass, DateOnly date, Guid userGuid)
+        public bool UnCheckAttendance(int firstClass, int lastClass, DateOnly date, int userID)
         {
-            return _presenceRepositoryImpl.UnCheckAttendence(firstClass, lastClass, date, userGuid);
+            return _presenceRepositoryImpl.UnCheckAttendence(firstClass, lastClass, date, userID);
         }
 
+        public Dictionary<string, int> GetPresenceStatsByGroup(int groupId)
+        {
+            var stats = new Dictionary<string, int>();
+
+            // Получаем всех студентов группы
+            var users = _userRepositoryImpl.GetAllUser().Where(x => x.GroupID == groupId).ToList();
+            stats["Количество студентов"] = users.Count;
+
+            // Получаем все записи посещаемости для группы
+            var presences = _presenceRepositoryImpl.GetPresenceByGroup(groupId);
+
+            // Считаем количество уникальных занятий
+            var uniqueLessons = presences
+                .Select(p => new { p.Date, p.LessonNumber })
+                .Distinct()
+                .Count();
+            stats["Количество занятий"] = uniqueLessons;
+
+            // Считаем общую посещаемость
+            var totalAttendances = presences.Count(p => p.IsAttedance);
+            var totalPossibleAttendances = users.Count * uniqueLessons;
+
+            if (totalPossibleAttendances > 0)
+            {
+                var attendancePercentage = (totalAttendances * 100) / totalPossibleAttendances;
+                stats["Процент посещаемости"] = attendancePercentage;
+            }
+            else
+            {
+                stats["Процент посещаемости"] = 0;
+            }
+
+            return stats;
+        }
     }
 }

123/Domain/UseCase/UseCaseGeneratePresence.cs

@@ -32,7 +32,7 @@ namespace _123.Domain.UseCase
             {
                 foreach (var user in users)
                 {
-                    PresenceLocalEntity pres = new PresenceLocalEntity { LessonNumber = i, UserGuid = user.UserGuid, Date = date };
+                    PresenceLocalEntity pres = new PresenceLocalEntity { LessonNumber = i, UserID = user.UserID, Date = date };
                 }
             }
         }
@@ -53,7 +53,7 @@ namespace _123.Domain.UseCase
                         PresenceLocalEntity pres = new PresenceLocalEntity
                         {
                             LessonNumber = i,
-                            UserGuid = user.UserGuid,
+                            UserID = user.UserID,
                             Date = date
                         };
                         presence.Add(pres);

123/Domain/UseCase/UserUseCase.cs

@@ -13,34 +13,34 @@ namespace _123.Domain.UseCase
 {
     public class UserUseCase
     {
-        private readonly SQLUserRepositoryImpl _repositoryUserImpl;
+        private readonly IUserRepository _repositoryUserImpl;
-        private readonly SQLGroupRepositoryImpl _repositoryGroupImpl;
+        private readonly IGroupRepository _repositoryGroupImpl;
 
-        public UserUseCase(SQLUserRepositoryImpl repositoryImpl, SQLGroupRepositoryImpl repositoryGroupImpl)
+        public UserUseCase(IUserRepository repositoryImpl, IGroupRepository repositoryGroupImpl)
         {
             _repositoryUserImpl = repositoryImpl;
             _repositoryGroupImpl = repositoryGroupImpl;
         }
 
-        public List<Group> GetAllGroups() => _repositoryGroupImpl.GetAllGroups()
+        public List<Group> GetAllGroups() => _repositoryGroupImpl.GetAllGroup()
               .Select(it => new Group { ID = it.ID, Name = it.Name }).ToList();
 
         public List<User> GetAllUsers() => _repositoryUserImpl.GetAllUser()
-              .Join(_repositoryGroupImpl.GetAllGroups(),
+              .Join(_repositoryGroupImpl.GetAllGroup(),
               user => user.GroupID,
               group => group.ID,
               (user, group) =>
               new User
               {
                   UserFIO = user.UserFIO,
-                  UserGuid = user.UserID,
+                  UserID = user.UserID,
                   UserGroup = new Group { ID = group.ID, Name = group.Name }
               }
             ).ToList();
 
         public bool RemoveUserByGuid(int userId)
         {
-            return _repositoryUserImpl.RemoveUserByGuid(userId);
+            return _repositoryUserImpl.RemoveUserById(userId);
         }
 
         public User UpdateUser(User user)
@@ -48,23 +48,29 @@ namespace _123.Domain.UseCase
             UserDao userDao = new UserDao { 
                 UserFIO = user.UserFIO, 
                 GroupID = user.UserGroup.ID, 
-                UserID = user.UserGuid 
+                UserID = user.UserID 
             };
             UserDao? result = _repositoryUserImpl.UpdateUser(userDao);
             if (result == null) throw new Exception("Не удалось обновить пользователя");
             Group? group = GetAllGroups().FirstOrDefault(it => it.ID == result.GroupID);
             if (group == null) throw new Exception("Группа не найдена");
-            return new User { UserFIO = user.UserFIO, UserGuid = user.UserGuid, UserGroup = group };
+            return new User { UserFIO = user.UserFIO, UserID = user.UserID, UserGroup = group };
         }
 
-        public UserDao FindUserByGuid(int userId)
+        public User FindUserByGuid(int userId)
         {
-            return _repositoryUserImpl.FindUserByGuid(userId);
+            var userDao = _repositoryUserImpl.FindUserById(userId);
+            return new User 
+            { 
+                UserID = userDao.UserID,
+                UserFIO = userDao.UserFIO,
+                UserGroup = GetAllGroups().FirstOrDefault(g => g.ID == userDao.GroupID)
+            };
         }
 
         public UserDao UpdateUserByGuid(int userId, string name, string groupId)
         {
-            UserDao? result = _repositoryUserImpl.UpdateUserByGuid(userId);
+            UserDao? result = _repositoryUserImpl.UpdateUserById(userId);
             if (result == null) throw new Exception("Пользователь не найден");
             Group? group = GetAllGroups().FirstOrDefault(it => it.ID == int.Parse(groupId));
             if (group == null) throw new Exception("Группа не найдена");

123/Program.cs

@@ -15,15 +15,8 @@ services
     .AddDbContext<RemoteDatabaseContext>()
     .AddSingleton<IPresenceRepository, SQLPresenceRepositoryImpl>()
     .AddSingleton<IUserRepository, SQLUserRepositoryImpl>()
-    .AddSingleton<IGroupRepository, SQLGroupRepositoryImpl>()
+    .AddSingleton<IGroupRepository, SQLGroupRepositoryImpl>();
 var serviceProvider = services.BuildServiceProvider ();
 
-GroupRepositoryImpl groupRepositoryImpl = new GroupRepositoryImpl();
+var mainMenuUI = serviceProvider.GetRequiredService<MainMenuUI>();
-UserRepositoryImpl userRepositoryImpl = new UserRepositoryImpl();
-UserUseCase userUseCase = new UserUseCase(userRepositoryImpl, groupRepositoryImpl);
-GroupUseCase groupUseCase = new GroupUseCase(groupRepositoryImpl);
-PresenceRepositoryImpl presenceRepositoryImpl = new PresenceRepositoryImpl();
-PresenceUseCase presenceUseCase = new PresenceUseCase();
-
-MainMenuUI mainMenuUI = new MainMenuUI(userUseCase, groupUseCase, presenceUseCase);
 

123/UI/GroupConsole.cs

@@ -31,16 +31,10 @@ namespace _123.UI
         }
         public void AddGroup (String name, String id)
         {
-            StringBuilder groupOutput = new StringBuilder();
+            string output = _groupUseCase.AddGroup(name , id) ? "Группа добавлена" : "Группа не добавлена";
-            var group = _groupUseCase.AddGroup(name,id);
+            Console.WriteLine(output);
-<<<<<<< HEAD
-=======
-            {
-                groupOutput.AppendLine($"{group.Name}\t{group.ID}");
-            }
-            Console.WriteLine(groupOutput);
->>>>>>> b274d8f88d0df85505fa497de11d07625bde956d
         }
         
+        
     }
 }

123/UI/MainMenu.cs

@@ -33,7 +33,7 @@ namespace _123.UI
                 switch (Console.ReadLine())
                 {
                     case "1": _userConsoleUI.DisplayAllUsers(); break;
-                    case "2": _userConsoleUI.RemoveUserByGuid(Guid.Parse(Console.ReadLine())); break;
+                    case "2": _userConsoleUI.RemoveUserById(int.Parse(Console.ReadLine())); break;
                     case "3": _groupConsoleUI.DisplayAllGroups(); break;
                     case "4": _userConsoleUI.FindUserById(int.Parse(Console.ReadLine())); break;
                     case "5": _userConsoleUI.UpdateUserById(int.Parse(Console.ReadLine()), Console.ReadLine(), Console.ReadLine()); break;
@@ -41,7 +41,7 @@ namespace _123.UI
                     case "7": _groupConsoleUI.AddGroup(Console.ReadLine(), Console.ReadLine()); break;
                     case "8": _presenceConsoleUI.GetPresenceByGroup(int.Parse(Console.ReadLine())); break;
                     case "9": _presenceConsoleUI.GetPresenceByGroupAndDAte(int.Parse(Console.ReadLine()), DateOnly.Parse(Console.ReadLine())); break;
-                    case "10": _presenceConsoleUI.UnCheckAttendence(int.Parse(Console.ReadLine()), int.Parse(Console.ReadLine()), DateOnly.Parse(Console.ReadLine()), Guid.Parse(Console.ReadLine())); break;
+                    case "10": _presenceConsoleUI.UnCheckAttendence(int.Parse(Console.ReadLine()), int.Parse(Console.ReadLine()), DateOnly.Parse(Console.ReadLine()), int.Parse(Console.ReadLine())); break;
                     case "11": _presenceConsoleUI.AddPresence(int.Parse(Console.ReadLine()), int.Parse(Console.ReadLine()), int.Parse(Console.ReadLine()), DateOnly.Parse(Console.ReadLine())); break;
 
                     default:

123/UI/PresenceConsole.cs

@@ -11,6 +11,7 @@ namespace _123.UI
     {
         PresenceUseCase _presenceUseCase;
         UseCaseGeneratePresence _useCaseGeneratePresence;
+        private PresenceUseCase presenceUseCase;
 
         public PresenceConsoleUI(PresenceUseCase presenceUseCase, UseCaseGeneratePresence useCaseGeneratePresence)
         {
@@ -18,13 +19,18 @@ namespace _123.UI
             _useCaseGeneratePresence = useCaseGeneratePresence;
         }
 
+        public PresenceConsoleUI(PresenceUseCase presenceUseCase)
+        {
+            this.presenceUseCase = presenceUseCase;
+        }
+
         public void GetPresenceByGroup(int groupId)
         {
             StringBuilder presenceOutput = new StringBuilder();
             var presence = _presenceUseCase.GetPresenceByGroup(groupId);
             foreach (var p in presence)
             {
-                presenceOutput.AppendLine($"{p.LessonNumber}\t{p.UserGuid}\t{p.Date}");
+                presenceOutput.AppendLine($"{p.ClassNum}\t{p.User}\t{p.Date}");
             }
             Console.WriteLine(presenceOutput);
         }
@@ -35,14 +41,14 @@ namespace _123.UI
             var presence = _presenceUseCase.GetPresenceByGroupAndDate(groupId, date);
             foreach (var p in presence)
             {
-                presenceOutput.AppendLine($"{p.LessonNumber}\t{p.UserGuid}\t{p.Date}");
+                presenceOutput.AppendLine($"{p.ClassNum}\t{p.User}\t{p.Date}");
             }
             Console.WriteLine(presenceOutput);
         }
 
-        public void UnCheckAttendence(int firstClass, int lastClass, DateOnly date, Guid userGuid)
+        public void UnCheckAttendence(int firstClass, int lastClass, DateOnly date, int userId)
         {
-            var result = _presenceUseCase.UnCheckAttendance(firstClass, lastClass, date, userGuid);
+            var result = _presenceUseCase.UnCheckAttendance(firstClass, lastClass, date, userId);
             Console.WriteLine(result ? "Посещаемость успешно обновлена" : "Ошибка при обновлении посещаемости");
         }
 
@@ -58,27 +64,36 @@ namespace _123.UI
                 Console.WriteLine($"Ошибка при добавлении посещаемости: {ex.Message}");
             }
         }
-         public void GetGroupAttendanceStats(int groupId)
+        public void GetPresenceStatsByGroup(int groupId)
         {
-            StringBuilder statsOutput = new StringBuilder();
+            var stats = _presenceUseCase.GetPresenceStatsByGroup(groupId);
-            var groupStats = _presenceUseCase.GetGroupStats(groupId);
+            StringBuilder output = new StringBuilder();
 
-            statsOutput.AppendLine($"Информация о группе {groupStats.GroupName}:");
+            output.AppendLine($"Информация о группе {groupId}:");
-            statsOutput.AppendLine($"Количество студентов: {groupStats.StudentsCount}");
+            output.AppendLine($"Количество студентов: {stats["Количество студентов"]}");
-            statsOutput.AppendLine($"Количество проведенных занятий: {groupStats.TotalLessons}");
+            output.AppendLine($"Количество занятий: {stats["Количество занятий"]}");
-            statsOutput.AppendLine($"Общий процент посещаемости: {groupStats.TotalAttendancePercent:F1}%");
+            output.AppendLine($"Общий процент посещаемости: {stats["Процент посещаемости"]}%");
-            statsOutput.AppendLine("\nСтатистика по студентам:");
+            output.AppendLine("\nСтатистика по студентам:");
-            statsOutput.AppendLine("ФИО\tПосещено\tПропущено\tПроцент посещаемости");
 
-            foreach(var student in groupStats.StudentStats)
+            var presence = _presenceUseCase.GetPresenceByGroup(groupId);
+            var students = presence.GroupBy(p => p.User)
+                                 .Select(g => new {
+                                     Student = g.Key,
+                                     Total = stats["Количество занятий"],
+                                     Attended = g.Count(p => p.IsAttedance),
+                                     Missed = stats["Количество занятий"] - g.Count(p => p.IsAttedance),
+                                     Percentage = (g.Count(p => p.IsAttedance) * 100) / stats["Количество занятий"]
+                                 });
+
+            foreach (var student in students)
             {
-                statsOutput.AppendLine(
+                output.AppendLine($"\nСтудент: {student.Student.UserFIO}");
-                    $"{student.StudentName}\t{student.AttendedLessons}\t" +
+                output.AppendLine($"Посещено занятий: {student.Attended}");
-                    $"{student.MissedLessons}\t{student.AttendancePercent:F1}%"
+                output.AppendLine($"Пропущено занятий: {student.Missed}");
-                );
+                output.AppendLine($"Процент посещаемости: {student.Percentage}%");
             }
 
-            Console.WriteLine(statsOutput.ToString());
+            Console.WriteLine(output.ToString());
         }
     }
        

123/UI/UserConsole.cs

@@ -37,7 +37,7 @@ namespace _123.UI
         {
             StringBuilder userOutput = new StringBuilder();
             var user = _userUseCase.FindUserByGuid(userId);
-            userOutput.AppendLine($"{user.UserID}\t{user.UserFIO}\t{user.GroupID}");
+            userOutput.AppendLine($"{user.UserID}\t{user.UserFIO}\t{user.UserGroup}");
             Console.WriteLine(userOutput);
         }