fix(Test): fix package of test project.

AnalysisData/AnalysisData/ConfigService.cs

@@ -16,7 +16,7 @@
 using AnalysisData.Graph.Service.CategoryService;
 using AnalysisData.Graph.Service.CategoryService.Abstraction;
 using AnalysisData.Graph.Service.FilePermissionService;
-using AnalysisData.Graph.Service.FilePermissionService.AccessMangement;
+using AnalysisData.Graph.Service.FilePermissionService.AccessManagement;
 using AnalysisData.Graph.Service.FileUploadService;
 using AnalysisData.Graph.Service.FileUploadService.Abstraction;
 using AnalysisData.Graph.Service.GraphServices.AllNodesData;
@@ -48,6 +48,7 @@
 using AnalysisData.User.Services.UserService;
 using AnalysisData.User.Services.UserService.Abstraction;
 using AnalysisData.User.Services.UserService.Business;
+using AnalysisData.User.Services.UserService.Business.Abstraction;
 using AnalysisData.User.Services.ValidationService;
 using AnalysisData.User.Services.ValidationService.Abstraction;
 using CsvHelper;

AnalysisData/AnalysisData/Exception/UserException/PasswordHasherInputNull.cs

@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class PasswordHasherInputNull : ServiceException
 {

AnalysisData/AnalysisData/Graph/Service/FilePermissionService/AccessMangement/AccessManagementService.cs → AnalysisData/AnalysisData/Graph/Service/FilePermissionService/AccessManagement/AccessManagementService.cs

@@ -1,7 +1,7 @@
 using AnalysisData.Graph.Model.File;
 using AnalysisData.Graph.Repository.UserFileRepository.Abstraction;
 
-namespace AnalysisData.Graph.Service.FilePermissionService.AccessMangement;
+namespace AnalysisData.Graph.Service.FilePermissionService.AccessManagement;
 
 public class AccessManagementService : IAccessManagementService
 {

AnalysisData/AnalysisData/Graph/Service/FilePermissionService/AccessMangement/IAccessManagementService.cs → AnalysisData/AnalysisData/Graph/Service/FilePermissionService/AccessManagement/IAccessManagementService.cs

@@ -1,4 +1,4 @@
-namespace AnalysisData.Graph.Service.FilePermissionService.AccessMangement;
+namespace AnalysisData.Graph.Service.FilePermissionService.AccessManagement;
 
 public interface IAccessManagementService
 {

AnalysisData/AnalysisData/Graph/Service/FilePermissionService/FilePermissionService.cs

@@ -3,7 +3,7 @@
 using AnalysisData.Graph.Dto;
 using AnalysisData.Graph.Repository.FileUploadedRepository.Abstraction;
 using AnalysisData.Graph.Repository.UserFileRepository.Abstraction;
-using AnalysisData.Graph.Service.FilePermissionService.AccessMangement;
+using AnalysisData.Graph.Service.FilePermissionService.AccessManagement;
 using AnalysisData.User.Repository.UserRepository.Abstraction;
 
 namespace AnalysisData.Graph.Service.FilePermissionService;

AnalysisData/AnalysisData/User/Services/SecurityPasswordService/PasswordHasher.cs

@@ -1,6 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using AnalysisData.Exception;
+using AnalysisData.Exception.UserException;
 using AnalysisData.User.Services.SecurityPasswordService.Abstraction;
 
 namespace AnalysisData.User.Services.SecurityPasswordService;

AnalysisData/AnalysisData/User/Services/UserService/Business/Abstraction/ILoginManager.cs

@@ -1,6 +1,6 @@
 using AnalysisData.User.UserDto.UserDto;
 
-namespace AnalysisData.User.Services.UserService.Abstraction;
+namespace AnalysisData.User.Services.UserService.Business.Abstraction;
 
 public interface ILoginManager
 {

AnalysisData/AnalysisData/User/Services/UserService/Business/Abstraction/IPasswordManager.cs

@@ -1,4 +1,4 @@
-namespace AnalysisData.User.Services.UserService.Abstraction;
+namespace AnalysisData.User.Services.UserService.Business.Abstraction;
 
 public interface IPasswordManager
 {

AnalysisData/AnalysisData/User/Services/UserService/Business/Abstraction/IPasswordService.cs

@@ -1,5 +1,5 @@
 
-namespace AnalysisData.User.Services.UserService.Abstraction;
+namespace AnalysisData.User.Services.UserService.Business.Abstraction;
 
 public interface IPasswordService
 {

AnalysisData/AnalysisData/User/Services/UserService/Business/Abstraction/IUserManager.cs

@@ -1,7 +1,7 @@
 using System.Security.Claims;
 using AnalysisData.User.UserDto.UserDto;
 
-namespace AnalysisData.User.Services.UserService.Abstraction;
+namespace AnalysisData.User.Services.UserService.Business.Abstraction;
 
 public interface IUserManager
 {

AnalysisData/AnalysisData/User/Services/UserService/Business/LoginManager.cs

@@ -3,6 +3,7 @@
 using AnalysisData.User.JwtService.abstractions;
 using AnalysisData.User.Repository.UserRepository.Abstraction;
 using AnalysisData.User.Services.UserService.Abstraction;
+using AnalysisData.User.Services.UserService.Business.Abstraction;
 using AnalysisData.User.UserDto.UserDto;
 
 namespace AnalysisData.User.Services.UserService.Business;

AnalysisData/AnalysisData/User/Services/UserService/Business/PasswordManager.cs

@@ -1,6 +1,7 @@
 
 using AnalysisData.User.Services.SecurityPasswordService.Abstraction;
 using AnalysisData.User.Services.UserService.Abstraction;
+using AnalysisData.User.Services.UserService.Business.Abstraction;
 using AnalysisData.User.Services.ValidationService.Abstraction;
 
 namespace AnalysisData.User.Services.UserService.Business;

AnalysisData/AnalysisData/User/Services/UserService/Business/PasswordService.cs

@@ -1,6 +1,7 @@
 using AnalysisData.Exception.UserException;
 using AnalysisData.User.Services.SecurityPasswordService.Abstraction;
 using AnalysisData.User.Services.UserService.Abstraction;
+using AnalysisData.User.Services.UserService.Business.Abstraction;
 using AnalysisData.User.Services.ValidationService.Abstraction;
 
 namespace AnalysisData.User.Services.UserService.Business;

AnalysisData/AnalysisData/User/Services/UserService/Business/UserManager.cs

@@ -2,6 +2,7 @@
 using AnalysisData.Exception.UserException;
 using AnalysisData.User.Repository.UserRepository.Abstraction;
 using AnalysisData.User.Services.UserService.Abstraction;
+using AnalysisData.User.Services.UserService.Business.Abstraction;
 using AnalysisData.User.Services.ValidationService.Abstraction;
 using AnalysisData.User.UserDto.UserDto;
 

AnalysisData/AnalysisData/User/Services/UserService/UserService.cs

@@ -1,5 +1,6 @@
 using System.Security.Claims;
 using AnalysisData.User.Services.UserService.Abstraction;
+using AnalysisData.User.Services.UserService.Business.Abstraction;
 using AnalysisData.User.UserDto.UserDto;
 
 namespace AnalysisData.User.Services.UserService;

AnalysisData/TestProject/mahdiTest2/CategoryControllersTest.cs → AnalysisData/TestProject/Graph/Controllers/CategoryControllersTest.cs

@@ -2,12 +2,11 @@
 using AnalysisData.Graph.Dto.CategoryDto;
 using AnalysisData.Graph.Model.Category;
 using AnalysisData.Graph.Service.CategoryService.Abstraction;
-using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
 using Newtonsoft.Json;
 
-namespace TestProject.mahdiTest2;
+namespace TestProject.Graph.Controllers;
 
 public class CategoryControllersTest
 {

AnalysisData/TestProject/mahdiTest2/FileAccessControllersTest.cs → AnalysisData/TestProject/Graph/Controllers/FileAccessControllersTest.cs

@@ -7,7 +7,7 @@
 using Moq;
 using Newtonsoft.Json;
 
-namespace TestProject.mahdiTest2;
+namespace TestProject.Graph.Controllers;
 
 public class FileAccessControllersTest
 {

AnalysisData/TestProject/mahdiTest2/AccessManagment/AccessManagementServiceTest.cs → AnalysisData/TestProject/Graph/Service/FilePermissionService/AccessManagement/AccessManagementServiceTest.cs

@@ -1,9 +1,10 @@
-
 using AnalysisData.Graph.Model.File;
 using AnalysisData.Graph.Repository.UserFileRepository.Abstraction;
-using AnalysisData.Graph.Service.FilePermissionService.AccessMangement;
+using AnalysisData.Graph.Service.FilePermissionService.AccessManagement;
 using Moq;
 
+namespace TestProject.Graph.Service.FilePermissionService.AccessManagement;
+
 public class AccessManagementServiceTest
 {
     private readonly Mock<IUserFileRepository> _userFileRepositoryMock;

AnalysisData/TestProject/mahdiTest2/FilePermissionService/FilePermissionServiceTest.cs → AnalysisData/TestProject/Graph/Service/FilePermissionService/FilePermissionServiceTest.cs

@@ -1,23 +1,21 @@
-
 using AnalysisData.Exception.UserException;
 using AnalysisData.Graph.Model.Category;
 using AnalysisData.Graph.Model.File;
 using AnalysisData.Graph.Repository.FileUploadedRepository.Abstraction;
 using AnalysisData.Graph.Repository.UserFileRepository.Abstraction;
-using AnalysisData.Graph.Service.FilePermissionService;
-using AnalysisData.Graph.Service.FilePermissionService.AccessMangement;
-using AnalysisData.User.Model;
+using AnalysisData.Graph.Service.FilePermissionService.AccessManagement;
 using AnalysisData.User.Repository.UserRepository.Abstraction;
 using Moq;
 
+namespace TestProject.Graph.Service.FilePermissionService;
 
 public class FilePermissionServiceTest
 {
     private readonly Mock<IFileUploadedRepository> _fileUploadedRepositoryMock;
     private readonly Mock<IUserRepository> _userRepositoryMock;
     private readonly Mock<IUserFileRepository> _userFileRepositoryMock;
     private readonly Mock<IAccessManagementService> _accessManagementServiceMock;
-    private readonly FilePermissionService _sut;
+    private readonly AnalysisData.Graph.Service.FilePermissionService.FilePermissionService _sut;
 
     public FilePermissionServiceTest()
     {
@@ -27,12 +25,12 @@ public FilePermissionServiceTest()
         _accessManagementServiceMock = new Mock<IAccessManagementService>();
         _fileUploadedRepositoryMock = new Mock<IFileUploadedRepository>();
 
-        _sut = new FilePermissionService(
+        _sut = new AnalysisData.Graph.Service.FilePermissionService.FilePermissionService(
             _fileUploadedRepositoryMock.Object,
             _userRepositoryMock.Object,
             _userFileRepositoryMock.Object,
             _accessManagementServiceMock.Object
-            );
+        );
     }
 
     [Fact]
@@ -138,8 +136,8 @@ public async Task WhoAccessThisFileAsync_ShouldReturnUsers_WhenUsersExistForFile
 
         var mockUserFiles = new List<UserFile>
         {
-            new UserFile { User = new User { Id = userGuid1, Username = "user1" } },
-            new UserFile { User = new User { Id = userGuid2, Username = "user2" } }
+            new UserFile { User = new AnalysisData.User.Model.User { Id = userGuid1, Username = "user1" } },
+            new UserFile { User = new AnalysisData.User.Model.User { Id = userGuid2, Username = "user2" } }
         };
 
         _userFileRepositoryMock.Setup(repo => repo.GetByFileIdAsync(1))
@@ -203,7 +201,7 @@ public async Task AccessFileToUserAsync_ShouldAccessFilesToInputUsers_WhenFileAn
             .Returns(Task.CompletedTask);
 
         _userRepositoryMock.Setup(repo => repo.GetUserByIdAsync(It.IsAny<Guid>()))
-            .ReturnsAsync(new User()); 
+            .ReturnsAsync(new AnalysisData.User.Model.User()); 
 
         // Act
         await _sut.AccessFileToUserAsync(inputUserIds, fileId);

AnalysisData/TestProject/User/Repository/RoleRepository/RoleRepositoryTests.cs

@@ -1,16 +1,13 @@
-using System.Linq;
-using System.Threading.Tasks;
-using AnalysisData.Data;
+using AnalysisData.Data;
 using AnalysisData.User.Model;
-using AnalysisData.User.Repository.RoleRepository;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Xunit;
 
+namespace TestProject.User.Repository.RoleRepository;
 
 public class RoleRepositoryTests
 {
-    private readonly RoleRepository _sut;
+    private readonly AnalysisData.User.Repository.RoleRepository.RoleRepository _sut;
     private readonly ServiceProvider _serviceProvider;
 
     public RoleRepositoryTests()
@@ -23,7 +20,7 @@ public RoleRepositoryTests()
         serviceCollection.AddScoped(_ => new ApplicationDbContext(options));
         _serviceProvider = serviceCollection.BuildServiceProvider();
 
-        _sut = new RoleRepository(CreateDbContext());
+        _sut = new AnalysisData.User.Repository.RoleRepository.RoleRepository(CreateDbContext());
     }
 
     private ApplicationDbContext CreateDbContext()