Fix many-to-many relationships

NG_2023_Kanban.BusinessLayer/Models/BoardModel.cs

@@ -4,8 +4,8 @@
     {
         public string Name { get; set; }
 
-        public virtual ICollection<UserModel>? Users { get; set; } = new HashSet<UserModel>();
+        public ICollection<UserModel> Users { get; set; } = new List<UserModel>();
 
-        public virtual ICollection<ColumnModel>? Columns { get; set; } = new HashSet<ColumnModel>(); 
+        public ICollection<ColumnModel> Columns { get; set; } = new List<ColumnModel>();
     }
 }

NG_2023_Kanban.BusinessLayer/Models/CardModel.cs

@@ -8,10 +8,10 @@
         public int ColumnId { get; set; }
         public int SenderId { get; set; }
 
-        public virtual UserModel Assigned { get; set; }
-        public virtual ColumnModel Column { get; set; }
-        public virtual UserModel Sender { get; set; }
+        public UserModel Assigned { get; set; }
+        public ColumnModel Column { get; set; }
+        public UserModel Sender { get; set; }
 
-        public virtual ICollection<CommentModel> Comments { get; set; } = new HashSet<CommentModel>();
+        public ICollection<CommentModel> Comments { get; set; } = new List<CommentModel>();
     }
 }

NG_2023_Kanban.BusinessLayer/Models/ColumnModel.cs

@@ -5,8 +5,8 @@
         public string Name { get; set; }
         public int BoardId { get; set; }
 
-        public virtual BoardModel Board { get; set; }
+        public BoardModel Board { get; set; }
 
-        public virtual ICollection<CardModel>? Cards { get; set; } = new HashSet<CardModel>();
+        public ICollection<CardModel> Cards { get; set; } = new List<CardModel>();
     }
 }

NG_2023_Kanban.BusinessLayer/Models/CommentModel.cs

@@ -6,7 +6,7 @@
         public int SenderId { get; set; }
         public int CardId { get; set; }
 
-        public virtual UserModel? Sender { get; set; }
-        public virtual CardModel? Card { get; set; }
+        public UserModel Sender { get; set; }
+        public CardModel Card { get; set; }
     }
 }

NG_2023_Kanban.BusinessLayer/Models/RoleModel.cs

@@ -4,6 +4,6 @@
     {
         public string Name { get; set; }
 
-        public virtual ICollection<UserModel>? Members { get; set; } = new HashSet<UserModel>();
+        public ICollection<UserModel> Members { get; set; } = new List<UserModel>();
     }
 }

NG_2023_Kanban.BusinessLayer/Models/UserModel.cs

@@ -7,10 +7,10 @@ namespace NG_2023_Kanban.BusinessLayer.Models
         public string Username { get; set; }
         public string Password { get; set; }
 
-        public virtual ICollection<BoardModel>? Boards { get; set; } = new HashSet<BoardModel>();
-        public virtual ICollection<CardModel>? CardsAssigned { get; set; } = new HashSet<CardModel>();
-        public virtual ICollection<CardModel>? CardsSent { get; set; } = new HashSet<CardModel>();
-        public virtual ICollection<CommentModel>? Comments { get; set; } = new HashSet<CommentModel>();
-        public virtual ICollection<RoleModel>? Roles { get; set; } = new HashSet<RoleModel>();
+        public ICollection<BoardModel> Boards { get; set; } = new List<BoardModel>();
+        public ICollection<CardModel> CardsAssigned { get; set; } = new List<CardModel>();
+        public ICollection<CardModel> CardsSent { get; set; } = new List<CardModel>();
+        public ICollection<CommentModel> Comments { get; set; } = new List<CommentModel>();
+        public ICollection<RoleModel> Roles { get; set; } = new List<RoleModel>();
     }
 }

NG_2023_Kanban.DataLayer/Entities/Board.cs

@@ -4,8 +4,8 @@
     {
         public string Name { get; set; }
 
-        public virtual ICollection<User>? Users { get; set; } = new HashSet<User>();
+        public ICollection<User> Users { get; set; } = new List<User>();
 
-        public virtual ICollection<Column>? Columns { get; set; } = new HashSet<Column>(); 
+        public ICollection<Column> Columns { get; set; } = new List<Column>();
     }
 }

NG_2023_Kanban.DataLayer/Entities/Card.cs

@@ -8,10 +8,10 @@
         public int ColumnId { get; set; }
         public int SenderId { get; set; }
 
-        public virtual User Assigned { get; set; }
-        public virtual Column Column { get; set; }
-        public virtual User Sender { get; set; }
+        public User Assigned { get; set; }
+        public Column Column { get; set; }
+        public User Sender { get; set; }
 
-        public virtual ICollection<Comment> Comments { get; set; } = new HashSet<Comment>();
+        public ICollection<Comment> Comments { get; set; } = new List<Comment>();
     }
 }

NG_2023_Kanban.DataLayer/Entities/Column.cs

@@ -5,8 +5,8 @@
         public string Name { get; set; }
         public int BoardId { get; set; }
 
-        public virtual Board Board { get; set; }
+        public Board Board { get; set; }
 
-        public virtual ICollection<Card>? Cards { get; set; } = new HashSet<Card>();
+        public ICollection<Card> Cards { get; set; } = new List<Card>();
     }
 }

NG_2023_Kanban.DataLayer/Entities/Comment.cs

@@ -6,7 +6,7 @@
         public int SenderId { get; set; }
         public int CardId { get; set; }
 
-        public virtual User? Sender { get; set; }
-        public virtual Card? Card { get; set; }
+        public User Sender { get; set; }
+        public Card Card { get; set; }
     }
 }

NG_2023_Kanban.DataLayer/Entities/Role.cs

@@ -4,6 +4,6 @@
     {
         public string Name { get; set; }
 
-        public virtual ICollection<User>? Members { get; set; } = new HashSet<User>();
+        public virtual ICollection<User> Members { get; set; } = new List<User>();
     }
 }

NG_2023_Kanban.DataLayer/Entities/User.cs

@@ -7,10 +7,10 @@ namespace NG_2023_Kanban.DataLayer.Entities
         public string Username { get; set; }
         public string Password { get; set; }
 
-        public virtual ICollection<Board>? Boards { get; set; } = new HashSet<Board>();
-        public virtual ICollection<Card>? CardsAssigned { get; set; } = new HashSet<Card>();
-        public virtual ICollection<Comment>? Comments { get; set; } = new HashSet<Comment>();
-        public virtual ICollection<Card>? CardsSent { get; set; } = new HashSet<Card>();
-        public virtual ICollection<Role>? Roles { get; set; } = new HashSet<Role>();
+        public ICollection<Board> Boards { get; set; } = new List<Board>();
+        public ICollection<Card> CardsAssigned { get; set; } = new List<Card>();
+        public ICollection<Comment> Comments { get; set; } = new List<Comment>();
+        public ICollection<Card> CardsSent { get; set; } = new List<Card>();
+        public ICollection<Role> Roles { get; set; } = new List<Role>();
     }
 }

NG_2023_Kanban.DataLayer/EntityConfiguration/UserConfiguration.cs

@@ -17,14 +17,6 @@ namespace NG_2023_Kanban.DataLayer.EntityConfiguration
             builder.HasIndex(x => x.Username).IsUnique(true);
             builder.Property(x => x.Username).IsRequired();
             builder.Property(x => x.Password).IsRequired();
-
-            builder
-                .HasMany(x => x.Boards)
-                .WithMany(x => x.Users);
-
-            builder
-                .HasMany(x => x.Roles)
-                .WithMany(x => x.Members);
         }
     }
 }

NG_2023_Kanban.DataLayer/Repositories/BaseRepository.cs

@@ -8,7 +8,7 @@ namespace NG_2023_Kanban.DataLayer.Repositories;
 
 public class BaseRepository<T> : IRepository<T> where T : BaseEntity
 {
-    private DatabaseContext _context;
+    protected DatabaseContext _context;
 
     public BaseRepository(DatabaseContext context)
         => _context = context;

NG_2023_Kanban.DataLayer/Repositories/BoardRepository.cs

@@ -1,10 +1,23 @@
 using NG_2023_Kanban.DataLayer.DbStartup;
 using NG_2023_Kanban.DataLayer.Entities;
 using NG_2023_Kanban.DataLayer.Interfaces;
+using Microsoft.EntityFrameworkCore;
 
 namespace NG_2023_Kanban.DataLayer.Repositories;
 
 public class BoardRepository : BaseRepository<Board>, IBoardRepository
 {
     public BoardRepository(DatabaseContext context) : base(context) { }
+
+    public async Task<ICollection<Board>> GetAllAsync()
+        => await _context.Set<Board>().Select(x => x).
+           Include(x => x.Users).
+           Include(x => x.Columns).
+           ToListAsync();
+
+    public async Task<Board> GetAsync(int id)
+        => await _context.Set<Board>().
+           Include(x => x.Users).
+           Include(x => x.Columns).
+           FirstAsync(x => x.Id == id);
 }

NG_2023_Kanban.DataLayer/Repositories/CardRepository.cs

@@ -1,10 +1,21 @@
 using NG_2023_Kanban.DataLayer.DbStartup;
 using NG_2023_Kanban.DataLayer.Entities;
 using NG_2023_Kanban.DataLayer.Interfaces;
+using Microsoft.EntityFrameworkCore;
 
 namespace NG_2023_Kanban.DataLayer.Repositories;
 
 public class CardRepository : BaseRepository<Card>, ICardRepository
 {
     public CardRepository(DatabaseContext context) : base(context) { }
+
+    public async Task<ICollection<Card>> GetAllAsync()
+        => await _context.Set<Card>().Select(x => x).
+           Include(x => x.Comments).
+           ToListAsync();
+
+    public async Task<Card> GetAsync(int id)
+        => await _context.Set<Card>().
+           Include(x => x.Comments).
+           FirstAsync(x => x.Id == id);
 }

NG_2023_Kanban.DataLayer/Repositories/ColumnRepository.cs

@@ -1,10 +1,21 @@
 using NG_2023_Kanban.DataLayer.DbStartup;
 using NG_2023_Kanban.DataLayer.Entities;
 using NG_2023_Kanban.DataLayer.Interfaces;
+using Microsoft.EntityFrameworkCore;
 
 namespace NG_2023_Kanban.DataLayer.Repositories;
 
 public class ColumnRepository : BaseRepository<Column>, IColumnRepository
 {
     public ColumnRepository(DatabaseContext context) : base(context) { }
+
+    public async Task<ICollection<Column>> GetAllAsync()
+        => await _context.Set<Column>().Select(x => x).
+           Include(x => x.Cards).
+           ToListAsync();
+
+    public async Task<Column> GetAsync(int id)
+        => await _context.Set<Column>().
+           Include(x => x.Cards).
+           FirstAsync(x => x.Id == id);
 }

NG_2023_Kanban.DataLayer/Repositories/RoleRepository.cs

@@ -1,10 +1,21 @@
 using NG_2023_Kanban.DataLayer.DbStartup;
 using NG_2023_Kanban.DataLayer.Entities;
 using NG_2023_Kanban.DataLayer.Interfaces;
+using Microsoft.EntityFrameworkCore;
 
 namespace NG_2023_Kanban.DataLayer.Repositories;
 
 public class RoleRepository : BaseRepository<Role>, IRoleRepository
 {
     public RoleRepository(DatabaseContext context) : base(context) { }
+
+    public async Task<ICollection<Role>> GetAllAsync()
+        => await _context.Set<Role>().Select(x => x).
+           Include(x => x.Members).
+           ToListAsync();
+
+    public async Task<Role> GetAsync(int id)
+        => await _context.Set<Role>().
+           Include(x => x.Members).
+           FirstAsync(x => x.Id == id);
 }

NG_2023_Kanban.DataLayer/Repositories/UserRepository.cs

@@ -1,10 +1,29 @@
 using NG_2023_Kanban.DataLayer.DbStartup;
 using NG_2023_Kanban.DataLayer.Entities;
 using NG_2023_Kanban.DataLayer.Interfaces;
+using Microsoft.EntityFrameworkCore;
 
 namespace NG_2023_Kanban.DataLayer.Repositories;
 
 public class UserRepository : BaseRepository<User>, IUserRepository
 {
     public UserRepository(DatabaseContext context) : base(context) { }
+
+    public async Task<ICollection<User>> GetAllAsync()
+        => await _context.Set<User>().Select(x => x).
+           Include(x => x.Boards).
+           Include(x => x.CardsAssigned).
+           Include(x => x.CardsSent).
+           Include(x => x.Comments).
+           Include(x => x.Roles).
+           ToListAsync();
+
+    public async Task<User> GetAsync(int id)
+        => await _context.Set<User>().
+           Include(x => x.Boards).
+           Include(x => x.CardsAssigned).
+           Include(x => x.CardsSent).
+           Include(x => x.Comments).
+           Include(x => x.Roles).
+           FirstAsync(x => x.Id == id);
 }

NG_2023_Kanban/DTOs/BoardDto.cs

@@ -4,8 +4,8 @@
     {
         public string Name { get; set; }
 
-        public virtual ICollection<UserDto>? Users { get; set; } = new HashSet<UserDto>();
+        public ICollection<UserDto> Users { get; set; } = new List<UserDto>();
 
-        public virtual ICollection<ColumnDto>? Columns { get; set; } = new HashSet<ColumnDto>(); 
+        public ICollection<ColumnDto> Columns { get; set; } = new List<ColumnDto>(); 
     }
 }

NG_2023_Kanban/DTOs/CardDto.cs

@@ -8,10 +8,10 @@
         public int ColumnId { get; set; }
         public int SenderId { get; set; }
 
-        public virtual UserDto Assigned { get; set; }
-        public virtual ColumnDto Column { get; set; }
-        public virtual UserDto Sender { get; set; }
+        public UserDto Assigned { get; set; }
+        public ColumnDto Column { get; set; }
+        public UserDto Sender { get; set; }
 
-        public virtual ICollection<CommentDto> Comments { get; set; } = new HashSet<CommentDto>();
+        public ICollection<CommentDto> Comments { get; set; } = new List<CommentDto>();
     }
 }

NG_2023_Kanban/DTOs/ColumnDto.cs

@@ -5,8 +5,8 @@
         public string Name { get; set; }
         public int BoardId { get; set; }
 
-        public virtual BoardDto Board { get; set; }
+        public BoardDto Board { get; set; }
 
-        public virtual ICollection<CardDto>? Cards { get; set; } = new HashSet<CardDto>();
+        public ICollection<CardDto> Cards { get; set; } = new List<CardDto>();
     }
 }

NG_2023_Kanban/DTOs/CommentDto.cs

@@ -6,7 +6,7 @@
         public int SenderId { get; set; }
         public int CardId { get; set; }
 
-        public virtual UserDto? Sender { get; set; }
-        public virtual CardDto? Card { get; set; }
+        public UserDto Sender { get; set; }
+        public CardDto Card { get; set; }
     }
 }

NG_2023_Kanban/DTOs/RoleDto.cs

@@ -4,6 +4,6 @@
     {
         public string Name { get; set; }
 
-        public virtual ICollection<UserDto>? Members { get; set; } = new HashSet<UserDto>();
+        public virtual ICollection<UserDto> Members { get; set; } = new List<UserDto>();
     }
 }

NG_2023_Kanban/DTOs/UserDto.cs

@@ -7,10 +7,10 @@ namespace NG_2023_Kanban.DTOs
         public string Username { get; set; }
         public string Password { get; set; }
 
-        public virtual ICollection<BoardDto>? Boards { get; set; } = new HashSet<BoardDto>();
-        public virtual ICollection<CardDto>? CardsAssigned { get; set; } = new HashSet<CardDto>();
-        public virtual ICollection<CardDto>? CardsSent { get; set; } = new HashSet<CardDto>();
-        public virtual ICollection<CommentDto>? Comments { get; set; } = new HashSet<CommentDto>();
-        public virtual ICollection<RoleDto>? Roles { get; set; } = new HashSet<RoleDto>();
+        public ICollection<BoardDto> Boards { get; set; } = new List<BoardDto>();
+        public ICollection<CardDto> CardsAssigned { get; set; } = new List<CardDto>();
+        public ICollection<CardDto> CardsSent { get; set; } = new List<CardDto>();
+        public ICollection<CommentDto> Comments { get; set; } = new List<CommentDto>();
+        public ICollection<RoleDto> Roles { get; set; } = new List<RoleDto>();
     }
 }