fix(Test-AdminService): fix bugs and edit some methods in AdminServic…

…eTests and AdminRegisterServiceTests classes.
Star-Academy · Sep 2, 2024 · dcdae01 · dcdae01
1 parent 7efbfb5
commit dcdae01
Show file tree

Hide file tree

Showing 140 changed files with 495 additions and 501 deletions.
diff --git a/AnalysisData/AnalysisData.sln.DotSettings.user b/AnalysisData/AnalysisData.sln.DotSettings.user
@@ -9,7 +9,7 @@
     &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.Repository.RoleRepository.RoleRepositoryTests&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=1463d704_002D5ef5_002D4eb3_002Da61f_002D385581241cf9/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="GetUserByUsernameAsync_ShouldReturnsUserWithInputUsername_WhenUserExists" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=1463d704_002D5ef5_002D4eb3_002Da61f_002D385581241cf9/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="GetUserByUsernameAsync_ShouldReturnsUserWithInputUsername_WhenUserExists" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;TestAncestor&gt;&#xD;
     &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Repository.UserRepository.UserRepositoryTests.GetUserByEmailAsync_ShouldReturnsNull_WhenUserWithInputEmailDoesNotExist&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Repository.UserRepository.UserRepositoryTests.GetUserByIdAsync_ShouldReturnsUserWithInputId_WhenUserWithInputIdExists&lt;/TestId&gt;&#xD;
@@ -29,6 +29,8 @@
     &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Services.AdminService.AdminServiceTests.DeleteUserAsync_ShouldReturnTrue_WhenUserExists&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::AdminServiceTests&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Services.AdminService.AdminRegisterServiceTests&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Repository.UserRepository.UserRepositoryTests&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Services.AdminService.AdminServiceTests&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=1e8f93b2_002D4572_002D4c58_002Db711_002Dacb713304847/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="GetRole_ShouldReturnsRole_WhenRoleExists #3" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
@@ -60,6 +62,15 @@
     &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.Repository.UserRepository.UserRepositoryTests&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.Repository.RoleRepository.RoleRepositoryTests.DeleteRole_ShouldReturnsFalse_WhenRoleDoesNotExist&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
+&lt;/SessionState&gt;</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=7daf18b0_002D56cf_002D4c0c_002Da004_002D0da528af25ea/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="CheckExistenceOfRole_ShouldNotThrowException_WhenRoleExists" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Services.AdminService.AdminServiceTests&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Services.AdminService.AdminRegisterServiceTests.RegisterByAdminAsync_ShouldThrowDuplicateUserException_WhenUserAlreadyExists&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Services.AdminService.AdminRegisterServiceTests.CheckExistenceRole_ShouldThrowRoleNotFoundException_WhenRoleDoesNotExist&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Services.AdminService.AdminRegisterServiceTests.ValidateUserInformation_ShouldThrowDuplicateUserException_WhenUserAlreadyExists&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::9AEC1F3F-B1B3-47C1-82D4-E432E2D77E0E::net8.0::TestProject.User.Services.AdminService.AdminRegisterServiceTests&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=8ae15fa0_002Dd719_002D4ce1_002D847c_002De586feccc67f/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="AddRole_ShouldAddsRoleToDatabase_Whenever" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;TestAncestor&gt;&#xD;

diff --git a/AnalysisData/AnalysisData/ConfigService.cs b/AnalysisData/AnalysisData/ConfigService.cs
@@ -1,30 +1,48 @@
 using AnalysisData.CookieService.abstractions;
-using AnalysisData.EAV.Repository;
-using AnalysisData.EAV.Repository.Abstraction;
-using AnalysisData.EAV.Repository.CategoryRepository;
-using AnalysisData.EAV.Repository.CategoryRepository.asbtraction;
-using AnalysisData.EAV.Repository.EdgeRepository;
-using AnalysisData.EAV.Repository.EdgeRepository.Abstraction;
-using AnalysisData.EAV.Repository.FileUploadedRepository;
-using AnalysisData.EAV.Repository.NodeRepository;
-using AnalysisData.EAV.Repository.NodeRepository.Abstraction;
-using AnalysisData.EAV.Service;
-using AnalysisData.EAV.Service.Abstraction;
-using AnalysisData.EAV.Service.Business;
-using AnalysisData.EAV.Service.Business.Abstraction;
-using AnalysisData.EAV.Service.GraphServices.NodeAndEdgeServices;
-using AnalysisData.EAV.Service.GraphServices.Relationship;
-using AnalysisData.EAV.Service.GraphSevices;
+using AnalysisData.Graph.Repository.CategoryRepository;
+using AnalysisData.Graph.Repository.CategoryRepository.Abstraction;
+using AnalysisData.Graph.Repository.EdgeRepository;
+using AnalysisData.Graph.Repository.EdgeRepository.Abstraction;
+using AnalysisData.Graph.Repository.FileUploadedRepository;
+using AnalysisData.Graph.Repository.FileUploadedRepository.Abstraction;
+using AnalysisData.Graph.Repository.GraphEdgeRepository;
+using AnalysisData.Graph.Repository.GraphNodeRepository;
+using AnalysisData.Graph.Repository.NodeRepository;
+using AnalysisData.Graph.Repository.NodeRepository.Abstraction;
+using AnalysisData.Graph.Repository.UserFileRepository;
+using AnalysisData.Graph.Repository.UserFileRepository.Abstraction;
+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.FileUploadService;
+using AnalysisData.Graph.Service.FileUploadService.Abstraction;
+using AnalysisData.Graph.Service.GraphServices.AllNodesData;
+using AnalysisData.Graph.Service.GraphServices.NodeAndEdgeInfo;
+using AnalysisData.Graph.Service.GraphServices.Relationship;
+using AnalysisData.Graph.Service.GraphServices.Search;
+using AnalysisData.Graph.Service.ServiceBusiness;
+using AnalysisData.Graph.Service.ServiceBusiness.Abstraction;
 using AnalysisData.JwtService.abstractions;
 using AnalysisData.Repository.RoleRepository;
 using AnalysisData.Repository.RoleRepository.Abstraction;
 using AnalysisData.Repository.UserRepository;
 using AnalysisData.Repository.UserRepository.Abstraction;
 using AnalysisData.Services;
-using AnalysisData.Services.Abstraction;
+using AnalysisData.Services.AdminService;
+using AnalysisData.Services.AdminService.Abstraction;
+using AnalysisData.Services.PemissionService;
+using AnalysisData.Services.PemissionService.Abstraction;
+using AnalysisData.Services.RoleService;
+using AnalysisData.Services.RoleService.Abstraction;
 using AnalysisData.Services.S3FileStorageService;
+using AnalysisData.Services.S3FileStorageService.Abstraction;
 using AnalysisData.Services.SecurityPasswordService;
 using AnalysisData.Services.SecurityPasswordService.Abstraction;
+using AnalysisData.Services.UserService;
+using AnalysisData.Services.UserService.Abstraction;
+using AnalysisData.Services.ValidationService;
+using AnalysisData.Services.ValidationService.Abstraction;
 using Microsoft.AspNetCore.Identity;
 
 namespace AnalysisData;

diff --git a/AnalysisData/AnalysisData/Data/ApplicationDbContext.cs b/AnalysisData/AnalysisData/Data/ApplicationDbContext.cs
@@ -1,5 +1,8 @@
-using AnalysisData.EAV.Model;
-using AnalysisData.UserManage.Model;
+using AnalysisData.Graph.Model.Category;
+using AnalysisData.Graph.Model.Edge;
+using AnalysisData.Graph.Model.File;
+using AnalysisData.Graph.Model.Node;
+using AnalysisData.Model;
 using Microsoft.EntityFrameworkCore;
 
 namespace AnalysisData.Data;

diff --git a/AnalysisData/AnalysisData/Exception/GraphException/CategoryAlreadyExist.cs b/AnalysisData/AnalysisData/Exception/GraphException/CategoryAlreadyExist.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.GraphException;
 
 public class CategoryAlreadyExist : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/GraphException/CategoryResultNotFoundException.cs b/AnalysisData/AnalysisData/Exception/GraphException/CategoryResultNotFoundException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.GraphException;
 
 public class CategoryResultNotFoundException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/GraphException/EdgeNotFoundException.cs b/AnalysisData/AnalysisData/Exception/GraphException/EdgeNotFoundException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.GraphException;
 
 public class EdgeNotFoundException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/GraphException/FileExistenceException.cs b/AnalysisData/AnalysisData/Exception/GraphException/FileExistenceException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.GraphException;
 
 public class FileExistenceException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/GraphException/NoFileUploadedException.cs b/AnalysisData/AnalysisData/Exception/GraphException/NoFileUploadedException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.GraphException;
 
 public class NoFileUploadedException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/GraphException/NodeNotFoundException.cs b/AnalysisData/AnalysisData/Exception/GraphException/NodeNotFoundException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.GraphException;
 
 public class NodeNotFoundException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/AdminExistenceException.cs b/AnalysisData/AnalysisData/Exception/UserException/AdminExistenceException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class AdminExistenceException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/DuplicateRoleExistException.cs b/AnalysisData/AnalysisData/Exception/UserException/DuplicateRoleExistException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class DuplicateRoleExistException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/DuplicateUserException.cs b/AnalysisData/AnalysisData/Exception/UserException/DuplicateUserException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class DuplicateUserException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/GuidNotCorrectFormat.cs b/AnalysisData/AnalysisData/Exception/UserException/GuidNotCorrectFormat.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class GuidNotCorrectFormat : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/InvalidEmailFormatException.cs b/AnalysisData/AnalysisData/Exception/UserException/InvalidEmailFormatException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class InvalidEmailFormatException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/InvalidPasswordException.cs b/AnalysisData/AnalysisData/Exception/UserException/InvalidPasswordException.cs
@@ -1,6 +1,4 @@
-namespace AnalysisData.Exception;
-
-using System;
+namespace AnalysisData.Exception.UserException;
 
 public class InvalidPasswordException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/InvalidPasswordFormatException.cs b/AnalysisData/AnalysisData/Exception/UserException/InvalidPasswordFormatException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class InvalidPasswordFormatException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/InvalidPhoneNumberFormatException.cs b/AnalysisData/AnalysisData/Exception/UserException/InvalidPhoneNumberFormatException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class InvalidPhoneNumberFormatException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/PasswordMismatchException.cs b/AnalysisData/AnalysisData/Exception/UserException/PasswordMismatchException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class PasswordMismatchException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/RoleNotFoundException.cs b/AnalysisData/AnalysisData/Exception/UserException/RoleNotFoundException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class RoleNotFoundException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/TokenNotFoundInCookieException.cs b/AnalysisData/AnalysisData/Exception/UserException/TokenNotFoundInCookieException.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.Exception;
+namespace AnalysisData.Exception.UserException;
 
 public class TokenNotFoundInCookieException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Exception/UserException/UserNotFoundException.cs b/AnalysisData/AnalysisData/Exception/UserException/UserNotFoundException.cs
@@ -1,6 +1,4 @@
-namespace AnalysisData.Exception;
-
-using System;
+namespace AnalysisData.Exception.UserException;
 
 public class UserNotFoundException : ServiceException
 {

diff --git a/AnalysisData/AnalysisData/Graph/Controllers/CategoriesController.cs b/AnalysisData/AnalysisData/Graph/Controllers/CategoriesController.cs
@@ -1,8 +1,8 @@
-using AnalysisData.EAV.Dto;
-using AnalysisData.EAV.Service.Abstraction;
+using AnalysisData.Graph.Dto.CategoryDto;
+using AnalysisData.Graph.Service.CategoryService.Abstraction;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AnalysisData.EAV.Controllers;
+namespace AnalysisData.Graph.Controllers;
 
 [ApiController]
 [Route("api/[controller]")]

diff --git a/AnalysisData/AnalysisData/Graph/Controllers/FileAccessController.cs b/AnalysisData/AnalysisData/Graph/Controllers/FileAccessController.cs
@@ -1,10 +1,9 @@
-using AnalysisData.EAV.Dto;
-using AnalysisData.EAV.Repository.Abstraction;
-using AnalysisData.EAV.Service;
-using AnalysisData.Repository.UserRepository.Abstraction;
+using AnalysisData.Graph.Dto;
+using AnalysisData.Graph.Repository.UserFileRepository.Abstraction;
+using AnalysisData.Graph.Service.FilePermissionService;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AnalysisData.EAV.Controllers;
+namespace AnalysisData.Graph.Controllers;
 
 [ApiController]
 [Route("api/[controller]")]

diff --git a/AnalysisData/AnalysisData/Graph/Controllers/FileController.cs b/AnalysisData/AnalysisData/Graph/Controllers/FileController.cs
@@ -1,10 +1,11 @@
-using System.Security.Claims;
-using AnalysisData.EAV.Dto;
-using AnalysisData.EAV.Service.Abstraction;
-using AnalysisData.Exception;
+using AnalysisData.Exception.GraphException;
+using AnalysisData.Graph.Dto.EdgeDto;
+using AnalysisData.Graph.Dto.NodeDto;
+using AnalysisData.Graph.Service.FileUploadService.Abstraction;
+using AnalysisData.Graph.Service.ServiceBusiness.Abstraction;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AnalysisData.EAV.Controllers;
+namespace AnalysisData.Graph.Controllers;
 
 [ApiController]
 [Route("api/[controller]")]

diff --git a/AnalysisData/AnalysisData/Graph/Controllers/GraphEavController.cs b/AnalysisData/AnalysisData/Graph/Controllers/GraphEavController.cs
@@ -1,11 +1,10 @@
-using AnalysisData.Data;
-using AnalysisData.EAV.Service.Abstraction;
-using AnalysisData.EAV.Service.GraphServices.NodeAndEdgeServices;
-using AnalysisData.EAV.Service.GraphServices.Relationship;
-using AnalysisData.EAV.Service.GraphSevices;
+using AnalysisData.Graph.Service.GraphServices.AllNodesData;
+using AnalysisData.Graph.Service.GraphServices.NodeAndEdgeInfo;
+using AnalysisData.Graph.Service.GraphServices.Relationship;
+using AnalysisData.Graph.Service.GraphServices.Search;
 using Microsoft.AspNetCore.Mvc;
 
-namespace AnalysisData.EAV.Controllers;
+namespace AnalysisData.Graph.Controllers;
 
 [ApiController]
 [Route("api/[controller]")]

diff --git a/AnalysisData/AnalysisData/Graph/Dto/AccessFileToUserDto.cs b/AnalysisData/AnalysisData/Graph/Dto/AccessFileToUserDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto;
 
 public class AccessFileToUserDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/CategoryDto/CategoryDto.cs b/AnalysisData/AnalysisData/Graph/Dto/CategoryDto/CategoryDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Model;
+namespace AnalysisData.Graph.Dto.CategoryDto;
 
 public class CategoryDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/CategoryDto/NewCategoryDto.cs b/AnalysisData/AnalysisData/Graph/Dto/CategoryDto/NewCategoryDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto.CategoryDto;
 
 public class NewCategoryDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/CategoryDto/PaginationCategoryDto.cs b/AnalysisData/AnalysisData/Graph/Dto/CategoryDto/PaginationCategoryDto.cs
@@ -1,6 +1,4 @@
-using AnalysisData.EAV.Model;
-
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto.CategoryDto;
 
 public class PaginationCategoryDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/EdgeDto/EdgeDto.cs b/AnalysisData/AnalysisData/Graph/Dto/EdgeDto/EdgeDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto.EdgeDto;
 
 public class EdgeDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/EdgeDto/EdgeUploadDto.cs b/AnalysisData/AnalysisData/Graph/Dto/EdgeDto/EdgeUploadDto.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto.EdgeDto;
 
 public class EdgeUploadDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/FileEntityDto.cs b/AnalysisData/AnalysisData/Graph/Dto/FileEntityDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto;
 
 public class FileEntityDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/NodeDto/NodeDto.cs b/AnalysisData/AnalysisData/Graph/Dto/NodeDto/NodeDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto.NodeDto;
 
 public class NodeDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/NodeDto/NodeUploadDto.cs b/AnalysisData/AnalysisData/Graph/Dto/NodeDto/NodeUploadDto.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
-using AnalysisData.EAV.Model;
 
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto.NodeDto;
 
 public class NodeUploadDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/NodeDto/PaginatedNodeListDto.cs b/AnalysisData/AnalysisData/Graph/Dto/NodeDto/PaginatedNodeListDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto.NodeDto;
 
 public class PaginatedNodeListDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/NodeDto/PaginationNodeDto.cs b/AnalysisData/AnalysisData/Graph/Dto/NodeDto/PaginationNodeDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto.NodeDto;
 
 public class PaginationNodeDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/PaginatedFileDto.cs b/AnalysisData/AnalysisData/Graph/Dto/PaginatedFileDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto;
 
 public class PaginatedFileDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/UserAccessDto.cs b/AnalysisData/AnalysisData/Graph/Dto/UserAccessDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto;
 
 public class UserAccessDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Dto/WhoAccessThisFileDto.cs b/AnalysisData/AnalysisData/Graph/Dto/WhoAccessThisFileDto.cs
@@ -1,4 +1,4 @@
-namespace AnalysisData.EAV.Dto;
+namespace AnalysisData.Graph.Dto;
 
 public class WhoAccessThisFileDto
 {

diff --git a/AnalysisData/AnalysisData/Graph/Model/Category/Category.cs b/AnalysisData/AnalysisData/Graph/Model/Category/Category.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AnalysisData.EAV.Model;
+namespace AnalysisData.Graph.Model.Category;
 
 public class Category
 {

diff --git a/AnalysisData/AnalysisData/Graph/Model/Edge/AttributeEdge.cs b/AnalysisData/AnalysisData/Graph/Model/Edge/AttributeEdge.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace AnalysisData.EAV.Model;
+namespace AnalysisData.Graph.Model.Edge;
 
 public class AttributeEdge
 {