feat(User): Implement UserRoleRepository.

AnalysisData/AnalysisData.sln

@@ -2,6 +2,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnalysisData", "AnalysisData\AnalysisData.csproj", "{1AC76299-2D1E-4438-B67B-AA6315B6B781}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject\TestProject.csproj", "{9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -12,5 +14,9 @@ Global
 		{1AC76299-2D1E-4438-B67B-AA6315B6B781}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1AC76299-2D1E-4438-B67B-AA6315B6B781}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1AC76299-2D1E-4438-B67B-AA6315B6B781}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

AnalysisData/AnalysisData/AnalysisData.csproj

@@ -22,4 +22,8 @@
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.1" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Repository\" />
+    </ItemGroup>
+
 </Project>

AnalysisData/AnalysisData/JwtService/Controllers/IdentifyControllers.cs

@@ -1,12 +1,6 @@
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
-using System.Text;
-using AnalysisData.UserManage.Model;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.Data;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Authentication.Controllers;
+namespace AnalysisData.JwtService.Controllers;
 
 [ApiController]
 [Route("api/[controller]")]

AnalysisData/AnalysisData/JwtService/JwtService.cs

@@ -1,11 +1,11 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
-using AnalysisData.RoleRepository;
-using AnalysisData.UserRepositories.Abstraction;
+using AnalysisData.Repository.RoleRepository.Abstraction;
+using AnalysisData.Repository.UserRepository.Abstraction;
 using Microsoft.IdentityModel.Tokens;
 
-namespace Authentication;
+namespace AnalysisData.JwtService;
 
 public class JwtService
 {
@@ -31,7 +31,7 @@ public async Task<string> GenerateJwtToken(string userName)
         };
         foreach (var role in roles)
         {
-            var result = await _roleRepository.GetRoles(role.Id);
+            var result = await _roleRepository.GetRole(role.Id);
             claims.Add(new Claim(ClaimTypes.Role, result.RoleName));
         }
 

AnalysisData/AnalysisData/Program.cs

@@ -1,8 +1,9 @@
 using AnalysisData.Data;
-using AnalysisData.RoleRepository;
-using AnalysisData.UserRepositories;
-using AnalysisData.UserRepositories.Abstraction;
-using Authentication;
+using AnalysisData.JwtService;
+using AnalysisData.Repository.RoleRepository;
+using AnalysisData.Repository.RoleRepository.Abstraction;
+using AnalysisData.Repository.UserRepository;
+using AnalysisData.Repository.UserRepository.Abstraction;
 using Microsoft.EntityFrameworkCore;
 
 var builder = WebApplication.CreateBuilder(args);

AnalysisData/AnalysisData/Repository/RoleRepository/Abstraction/IRoleRepository.cs

@@ -0,0 +1,10 @@
+using AnalysisData.UserManage.Model;
+
+namespace AnalysisData.Repository.RoleRepository.Abstraction;
+
+public interface IRoleRepository
+{
+    Task<Role> GetRole(int rolId);
+    bool AddRole(Role role);
+    bool DeleteRole(int roleId);
+}

AnalysisData/AnalysisData/Repository/RoleRepository/RoleRepository.cs

@@ -0,0 +1,37 @@
+using AnalysisData.Data;
+using AnalysisData.Repository.RoleRepository.Abstraction;
+using AnalysisData.UserManage.Model;
+using Microsoft.EntityFrameworkCore;
+
+namespace AnalysisData.Repository.RoleRepository;
+
+public class RoleRepository : IRoleRepository
+{
+    private readonly ApplicationDbContext _context;
+
+    public RoleRepository(ApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<Role> GetRole(int rolId)
+    {
+        return await _context.Roles.SingleOrDefaultAsync(x => x.Id == rolId);
+    }
+
+    public bool AddRole(Role role)
+    {
+        _context.Roles.Add(role);
+        _context.SaveChanges();
+        return true;
+    }
+
+    public bool DeleteRole(int roleId)
+    {
+        var role = _context.Roles.FirstOrDefault(x => x.Id == roleId);
+        if (role == null) return false;
+        _context.Roles.Remove(role);
+        _context.SaveChanges();
+        return true;
+    }
+}

AnalysisData/AnalysisData/UserRepositories/Abstraction/IUserRepository.cs → AnalysisData/AnalysisData/Repository/UserRepository/Abstraction/IUserRepository.cs

@@ -1,6 +1,6 @@
 using AnalysisData.UserManage.Model;
 
-namespace AnalysisData.UserRepositories.Abstraction;
+namespace AnalysisData.Repository.UserRepository.Abstraction;
 
 public interface IUserRepository
 {

AnalysisData/AnalysisData/UserRepositories/UserRepository.cs → AnalysisData/AnalysisData/Repository/UserRepository/UserRepository.cs

@@ -1,11 +1,9 @@
 using AnalysisData.Data;
+using AnalysisData.Repository.UserRepository.Abstraction;
 using AnalysisData.UserManage.Model;
-using AnalysisData.UserRepositories.Abstraction;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
-namespace AnalysisData.UserRepositories
+namespace AnalysisData.Repository.UserRepository
 {
     public class UserRepository : IUserRepository
     {
@@ -30,13 +28,10 @@ public async Task<IReadOnlyList<User>> GetAllUser()
         public bool DeleteUser(string userName)
         {
             var user = _context.Users.FirstOrDefault(x => x.Username == userName);
-            if (user != null)
-            {
-                _context.Users.Remove(user);
-                _context.SaveChanges(); 
-                return true;
-            }
-            return false;
+            if (user == null) return false;
+            _context.Users.Remove(user);
+            _context.SaveChanges(); 
+            return true;
         }
 
         public bool AddUser(User user)

AnalysisData/AnalysisData/Repository/UserRoleRepository/Abstraction/IUserRoleRepository.cs

@@ -0,0 +1,10 @@
+using AnalysisData.UserManage.Model;
+
+namespace AnalysisData.Repository.UserRoleRepository.Abstraction;
+
+public interface IUserRoleRepository
+{
+    bool Add(UserRole userRole);
+    bool DeleteUserInUserRole(int userId);
+    bool DeleteRoleInUserRole(int roleId);
+}

AnalysisData/AnalysisData/Repository/UserRoleRepository/UserRoleRepository.cs

@@ -0,0 +1,38 @@
+using AnalysisData.Data;
+using AnalysisData.Repository.UserRoleRepository.Abstraction;
+using AnalysisData.UserManage.Model;
+
+namespace AnalysisData.Repository.UserRoleRepository;
+
+public class UserRoleRepository : IUserRoleRepository
+{
+    private readonly ApplicationDbContext _context;
+
+    public UserRoleRepository(ApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public bool Add(UserRole userRole)
+    {
+        _context.UserRoles.Add(userRole);
+        _context.SaveChanges();
+        return true;
+    }
+
+    public bool DeleteUserInUserRole(int userId)
+    {
+        var recordOfTable = _context.UserRoles.Where(x => x.UserId == userId);
+        _context.UserRoles.RemoveRange(recordOfTable);
+        _context.SaveChanges();
+        return true;
+    }
+
+    public bool DeleteRoleInUserRole(int roleId)
+    {
+        var recordOfTable = _context.UserRoles.Where(x => x.RoleId == roleId);
+        _context.UserRoles.RemoveRange(recordOfTable);
+        _context.SaveChanges();
+        return true;
+    }
+}

AnalysisData/AnalysisData/UserManage/Model/Role.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
-using AnalysisData.UserManage.Model;
+
+namespace AnalysisData.UserManage.Model;
 
 public class Role
 {

AnalysisData/AnalysisData/UserManage/Model/UserRole.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using AnalysisData.UserManage.Model;
+
+namespace AnalysisData.UserManage.Model;
 
 public class UserRole
 {

AnalysisData/AnalysisData/appsettings.json

@@ -11,7 +11,7 @@
     }
   },  
   "ConnectionStrings": {
-  "DefaultConnection": "Host=localhost;Database=mohaymen;Username=postgres;Password=mahdijm;Timeout=300"
+  "DefaultConnection": "Host=localhost;Database=mohaymen;Username=postgres;Password=@Database20;Timeout=300"
 },
 
   "AllowedHosts": "*"

AnalysisData/TestProject/TestProject.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+        <PackageReference Include="xunit" Version="2.5.3"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="Xunit"/>
+    </ItemGroup>
+
+</Project>

AnalysisData/TestProject/UnitTest1.cs

@@ -0,0 +1,9 @@
+namespace TestProject;
+
+public class UnitTest1
+{
+    [Fact]
+    public void Test1()
+    {
+    }
+}