From e99d6025bbd7ccd984abe6f1d4c8bed442b8de6d Mon Sep 17 00:00:00 2001 From: sadq Date: Mon, 2 Sep 2024 10:47:33 +0330 Subject: [PATCH 1/3] merge --- RelationshipAnalysis/Controllers/AttributesController.cs | 2 ++ RelationshipAnalysis/Controllers/Auth/AuthController.cs | 3 ++- RelationshipAnalysis/Controllers/Graph/EdgeController.cs | 4 +++- .../Controllers/Graph/GraphController.cs | 1 + RelationshipAnalysis/Controllers/Graph/NodeController.cs | 4 +++- .../Controllers/Panel/AdminController.cs | 4 +++- RelationshipAnalysis/Controllers/Panel/UserController.cs | 1 + RelationshipAnalysis/Dto/Graph/Edge/UploadEdgeDto.cs | 1 + RelationshipAnalysis/Dto/Graph/GraphDto.cs | 1 + RelationshipAnalysis/Dto/Graph/Node/UploadNodeDto.cs | 1 + RelationshipAnalysis/Dto/Panel/Admin/CreateUserDto.cs | 3 ++- RelationshipAnalysis/Dto/Panel/Admin/GetAllUsersDto.cs | 3 ++- RelationshipAnalysis/Dto/Panel/User/UserOutputInfoDto.cs | 2 ++ .../Middlewares/SanitizationMiddleware.cs | 6 ++++++ RelationshipAnalysis/Models/Auth/Role.cs | 3 ++- RelationshipAnalysis/Models/Auth/User.cs | 3 ++- RelationshipAnalysis/Models/Graph/Edge/Edge.cs | 1 + RelationshipAnalysis/Models/Graph/Edge/EdgeAttribute.cs | 1 + RelationshipAnalysis/Models/Graph/Edge/EdgeCategory.cs | 1 + RelationshipAnalysis/Models/Graph/Node/Node.cs | 1 + RelationshipAnalysis/Models/Graph/Node/NodeAttribute.cs | 1 + RelationshipAnalysis/Models/Graph/Node/NodeCategory.cs | 1 + RelationshipAnalysis/Program.cs | 9 ++++++++- .../Services/AuthServices/Abstraction/ICookieSetter.cs | 4 +++- .../Services/AuthServices/Abstraction/ILoginService.cs | 4 +++- .../Services/AuthServices/CookieSetter.cs | 4 +++- .../Services/AuthServices/CustomPasswordHasher.cs | 3 ++- .../Services/AuthServices/JwtTokenGenerator.cs | 4 +++- .../Services/AuthServices/LoginService.cs | 4 +++- .../CRUD/Permissions/Abstraction/IPermissionsReceiver.cs | 5 ++++- .../Services/CRUD/Permissions/PermissionsReceiver.cs | 5 ++++- .../Services/CRUD/Role/Abstraction/IRoleReceiver.cs | 3 +++ RelationshipAnalysis/Services/CRUD/Role/RoleReceiver.cs | 5 +++++ .../Services/CRUD/User/Abstraction/IUserAdder.cs | 4 +++- .../Services/CRUD/User/Abstraction/IUserDeleter.cs | 4 +++- .../Services/CRUD/User/Abstraction/IUserReceiver.cs | 2 ++ .../Services/CRUD/User/Abstraction/IUserUpdater.cs | 4 +++- RelationshipAnalysis/Services/CRUD/User/UserAdder.cs | 5 ++++- RelationshipAnalysis/Services/CRUD/User/UserDeleter.cs | 5 ++++- RelationshipAnalysis/Services/CRUD/User/UserReceiver.cs | 5 +++++ RelationshipAnalysis/Services/CRUD/User/UserUpdater.cs | 5 ++++- .../CRUD/UserRole/Abstraction/IUserRolesAdder.cs | 5 ++++- .../CRUD/UserRole/Abstraction/IUserRolesRemover.cs | 4 +++- .../Services/CRUD/UserRole/UserRolesAdder.cs | 7 ++++++- .../Services/CRUD/UserRole/UserRolesRemover.cs | 5 ++++- .../GraphServices/Abstraction/IAttributesReceiver.cs | 3 +++ .../GraphServices/Abstraction/ICsvProcessorService.cs | 4 ++++ .../GraphServices/Abstraction/ICsvValidatorService.cs | 1 + .../GraphServices/Abstraction/IExpansionGraphReceiver.cs | 1 + .../Services/GraphServices/Abstraction/IInfoReceiver.cs | 2 ++ .../Services/GraphServices/CsvProcessorService.cs | 4 ++++ .../Services/GraphServices/CsvValidatorService.cs | 3 +++ .../Edge/Abstraction/IContextEdgesAdditionService.cs | 2 ++ .../Edge/Abstraction/ICreateEdgeCategoryService.cs | 3 ++- .../Edge/Abstraction/IEdgeCategoryReceiver.cs | 5 ++++- .../Edge/Abstraction/IEdgeValueAdditionService.cs | 2 ++ .../Edge/Abstraction/IEdgesAdditionService.cs | 3 ++- .../Edge/Abstraction/ISingleEdgeAdditionService.cs | 4 +++- .../GraphServices/Edge/ContextEdgesAdditionService.cs | 3 +++ .../GraphServices/Edge/CreateEdgeCategoryService.cs | 6 +++++- .../Services/GraphServices/Edge/EdgeCategoryReceiver.cs | 7 ++++++- .../GraphServices/Edge/EdgeValueAdditionService.cs | 3 +++ .../Services/GraphServices/Edge/EdgesAdditionService.cs | 5 ++++- .../GraphServices/Edge/SingleEdgeAdditionService.cs | 5 ++++- .../Services/GraphServices/EdgeAttributesReceiver.cs | 5 +++++ .../Services/GraphServices/EdgeInfoReceiver.cs | 5 +++++ .../Services/GraphServices/ExpansionGraphReceiver.cs | 5 +++++ .../GraphServices/Graph/Abstraction/IGraphDtoCreator.cs | 1 + .../GraphServices/Graph/Abstraction/IGraphReceiver.cs | 1 + .../Services/GraphServices/Graph/GraphDtoCreator.cs | 2 ++ .../Services/GraphServices/Graph/GraphReceiver.cs | 3 +++ .../Node/Abstraction/IContextNodesAdditionService.cs | 2 ++ .../Node/Abstraction/ICreateNodeCategoryService.cs | 3 ++- .../Node/Abstraction/INodeCategoryReceiver.cs | 5 ++++- .../Node/Abstraction/INodeValueAdditionService.cs | 2 ++ .../Node/Abstraction/INodesAdditionService.cs | 1 + .../Node/Abstraction/ISingleNodeAdditionService.cs | 2 ++ .../GraphServices/Node/ContextNodesAdditionService.cs | 3 +++ .../GraphServices/Node/CreateNodeCategoryService.cs | 6 +++++- .../Services/GraphServices/Node/NodeCategoryReceiver.cs | 7 ++++++- .../GraphServices/Node/NodeValueAdditionService.cs | 3 +++ .../Services/GraphServices/Node/NodesAdditionService.cs | 3 +++ .../GraphServices/Node/SingleNodeAdditionService.cs | 3 +++ .../Services/GraphServices/NodeAttributesReceiver.cs | 5 +++++ .../Services/GraphServices/NodeInfoReceiver.cs | 5 +++++ .../AllUserService/Abstraction/IAllUserDtoCreator.cs | 4 +++- .../AllUserService/Abstraction/IAllUserService.cs | 4 +++- .../Abstraction/IAllUserServiceValidator.cs | 4 +++- .../AllUserService/AllUserDtoCreator.cs | 4 +++- .../AdminPanelServices/AllUserService/AllUserService.cs | 4 +++- .../AllUserService/AllUserServiceValidator.cs | 4 +++- .../CreateUserService/Abstraction/IUserCreateService.cs | 3 ++- .../Abstraction/IUserCreateServiceValidator.cs | 3 ++- .../CreateUserService/UserCreateService.cs | 3 ++- .../CreateUserService/UserCreateServiceValidator.cs | 6 +++++- .../UserDeleteService/Abstraction/IUserDeleteService.cs | 3 ++- .../Abstraction/IUserDeleteServiceValidator.cs | 3 ++- .../UserDeleteService/UserDeleteService.cs | 3 ++- .../UserDeleteService/UserDeleteServiceValidator.cs | 3 ++- .../Abstraction/IUserUpdateRolesService.cs | 4 +++- .../Abstraction/IUserUpdateRolesServiceValidator.cs | 4 +++- .../UserUpdateRolesService/UserUpdateRolesService.cs | 4 +++- .../UserUpdateRolesServiceValidator.cs | 7 ++++++- .../LogoutService/Abstraction/ILogoutService.cs | 2 ++ .../UserPanelServices/LogoutService/LogoutService.cs | 1 + .../PermissionsService/Abstraction/IPermissionService.cs | 3 ++- .../PermissionsService/PermissionService.cs | 3 ++- .../UserInfoService/Abstraction/IUserInfoService.cs | 1 + .../Abstraction/IUserInfoServiceValidator.cs | 3 ++- .../Abstraction/IUserOutputInfoDtoCreator.cs | 3 ++- .../UserPanelServices/UserInfoService/UserInfoService.cs | 1 + .../UserInfoService/UserInfoServiceValidator.cs | 3 ++- .../UserInfoService/UserOutputInfoDtoCreator.cs | 3 ++- .../Abstraction/IUserUpdateInfoService.cs | 2 ++ .../Abstraction/IUserUpdateInfoServiceValidator.cs | 3 ++- .../UserUpdateInfoService/UserUpdateInfoService.cs | 2 ++ .../UserUpdateInfoServiceValidator.cs | 6 +++++- .../Abstraction/IUserUpdatePasswordService.cs | 1 + .../Abstraction/IUserUpdatePasswordServiceValidator.cs | 3 ++- .../UserUpdatePasswordService.cs | 1 + .../UserUpdatePasswordServiceValidator.cs | 3 ++- 121 files changed, 338 insertions(+), 67 deletions(-) diff --git a/RelationshipAnalysis/Controllers/AttributesController.cs b/RelationshipAnalysis/Controllers/AttributesController.cs index 577825d..7e0c7d2 100644 --- a/RelationshipAnalysis/Controllers/AttributesController.cs +++ b/RelationshipAnalysis/Controllers/AttributesController.cs @@ -1,5 +1,7 @@ +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Services.GraphServices.Abstraction; namespace RelationshipAnalysis.Controllers; diff --git a/RelationshipAnalysis/Controllers/Auth/AuthController.cs b/RelationshipAnalysis/Controllers/Auth/AuthController.cs index c0d312b..9d4a401 100644 --- a/RelationshipAnalysis/Controllers/Auth/AuthController.cs +++ b/RelationshipAnalysis/Controllers/Auth/AuthController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; using RelationshipAnalysis.Dto.Auth; using RelationshipAnalysis.Services.AuthServices.Abstraction; diff --git a/RelationshipAnalysis/Controllers/Graph/EdgeController.cs b/RelationshipAnalysis/Controllers/Graph/EdgeController.cs index d301d99..2963986 100644 --- a/RelationshipAnalysis/Controllers/Graph/EdgeController.cs +++ b/RelationshipAnalysis/Controllers/Graph/EdgeController.cs @@ -1,5 +1,7 @@ -using Microsoft.AspNetCore.Authorization; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Dto.Graph.Edge; using RelationshipAnalysis.Services.GraphServices.Abstraction; using RelationshipAnalysis.Services.GraphServices.Edge.Abstraction; diff --git a/RelationshipAnalysis/Controllers/Graph/GraphController.cs b/RelationshipAnalysis/Controllers/Graph/GraphController.cs index b3dc3f5..e47aed9 100644 --- a/RelationshipAnalysis/Controllers/Graph/GraphController.cs +++ b/RelationshipAnalysis/Controllers/Graph/GraphController.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using RelationshipAnalysis.Services.GraphServices.Abstraction; diff --git a/RelationshipAnalysis/Controllers/Graph/NodeController.cs b/RelationshipAnalysis/Controllers/Graph/NodeController.cs index 4290f5c..81ed3b4 100644 --- a/RelationshipAnalysis/Controllers/Graph/NodeController.cs +++ b/RelationshipAnalysis/Controllers/Graph/NodeController.cs @@ -1,5 +1,7 @@ -using Microsoft.AspNetCore.Authorization; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Dto.Graph.Node; using RelationshipAnalysis.Services.GraphServices.Abstraction; using RelationshipAnalysis.Services.GraphServices.Node.Abstraction; diff --git a/RelationshipAnalysis/Controllers/Panel/AdminController.cs b/RelationshipAnalysis/Controllers/Panel/AdminController.cs index 50f7543..85d4c37 100644 --- a/RelationshipAnalysis/Controllers/Panel/AdminController.cs +++ b/RelationshipAnalysis/Controllers/Panel/AdminController.cs @@ -1,4 +1,6 @@ -using Microsoft.AspNetCore.Authorization; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using RelationshipAnalysis.Dto.Panel.Admin; using RelationshipAnalysis.Dto.Panel.User; diff --git a/RelationshipAnalysis/Controllers/Panel/UserController.cs b/RelationshipAnalysis/Controllers/Panel/UserController.cs index 7ddc7c2..3095daa 100644 --- a/RelationshipAnalysis/Controllers/Panel/UserController.cs +++ b/RelationshipAnalysis/Controllers/Panel/UserController.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using RelationshipAnalysis.Dto; diff --git a/RelationshipAnalysis/Dto/Graph/Edge/UploadEdgeDto.cs b/RelationshipAnalysis/Dto/Graph/Edge/UploadEdgeDto.cs index 900bad0..c45b95f 100644 --- a/RelationshipAnalysis/Dto/Graph/Edge/UploadEdgeDto.cs +++ b/RelationshipAnalysis/Dto/Graph/Edge/UploadEdgeDto.cs @@ -1,4 +1,5 @@ using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Http; namespace RelationshipAnalysis.Dto.Graph.Edge; diff --git a/RelationshipAnalysis/Dto/Graph/GraphDto.cs b/RelationshipAnalysis/Dto/Graph/GraphDto.cs index f01d435..7d5197a 100644 --- a/RelationshipAnalysis/Dto/Graph/GraphDto.cs +++ b/RelationshipAnalysis/Dto/Graph/GraphDto.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using RelationshipAnalysis.Dto.Graph.Edge; using RelationshipAnalysis.Dto.Graph.Node; diff --git a/RelationshipAnalysis/Dto/Graph/Node/UploadNodeDto.cs b/RelationshipAnalysis/Dto/Graph/Node/UploadNodeDto.cs index 2e2e3eb..a33a3f4 100644 --- a/RelationshipAnalysis/Dto/Graph/Node/UploadNodeDto.cs +++ b/RelationshipAnalysis/Dto/Graph/Node/UploadNodeDto.cs @@ -1,4 +1,5 @@ using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Http; namespace RelationshipAnalysis.Dto.Graph.Node; diff --git a/RelationshipAnalysis/Dto/Panel/Admin/CreateUserDto.cs b/RelationshipAnalysis/Dto/Panel/Admin/CreateUserDto.cs index d2b4730..6d3a411 100644 --- a/RelationshipAnalysis/Dto/Panel/Admin/CreateUserDto.cs +++ b/RelationshipAnalysis/Dto/Panel/Admin/CreateUserDto.cs @@ -1,4 +1,5 @@ -using System.ComponentModel.DataAnnotations; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; namespace RelationshipAnalysis.Dto.Panel.Admin; diff --git a/RelationshipAnalysis/Dto/Panel/Admin/GetAllUsersDto.cs b/RelationshipAnalysis/Dto/Panel/Admin/GetAllUsersDto.cs index 53f561b..b7018b2 100644 --- a/RelationshipAnalysis/Dto/Panel/Admin/GetAllUsersDto.cs +++ b/RelationshipAnalysis/Dto/Panel/Admin/GetAllUsersDto.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto.Panel.User; +using System.Collections.Generic; +using RelationshipAnalysis.Dto.Panel.User; namespace RelationshipAnalysis.Dto.Panel.Admin; diff --git a/RelationshipAnalysis/Dto/Panel/User/UserOutputInfoDto.cs b/RelationshipAnalysis/Dto/Panel/User/UserOutputInfoDto.cs index 71d2e7c..9a170e8 100644 --- a/RelationshipAnalysis/Dto/Panel/User/UserOutputInfoDto.cs +++ b/RelationshipAnalysis/Dto/Panel/User/UserOutputInfoDto.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; + namespace RelationshipAnalysis.Dto.Panel.User; public class UserOutputInfoDto diff --git a/RelationshipAnalysis/Middlewares/SanitizationMiddleware.cs b/RelationshipAnalysis/Middlewares/SanitizationMiddleware.cs index 7d14a27..498fba0 100644 --- a/RelationshipAnalysis/Middlewares/SanitizationMiddleware.cs +++ b/RelationshipAnalysis/Middlewares/SanitizationMiddleware.cs @@ -1,5 +1,11 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; using System.Text; +using System.Threading.Tasks; using Ganss.Xss; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Controllers; using Newtonsoft.Json; diff --git a/RelationshipAnalysis/Models/Auth/Role.cs b/RelationshipAnalysis/Models/Auth/Role.cs index 1a7037f..2d1587d 100644 --- a/RelationshipAnalysis/Models/Auth/Role.cs +++ b/RelationshipAnalysis/Models/Auth/Role.cs @@ -1,4 +1,5 @@ -using System.ComponentModel.DataAnnotations; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using Microsoft.EntityFrameworkCore; namespace RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Models/Auth/User.cs b/RelationshipAnalysis/Models/Auth/User.cs index e411b1a..5e3cbba 100644 --- a/RelationshipAnalysis/Models/Auth/User.cs +++ b/RelationshipAnalysis/Models/Auth/User.cs @@ -1,4 +1,5 @@ -using System.ComponentModel.DataAnnotations; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using Microsoft.EntityFrameworkCore; namespace RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Models/Graph/Edge/Edge.cs b/RelationshipAnalysis/Models/Graph/Edge/Edge.cs index 750f4a8..0cf5ec0 100644 --- a/RelationshipAnalysis/Models/Graph/Edge/Edge.cs +++ b/RelationshipAnalysis/Models/Graph/Edge/Edge.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; diff --git a/RelationshipAnalysis/Models/Graph/Edge/EdgeAttribute.cs b/RelationshipAnalysis/Models/Graph/Edge/EdgeAttribute.cs index 301c880..0269f57 100644 --- a/RelationshipAnalysis/Models/Graph/Edge/EdgeAttribute.cs +++ b/RelationshipAnalysis/Models/Graph/Edge/EdgeAttribute.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Microsoft.EntityFrameworkCore; diff --git a/RelationshipAnalysis/Models/Graph/Edge/EdgeCategory.cs b/RelationshipAnalysis/Models/Graph/Edge/EdgeCategory.cs index 9a41aba..cbf7c1f 100644 --- a/RelationshipAnalysis/Models/Graph/Edge/EdgeCategory.cs +++ b/RelationshipAnalysis/Models/Graph/Edge/EdgeCategory.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Microsoft.EntityFrameworkCore; diff --git a/RelationshipAnalysis/Models/Graph/Node/Node.cs b/RelationshipAnalysis/Models/Graph/Node/Node.cs index 6101f37..2e4f19d 100644 --- a/RelationshipAnalysis/Models/Graph/Node/Node.cs +++ b/RelationshipAnalysis/Models/Graph/Node/Node.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; diff --git a/RelationshipAnalysis/Models/Graph/Node/NodeAttribute.cs b/RelationshipAnalysis/Models/Graph/Node/NodeAttribute.cs index 30aedcc..d8e4d43 100644 --- a/RelationshipAnalysis/Models/Graph/Node/NodeAttribute.cs +++ b/RelationshipAnalysis/Models/Graph/Node/NodeAttribute.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Microsoft.EntityFrameworkCore; diff --git a/RelationshipAnalysis/Models/Graph/Node/NodeCategory.cs b/RelationshipAnalysis/Models/Graph/Node/NodeCategory.cs index d930951..8959912 100644 --- a/RelationshipAnalysis/Models/Graph/Node/NodeCategory.cs +++ b/RelationshipAnalysis/Models/Graph/Node/NodeCategory.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Microsoft.EntityFrameworkCore; diff --git a/RelationshipAnalysis/Program.cs b/RelationshipAnalysis/Program.cs index d018cbd..c88a7d7 100644 --- a/RelationshipAnalysis/Program.cs +++ b/RelationshipAnalysis/Program.cs @@ -1,6 +1,11 @@ using System.Text; +using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Builder; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Tokens; using RelationshipAnalysis.Context; using RelationshipAnalysis.Middlewares; @@ -43,6 +48,9 @@ using RelationshipAnalysis.Services.Panel.UserPanelServices.UserUpdatePasswordService; using RelationshipAnalysis.Services.Panel.UserPanelServices.UserUpdatePasswordService.Abstraction; using RelationshipAnalysis.Settings.JWT; +using Abstraction_IAttributesReceiver = RelationshipAnalysis.Services.GraphServices.Abstraction.IAttributesReceiver; +using NodeAttributesReceiver = RelationshipAnalysis.Services.GraphServices.NodeAttributesReceiver; +using EdgeAttributesReceiver = RelationshipAnalysis.Services.GraphServices.EdgeAttributesReceiver; var builder = WebApplication.CreateBuilder(args); builder.Configuration @@ -116,7 +124,6 @@ .AddKeyedSingleton("edge") .AddKeyedSingleton("node") .AddKeyedSingleton("edge"); - builder.Services.Configure(builder.Configuration.GetSection("Jwt")); diff --git a/RelationshipAnalysis/Services/AuthServices/Abstraction/ICookieSetter.cs b/RelationshipAnalysis/Services/AuthServices/Abstraction/ICookieSetter.cs index 77a21f7..ab66184 100644 --- a/RelationshipAnalysis/Services/AuthServices/Abstraction/ICookieSetter.cs +++ b/RelationshipAnalysis/Services/AuthServices/Abstraction/ICookieSetter.cs @@ -1,4 +1,6 @@ -namespace RelationshipAnalysis.Services.AuthServices.Abstraction; +using Microsoft.AspNetCore.Http; + +namespace RelationshipAnalysis.Services.AuthServices.Abstraction; public interface ICookieSetter { diff --git a/RelationshipAnalysis/Services/AuthServices/Abstraction/ILoginService.cs b/RelationshipAnalysis/Services/AuthServices/Abstraction/ILoginService.cs index f4187f5..d56a059 100644 --- a/RelationshipAnalysis/Services/AuthServices/Abstraction/ILoginService.cs +++ b/RelationshipAnalysis/Services/AuthServices/Abstraction/ILoginService.cs @@ -1,4 +1,6 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Auth; using LoginDto = RelationshipAnalysis.Dto.Auth.LoginDto; diff --git a/RelationshipAnalysis/Services/AuthServices/CookieSetter.cs b/RelationshipAnalysis/Services/AuthServices/CookieSetter.cs index 6e6987b..be59829 100644 --- a/RelationshipAnalysis/Services/AuthServices/CookieSetter.cs +++ b/RelationshipAnalysis/Services/AuthServices/CookieSetter.cs @@ -1,4 +1,6 @@ -using Microsoft.Extensions.Options; +using System; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Options; using RelationshipAnalysis.Services.AuthServices.Abstraction; using RelationshipAnalysis.Settings.JWT; diff --git a/RelationshipAnalysis/Services/AuthServices/CustomPasswordHasher.cs b/RelationshipAnalysis/Services/AuthServices/CustomPasswordHasher.cs index 77648cf..732a6fc 100644 --- a/RelationshipAnalysis/Services/AuthServices/CustomPasswordHasher.cs +++ b/RelationshipAnalysis/Services/AuthServices/CustomPasswordHasher.cs @@ -1,4 +1,5 @@ -using System.Security.Cryptography; +using System; +using System.Security.Cryptography; using System.Text; using RelationshipAnalysis.Services.AuthServices.Abstraction; diff --git a/RelationshipAnalysis/Services/AuthServices/JwtTokenGenerator.cs b/RelationshipAnalysis/Services/AuthServices/JwtTokenGenerator.cs index a9da7e6..6783f83 100644 --- a/RelationshipAnalysis/Services/AuthServices/JwtTokenGenerator.cs +++ b/RelationshipAnalysis/Services/AuthServices/JwtTokenGenerator.cs @@ -1,4 +1,6 @@ -using System.IdentityModel.Tokens.Jwt; +using System; +using System.Collections.Generic; +using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using System.Text; using Microsoft.Extensions.Options; diff --git a/RelationshipAnalysis/Services/AuthServices/LoginService.cs b/RelationshipAnalysis/Services/AuthServices/LoginService.cs index 5f305f2..13f0c98 100644 --- a/RelationshipAnalysis/Services/AuthServices/LoginService.cs +++ b/RelationshipAnalysis/Services/AuthServices/LoginService.cs @@ -1,4 +1,6 @@ -using Microsoft.EntityFrameworkCore; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.EntityFrameworkCore; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Auth; diff --git a/RelationshipAnalysis/Services/CRUD/Permissions/Abstraction/IPermissionsReceiver.cs b/RelationshipAnalysis/Services/CRUD/Permissions/Abstraction/IPermissionsReceiver.cs index 0641fb8..4f67ab9 100644 --- a/RelationshipAnalysis/Services/CRUD/Permissions/Abstraction/IPermissionsReceiver.cs +++ b/RelationshipAnalysis/Services/CRUD/Permissions/Abstraction/IPermissionsReceiver.cs @@ -1,4 +1,7 @@ -namespace RelationshipAnalysis.Services.CRUD.Permissions.Abstraction; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace RelationshipAnalysis.Services.CRUD.Permissions.Abstraction; public interface IPermissionsReceiver { diff --git a/RelationshipAnalysis/Services/CRUD/Permissions/PermissionsReceiver.cs b/RelationshipAnalysis/Services/CRUD/Permissions/PermissionsReceiver.cs index 8cb9317..34efd4d 100644 --- a/RelationshipAnalysis/Services/CRUD/Permissions/PermissionsReceiver.cs +++ b/RelationshipAnalysis/Services/CRUD/Permissions/PermissionsReceiver.cs @@ -1,4 +1,7 @@ -using Newtonsoft.Json; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Newtonsoft.Json; using RelationshipAnalysis.Models.Auth; using RelationshipAnalysis.Services.CRUD.Permissions.Abstraction; using RelationshipAnalysis.Services.CRUD.Role.Abstraction; diff --git a/RelationshipAnalysis/Services/CRUD/Role/Abstraction/IRoleReceiver.cs b/RelationshipAnalysis/Services/CRUD/Role/Abstraction/IRoleReceiver.cs index 03f595c..84d326e 100644 --- a/RelationshipAnalysis/Services/CRUD/Role/Abstraction/IRoleReceiver.cs +++ b/RelationshipAnalysis/Services/CRUD/Role/Abstraction/IRoleReceiver.cs @@ -1,3 +1,6 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + namespace RelationshipAnalysis.Services.CRUD.Role.Abstraction; public interface IRoleReceiver diff --git a/RelationshipAnalysis/Services/CRUD/Role/RoleReceiver.cs b/RelationshipAnalysis/Services/CRUD/Role/RoleReceiver.cs index b8ba1ea..5ba2ec4 100644 --- a/RelationshipAnalysis/Services/CRUD/Role/RoleReceiver.cs +++ b/RelationshipAnalysis/Services/CRUD/Role/RoleReceiver.cs @@ -1,4 +1,9 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.CRUD.Role.Abstraction; diff --git a/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserAdder.cs b/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserAdder.cs index f57a0e7..fb3496e 100644 --- a/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserAdder.cs +++ b/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserAdder.cs @@ -1,4 +1,6 @@ -namespace RelationshipAnalysis.Services.CRUD.User.Abstraction; +using System.Threading.Tasks; + +namespace RelationshipAnalysis.Services.CRUD.User.Abstraction; public interface IUserAdder { diff --git a/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserDeleter.cs b/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserDeleter.cs index d3aeb43..c9eea8f 100644 --- a/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserDeleter.cs +++ b/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserDeleter.cs @@ -1,4 +1,6 @@ -namespace RelationshipAnalysis.Services.CRUD.User.Abstraction; +using System.Threading.Tasks; + +namespace RelationshipAnalysis.Services.CRUD.User.Abstraction; public interface IUserDeleter { diff --git a/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserReceiver.cs b/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserReceiver.cs index b183dd6..dd3a330 100644 --- a/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserReceiver.cs +++ b/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserReceiver.cs @@ -1,4 +1,6 @@ +using System.Collections.Generic; using System.Security.Claims; +using System.Threading.Tasks; namespace RelationshipAnalysis.Services.CRUD.User.Abstraction; diff --git a/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserUpdater.cs b/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserUpdater.cs index 93d54d1..427365b 100644 --- a/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserUpdater.cs +++ b/RelationshipAnalysis/Services/CRUD/User/Abstraction/IUserUpdater.cs @@ -1,4 +1,6 @@ -namespace RelationshipAnalysis.Services.CRUD.User.Abstraction; +using System.Threading.Tasks; + +namespace RelationshipAnalysis.Services.CRUD.User.Abstraction; public interface IUserUpdater { diff --git a/RelationshipAnalysis/Services/CRUD/User/UserAdder.cs b/RelationshipAnalysis/Services/CRUD/User/UserAdder.cs index b4e8a89..2d264d8 100644 --- a/RelationshipAnalysis/Services/CRUD/User/UserAdder.cs +++ b/RelationshipAnalysis/Services/CRUD/User/UserAdder.cs @@ -1,4 +1,7 @@ -using RelationshipAnalysis.Context; +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.CRUD.User.Abstraction; namespace RelationshipAnalysis.Services.CRUD.User; diff --git a/RelationshipAnalysis/Services/CRUD/User/UserDeleter.cs b/RelationshipAnalysis/Services/CRUD/User/UserDeleter.cs index efa7c4a..26288de 100644 --- a/RelationshipAnalysis/Services/CRUD/User/UserDeleter.cs +++ b/RelationshipAnalysis/Services/CRUD/User/UserDeleter.cs @@ -1,4 +1,7 @@ -using RelationshipAnalysis.Context; +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.CRUD.User.Abstraction; namespace RelationshipAnalysis.Services.CRUD.User; diff --git a/RelationshipAnalysis/Services/CRUD/User/UserReceiver.cs b/RelationshipAnalysis/Services/CRUD/User/UserReceiver.cs index c57e646..eb6f68e 100644 --- a/RelationshipAnalysis/Services/CRUD/User/UserReceiver.cs +++ b/RelationshipAnalysis/Services/CRUD/User/UserReceiver.cs @@ -1,5 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; using System.Security.Claims; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.CRUD.User.Abstraction; diff --git a/RelationshipAnalysis/Services/CRUD/User/UserUpdater.cs b/RelationshipAnalysis/Services/CRUD/User/UserUpdater.cs index c123d9f..73e8d71 100644 --- a/RelationshipAnalysis/Services/CRUD/User/UserUpdater.cs +++ b/RelationshipAnalysis/Services/CRUD/User/UserUpdater.cs @@ -1,4 +1,7 @@ -using RelationshipAnalysis.Context; +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.CRUD.User.Abstraction; namespace RelationshipAnalysis.Services.CRUD.User; diff --git a/RelationshipAnalysis/Services/CRUD/UserRole/Abstraction/IUserRolesAdder.cs b/RelationshipAnalysis/Services/CRUD/UserRole/Abstraction/IUserRolesAdder.cs index 6dcabd3..f5cfdbf 100644 --- a/RelationshipAnalysis/Services/CRUD/UserRole/Abstraction/IUserRolesAdder.cs +++ b/RelationshipAnalysis/Services/CRUD/UserRole/Abstraction/IUserRolesAdder.cs @@ -1,4 +1,7 @@ -namespace RelationshipAnalysis.Services.CRUD.UserRole.Abstraction; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace RelationshipAnalysis.Services.CRUD.UserRole.Abstraction; public interface IUserRolesAdder { diff --git a/RelationshipAnalysis/Services/CRUD/UserRole/Abstraction/IUserRolesRemover.cs b/RelationshipAnalysis/Services/CRUD/UserRole/Abstraction/IUserRolesRemover.cs index 4be9734..3167c3c 100644 --- a/RelationshipAnalysis/Services/CRUD/UserRole/Abstraction/IUserRolesRemover.cs +++ b/RelationshipAnalysis/Services/CRUD/UserRole/Abstraction/IUserRolesRemover.cs @@ -1,4 +1,6 @@ -namespace RelationshipAnalysis.Services.CRUD.UserRole.Abstraction; +using System.Threading.Tasks; + +namespace RelationshipAnalysis.Services.CRUD.UserRole.Abstraction; public interface IUserRolesRemover { diff --git a/RelationshipAnalysis/Services/CRUD/UserRole/UserRolesAdder.cs b/RelationshipAnalysis/Services/CRUD/UserRole/UserRolesAdder.cs index 5c6d63a..f2cbce1 100644 --- a/RelationshipAnalysis/Services/CRUD/UserRole/UserRolesAdder.cs +++ b/RelationshipAnalysis/Services/CRUD/UserRole/UserRolesAdder.cs @@ -1,4 +1,9 @@ -using RelationshipAnalysis.Context; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.CRUD.UserRole.Abstraction; namespace RelationshipAnalysis.Services.CRUD.UserRole; diff --git a/RelationshipAnalysis/Services/CRUD/UserRole/UserRolesRemover.cs b/RelationshipAnalysis/Services/CRUD/UserRole/UserRolesRemover.cs index cdb0675..cfd2c86 100644 --- a/RelationshipAnalysis/Services/CRUD/UserRole/UserRolesRemover.cs +++ b/RelationshipAnalysis/Services/CRUD/UserRole/UserRolesRemover.cs @@ -1,4 +1,7 @@ -using Microsoft.EntityFrameworkCore; +using System; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.CRUD.UserRole.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Abstraction/IAttributesReceiver.cs b/RelationshipAnalysis/Services/GraphServices/Abstraction/IAttributesReceiver.cs index 813360e..6d51283 100644 --- a/RelationshipAnalysis/Services/GraphServices/Abstraction/IAttributesReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/Abstraction/IAttributesReceiver.cs @@ -1,3 +1,6 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + namespace RelationshipAnalysis.Services.GraphServices.Abstraction; public interface IAttributesReceiver diff --git a/RelationshipAnalysis/Services/GraphServices/Abstraction/ICsvProcessorService.cs b/RelationshipAnalysis/Services/GraphServices/Abstraction/ICsvProcessorService.cs index 1f182ce..dedd2ae 100644 --- a/RelationshipAnalysis/Services/GraphServices/Abstraction/ICsvProcessorService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Abstraction/ICsvProcessorService.cs @@ -1,3 +1,7 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; + namespace RelationshipAnalysis.Services.GraphServices.Abstraction; public interface ICsvProcessorService diff --git a/RelationshipAnalysis/Services/GraphServices/Abstraction/ICsvValidatorService.cs b/RelationshipAnalysis/Services/GraphServices/Abstraction/ICsvValidatorService.cs index ff63f28..ee46705 100644 --- a/RelationshipAnalysis/Services/GraphServices/Abstraction/ICsvValidatorService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Abstraction/ICsvValidatorService.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Http; using RelationshipAnalysis.Dto; namespace RelationshipAnalysis.Services.GraphServices.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Abstraction/IExpansionGraphReceiver.cs b/RelationshipAnalysis/Services/GraphServices/Abstraction/IExpansionGraphReceiver.cs index 255cfaf..4b9e1d9 100644 --- a/RelationshipAnalysis/Services/GraphServices/Abstraction/IExpansionGraphReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/Abstraction/IExpansionGraphReceiver.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph; diff --git a/RelationshipAnalysis/Services/GraphServices/Abstraction/IInfoReceiver.cs b/RelationshipAnalysis/Services/GraphServices/Abstraction/IInfoReceiver.cs index 03b62b9..2bd0085 100644 --- a/RelationshipAnalysis/Services/GraphServices/Abstraction/IInfoReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/Abstraction/IInfoReceiver.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System.Threading.Tasks; using RelationshipAnalysis.Dto; namespace RelationshipAnalysis.Services.GraphServices.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/CsvProcessorService.cs b/RelationshipAnalysis/Services/GraphServices/CsvProcessorService.cs index 068b7b6..4e5e928 100644 --- a/RelationshipAnalysis/Services/GraphServices/CsvProcessorService.cs +++ b/RelationshipAnalysis/Services/GraphServices/CsvProcessorService.cs @@ -1,7 +1,11 @@ +using System.Collections.Generic; using System.Dynamic; using System.Globalization; +using System.IO; +using System.Threading.Tasks; using CsvHelper; using CsvHelper.Configuration; +using Microsoft.AspNetCore.Http; using RelationshipAnalysis.Services.GraphServices.Abstraction; namespace RelationshipAnalysis.Services.GraphServices; diff --git a/RelationshipAnalysis/Services/GraphServices/CsvValidatorService.cs b/RelationshipAnalysis/Services/GraphServices/CsvValidatorService.cs index 31b543f..403a837 100644 --- a/RelationshipAnalysis/Services/GraphServices/CsvValidatorService.cs +++ b/RelationshipAnalysis/Services/GraphServices/CsvValidatorService.cs @@ -1,7 +1,10 @@ using System.Globalization; +using System.IO; +using System.Linq; using AngleSharp.Text; using CsvHelper; using CsvHelper.Configuration; +using Microsoft.AspNetCore.Http; using Microsoft.IdentityModel.Tokens; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IContextEdgesAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IContextEdgesAdditionService.cs index d2c2798..6b0f61e 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IContextEdgesAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IContextEdgesAdditionService.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System.Threading.Tasks; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Edge; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/ICreateEdgeCategoryService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/ICreateEdgeCategoryService.cs index ab24c13..92f7520 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/ICreateEdgeCategoryService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/ICreateEdgeCategoryService.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Edge; namespace RelationshipAnalysis.Services.GraphServices.Edge.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgeCategoryReceiver.cs b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgeCategoryReceiver.cs index 64eb7d2..55bb0b1 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgeCategoryReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgeCategoryReceiver.cs @@ -1,4 +1,7 @@ -namespace RelationshipAnalysis.Services.GraphServices.Edge.Abstraction; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace RelationshipAnalysis.Services.GraphServices.Edge.Abstraction; public interface IEdgeCategoryReceiver { diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgeValueAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgeValueAdditionService.cs index 24e0133..18aca1c 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgeValueAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgeValueAdditionService.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System.Threading.Tasks; using RelationshipAnalysis.Context; namespace RelationshipAnalysis.Services.GraphServices.Edge.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgesAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgesAdditionService.cs index e5aa493..2956fe4 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgesAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/IEdgesAdditionService.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Edge; namespace RelationshipAnalysis.Services.GraphServices.Edge.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/ISingleEdgeAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/ISingleEdgeAdditionService.cs index 755da4d..fc37bc8 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/ISingleEdgeAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/Abstraction/ISingleEdgeAdditionService.cs @@ -1,4 +1,6 @@ -using RelationshipAnalysis.Context; +using System.Collections.Generic; +using System.Threading.Tasks; +using RelationshipAnalysis.Context; namespace RelationshipAnalysis.Services.GraphServices.Edge.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/ContextEdgesAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/ContextEdgesAdditionService.cs index 386c10c..b07f21d 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/ContextEdgesAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/ContextEdgesAdditionService.cs @@ -1,3 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Edge; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/CreateEdgeCategoryService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/CreateEdgeCategoryService.cs index 5b0e980..dfadbe4 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/CreateEdgeCategoryService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/CreateEdgeCategoryService.cs @@ -1,4 +1,8 @@ -using RelationshipAnalysis.Context; +using System; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Edge; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/EdgeCategoryReceiver.cs b/RelationshipAnalysis/Services/GraphServices/Edge/EdgeCategoryReceiver.cs index 2ee14c6..c6df1d5 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/EdgeCategoryReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/EdgeCategoryReceiver.cs @@ -1,4 +1,9 @@ -using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.GraphServices.Edge.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/EdgeValueAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/EdgeValueAdditionService.cs index 22dfea4..3e5eeb2 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/EdgeValueAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/EdgeValueAdditionService.cs @@ -1,3 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using RelationshipAnalysis.Context; using RelationshipAnalysis.Models.Graph.Edge; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/EdgesAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/EdgesAdditionService.cs index b414b2a..5a7e964 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/EdgesAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/EdgesAdditionService.cs @@ -1,4 +1,7 @@ -using Microsoft.EntityFrameworkCore; +using System; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Edge; diff --git a/RelationshipAnalysis/Services/GraphServices/Edge/SingleEdgeAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Edge/SingleEdgeAdditionService.cs index 7efff67..47ed261 100644 --- a/RelationshipAnalysis/Services/GraphServices/Edge/SingleEdgeAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Edge/SingleEdgeAdditionService.cs @@ -1,4 +1,7 @@ -using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; using Microsoft.IdentityModel.Tokens; using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.GraphServices.Edge.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/EdgeAttributesReceiver.cs b/RelationshipAnalysis/Services/GraphServices/EdgeAttributesReceiver.cs index e66520a..e552883 100644 --- a/RelationshipAnalysis/Services/GraphServices/EdgeAttributesReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/EdgeAttributesReceiver.cs @@ -1,4 +1,9 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.GraphServices.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/EdgeInfoReceiver.cs b/RelationshipAnalysis/Services/GraphServices/EdgeInfoReceiver.cs index 8061e7c..23ea32c 100644 --- a/RelationshipAnalysis/Services/GraphServices/EdgeInfoReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/EdgeInfoReceiver.cs @@ -1,3 +1,8 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/GraphServices/ExpansionGraphReceiver.cs b/RelationshipAnalysis/Services/GraphServices/ExpansionGraphReceiver.cs index 4ee02a4..819ee46 100644 --- a/RelationshipAnalysis/Services/GraphServices/ExpansionGraphReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/ExpansionGraphReceiver.cs @@ -1,4 +1,9 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto.Graph; using RelationshipAnalysis.Models.Graph; diff --git a/RelationshipAnalysis/Services/GraphServices/Graph/Abstraction/IGraphDtoCreator.cs b/RelationshipAnalysis/Services/GraphServices/Graph/Abstraction/IGraphDtoCreator.cs index fc828c7..7390e21 100644 --- a/RelationshipAnalysis/Services/GraphServices/Graph/Abstraction/IGraphDtoCreator.cs +++ b/RelationshipAnalysis/Services/GraphServices/Graph/Abstraction/IGraphDtoCreator.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using RelationshipAnalysis.Dto.Graph; namespace RelationshipAnalysis.Services.GraphServices.Graph.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Graph/Abstraction/IGraphReceiver.cs b/RelationshipAnalysis/Services/GraphServices/Graph/Abstraction/IGraphReceiver.cs index 538553c..8c900b0 100644 --- a/RelationshipAnalysis/Services/GraphServices/Graph/Abstraction/IGraphReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/Graph/Abstraction/IGraphReceiver.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using RelationshipAnalysis.Dto.Graph; namespace RelationshipAnalysis.Services.GraphServices.Graph.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Graph/GraphDtoCreator.cs b/RelationshipAnalysis/Services/GraphServices/Graph/GraphDtoCreator.cs index 4892edf..f3469f5 100644 --- a/RelationshipAnalysis/Services/GraphServices/Graph/GraphDtoCreator.cs +++ b/RelationshipAnalysis/Services/GraphServices/Graph/GraphDtoCreator.cs @@ -1,3 +1,5 @@ +using System; +using System.Collections.Generic; using RelationshipAnalysis.Dto.Graph; using RelationshipAnalysis.Dto.Graph.Edge; using RelationshipAnalysis.Dto.Graph.Node; diff --git a/RelationshipAnalysis/Services/GraphServices/Graph/GraphReceiver.cs b/RelationshipAnalysis/Services/GraphServices/Graph/GraphReceiver.cs index c7cdb05..fa6d7dd 100644 --- a/RelationshipAnalysis/Services/GraphServices/Graph/GraphReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/Graph/GraphReceiver.cs @@ -1,4 +1,7 @@ +using System; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto.Graph; using RelationshipAnalysis.Services.GraphServices.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/IContextNodesAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/IContextNodesAdditionService.cs index e10ff7c..2fc3f1f 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/IContextNodesAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/IContextNodesAdditionService.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System.Threading.Tasks; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Models.Graph.Node; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/ICreateNodeCategoryService.cs b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/ICreateNodeCategoryService.cs index e6e0888..f905872 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/ICreateNodeCategoryService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/ICreateNodeCategoryService.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Node; namespace RelationshipAnalysis.Services.GraphServices.Node.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodeCategoryReceiver.cs b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodeCategoryReceiver.cs index d3a6bc4..b2feef6 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodeCategoryReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodeCategoryReceiver.cs @@ -1,4 +1,7 @@ -namespace RelationshipAnalysis.Services.GraphServices.Node.Abstraction; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace RelationshipAnalysis.Services.GraphServices.Node.Abstraction; public interface INodeCategoryReceiver { diff --git a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodeValueAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodeValueAdditionService.cs index 3e1cd06..51b8602 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodeValueAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodeValueAdditionService.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System.Threading.Tasks; using RelationshipAnalysis.Context; namespace RelationshipAnalysis.Services.GraphServices.Node.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodesAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodesAdditionService.cs index a19e85c..d9b468a 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodesAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/INodesAdditionService.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Node; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/ISingleNodeAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/ISingleNodeAdditionService.cs index 245f5ce..dac897d 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/ISingleNodeAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/Abstraction/ISingleNodeAdditionService.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System.Threading.Tasks; using RelationshipAnalysis.Context; namespace RelationshipAnalysis.Services.GraphServices.Node.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/ContextNodesAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Node/ContextNodesAdditionService.cs index 0590f6c..b2aa1e8 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/ContextNodesAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/ContextNodesAdditionService.cs @@ -1,3 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/CreateNodeCategoryService.cs b/RelationshipAnalysis/Services/GraphServices/Node/CreateNodeCategoryService.cs index b7830ec..bef52ef 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/CreateNodeCategoryService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/CreateNodeCategoryService.cs @@ -1,4 +1,8 @@ -using RelationshipAnalysis.Context; +using System; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Node; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/NodeCategoryReceiver.cs b/RelationshipAnalysis/Services/GraphServices/Node/NodeCategoryReceiver.cs index e1d9013..e9c4dc8 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/NodeCategoryReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/NodeCategoryReceiver.cs @@ -1,4 +1,9 @@ -using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.GraphServices.Node.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/NodeValueAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Node/NodeValueAdditionService.cs index e318f9f..7f60532 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/NodeValueAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/NodeValueAdditionService.cs @@ -1,3 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using RelationshipAnalysis.Context; using RelationshipAnalysis.Models.Graph.Node; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/NodesAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Node/NodesAdditionService.cs index 40c7a21..c7db6ac 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/NodesAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/NodesAdditionService.cs @@ -1,4 +1,7 @@ +using System; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Graph.Node; diff --git a/RelationshipAnalysis/Services/GraphServices/Node/SingleNodeAdditionService.cs b/RelationshipAnalysis/Services/GraphServices/Node/SingleNodeAdditionService.cs index 822f813..166b733 100644 --- a/RelationshipAnalysis/Services/GraphServices/Node/SingleNodeAdditionService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Node/SingleNodeAdditionService.cs @@ -1,3 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Microsoft.IdentityModel.Tokens; using RelationshipAnalysis.Context; diff --git a/RelationshipAnalysis/Services/GraphServices/NodeAttributesReceiver.cs b/RelationshipAnalysis/Services/GraphServices/NodeAttributesReceiver.cs index 472e949..1954a4d 100644 --- a/RelationshipAnalysis/Services/GraphServices/NodeAttributesReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/NodeAttributesReceiver.cs @@ -1,4 +1,9 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Services.GraphServices.Abstraction; diff --git a/RelationshipAnalysis/Services/GraphServices/NodeInfoReceiver.cs b/RelationshipAnalysis/Services/GraphServices/NodeInfoReceiver.cs index 0d8fa2e..c78a3a6 100644 --- a/RelationshipAnalysis/Services/GraphServices/NodeInfoReceiver.cs +++ b/RelationshipAnalysis/Services/GraphServices/NodeInfoReceiver.cs @@ -1,4 +1,9 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserDtoCreator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserDtoCreator.cs index f366e9b..57db847 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserDtoCreator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserDtoCreator.cs @@ -1,4 +1,6 @@ -using RelationshipAnalysis.Dto.Panel.Admin; +using System.Collections.Generic; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto.Panel.Admin; using RelationshipAnalysis.Models.Auth; namespace RelationshipAnalysis.Services.Panel.AdminPanelServices.AllUserService.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserService.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserService.cs index 06bf286..1dd9510 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserService.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserService.cs @@ -1,4 +1,6 @@ -using RelationshipAnalysis.Dto; +using System.Collections.Generic; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.Admin; using RelationshipAnalysis.Models.Auth; using GetAllUsersDto = RelationshipAnalysis.Dto.Panel.Admin.GetAllUsersDto; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserServiceValidator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserServiceValidator.cs index c92504a..defd073 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/Abstraction/IAllUserServiceValidator.cs @@ -1,4 +1,6 @@ -using RelationshipAnalysis.Dto; +using System.Collections.Generic; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.Admin; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserDtoCreator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserDtoCreator.cs index d32d870..c703690 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserDtoCreator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserDtoCreator.cs @@ -1,4 +1,6 @@ -using AutoMapper; +using System.Collections.Generic; +using System.Threading.Tasks; +using AutoMapper; using RelationshipAnalysis.Dto.Panel.Admin; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserService.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserService.cs index 337b2fa..99857d2 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserService.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserService.cs @@ -1,4 +1,6 @@ -using RelationshipAnalysis.Dto; +using System.Collections.Generic; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.Admin; using RelationshipAnalysis.Enums; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserServiceValidator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserServiceValidator.cs index ba39e68..382aa30 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/AllUserService/AllUserServiceValidator.cs @@ -1,4 +1,6 @@ -using Microsoft.IdentityModel.Tokens; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.IdentityModel.Tokens; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.Admin; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/Abstraction/IUserCreateService.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/Abstraction/IUserCreateService.cs index ec44eed..81c401e 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/Abstraction/IUserCreateService.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/Abstraction/IUserCreateService.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.Admin; using CreateUserDto = RelationshipAnalysis.Dto.Panel.Admin.CreateUserDto; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/Abstraction/IUserCreateServiceValidator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/Abstraction/IUserCreateServiceValidator.cs index e031534..460ffee 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/Abstraction/IUserCreateServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/Abstraction/IUserCreateServiceValidator.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.Admin; namespace RelationshipAnalysis.Services.Panel.AdminPanelServices.CreateUserService.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/UserCreateService.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/UserCreateService.cs index b69d608..1d56887 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/UserCreateService.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/UserCreateService.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.Admin; using RelationshipAnalysis.Enums; using RelationshipAnalysis.Services.CRUD.Role.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/UserCreateServiceValidator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/UserCreateServiceValidator.cs index f00e54e..ea03afb 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/UserCreateServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/CreateUserService/UserCreateServiceValidator.cs @@ -1,4 +1,8 @@ -using Microsoft.IdentityModel.Tokens; +using System; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.Admin; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/Abstraction/IUserDeleteService.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/Abstraction/IUserDeleteService.cs index 19ddd23..50076f3 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/Abstraction/IUserDeleteService.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/Abstraction/IUserDeleteService.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Models.Auth; namespace RelationshipAnalysis.Services.Panel.AdminPanelServices.UserDeleteService.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/Abstraction/IUserDeleteServiceValidator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/Abstraction/IUserDeleteServiceValidator.cs index 659a4cf..09071be 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/Abstraction/IUserDeleteServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/Abstraction/IUserDeleteServiceValidator.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Models.Auth; namespace RelationshipAnalysis.Services.Panel.AdminPanelServices.UserDeleteService.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/UserDeleteService.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/UserDeleteService.cs index f87648d..4534f79 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/UserDeleteService.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/UserDeleteService.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Enums; using RelationshipAnalysis.Models.Auth; using RelationshipAnalysis.Services.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/UserDeleteServiceValidator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/UserDeleteServiceValidator.cs index 5d08d68..d8d95cf 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/UserDeleteServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserDeleteService/UserDeleteServiceValidator.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Enums; using RelationshipAnalysis.Models.Auth; using RelationshipAnalysis.Services.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/Abstraction/IUserUpdateRolesService.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/Abstraction/IUserUpdateRolesService.cs index c50cd88..3546791 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/Abstraction/IUserUpdateRolesService.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/Abstraction/IUserUpdateRolesService.cs @@ -1,4 +1,6 @@ -using RelationshipAnalysis.Dto; +using System.Collections.Generic; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Models.Auth; namespace RelationshipAnalysis.Services.Panel.AdminPanelServices.UserUpdateRolesService.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/Abstraction/IUserUpdateRolesServiceValidator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/Abstraction/IUserUpdateRolesServiceValidator.cs index f66f1af..d09980c 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/Abstraction/IUserUpdateRolesServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/Abstraction/IUserUpdateRolesServiceValidator.cs @@ -1,4 +1,6 @@ -using RelationshipAnalysis.Dto; +using System.Collections.Generic; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Models.Auth; namespace RelationshipAnalysis.Services.Panel.AdminPanelServices.UserUpdateRolesService.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/UserUpdateRolesService.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/UserUpdateRolesService.cs index b68e151..5b7f003 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/UserUpdateRolesService.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/UserUpdateRolesService.cs @@ -1,4 +1,6 @@ -using RelationshipAnalysis.Dto; +using System.Collections.Generic; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Enums; using RelationshipAnalysis.Models.Auth; using RelationshipAnalysis.Services.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/UserUpdateRolesServiceValidator.cs b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/UserUpdateRolesServiceValidator.cs index c97aac9..9389caa 100644 --- a/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/UserUpdateRolesServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/AdminPanelServices/UserUpdateRolesService/UserUpdateRolesServiceValidator.cs @@ -1,4 +1,9 @@ -using Microsoft.IdentityModel.Tokens; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/LogoutService/Abstraction/ILogoutService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/LogoutService/Abstraction/ILogoutService.cs index e1f222d..86c8d3d 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/LogoutService/Abstraction/ILogoutService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/LogoutService/Abstraction/ILogoutService.cs @@ -1,3 +1,5 @@ +using Microsoft.AspNetCore.Http; + namespace RelationshipAnalysis.Services.Panel.UserPanelServices.LogoutService.Abstraction; public interface ILogoutService diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/LogoutService/LogoutService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/LogoutService/LogoutService.cs index 8afe221..aa4fb06 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/LogoutService/LogoutService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/LogoutService/LogoutService.cs @@ -1,3 +1,4 @@ +using Microsoft.AspNetCore.Http; using RelationshipAnalysis.Services.Panel.UserPanelServices.LogoutService.Abstraction; namespace RelationshipAnalysis.Services.Panel.UserPanelServices.LogoutService; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/PermissionsService/Abstraction/IPermissionService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/PermissionsService/Abstraction/IPermissionService.cs index b77b4ea..6f81f19 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/PermissionsService/Abstraction/IPermissionService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/PermissionsService/Abstraction/IPermissionService.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; using PermissionDto = RelationshipAnalysis.Dto.Panel.User.PermissionDto; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/PermissionsService/PermissionService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/PermissionsService/PermissionService.cs index 9e7ee93..a1daefa 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/PermissionsService/PermissionService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/PermissionsService/PermissionService.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +using System.Threading.Tasks; +using Newtonsoft.Json; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserInfoService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserInfoService.cs index 9147a98..3a7bc87 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserInfoService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserInfoService.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserInfoServiceValidator.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserInfoServiceValidator.cs index f50cdeb..58c6838 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserInfoServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserInfoServiceValidator.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserOutputInfoDtoCreator.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserOutputInfoDtoCreator.cs index 6580bfc..93d0659 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserOutputInfoDtoCreator.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/Abstraction/IUserOutputInfoDtoCreator.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto.Panel.User; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; namespace RelationshipAnalysis.Services.Panel.UserPanelServices.UserInfoService.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserInfoService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserInfoService.cs index f88f5ad..eae0f1c 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserInfoService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserInfoService.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserInfoServiceValidator.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserInfoServiceValidator.cs index 83893d7..01efaa8 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserInfoServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserInfoServiceValidator.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Enums; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserOutputInfoDtoCreator.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserOutputInfoDtoCreator.cs index 90ee542..03ef2c7 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserOutputInfoDtoCreator.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserInfoService/UserOutputInfoDtoCreator.cs @@ -1,4 +1,5 @@ -using AutoMapper; +using System.Threading.Tasks; +using AutoMapper; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; using RelationshipAnalysis.Services.CRUD.Role.Abstraction; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/Abstraction/IUserUpdateInfoService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/Abstraction/IUserUpdateInfoService.cs index 8127573..11f8402 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/Abstraction/IUserUpdateInfoService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/Abstraction/IUserUpdateInfoService.cs @@ -1,3 +1,5 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/Abstraction/IUserUpdateInfoServiceValidator.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/Abstraction/IUserUpdateInfoServiceValidator.cs index be53e4f..f1984e6 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/Abstraction/IUserUpdateInfoServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/Abstraction/IUserUpdateInfoServiceValidator.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/UserUpdateInfoService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/UserUpdateInfoService.cs index 32a6c45..08a5592 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/UserUpdateInfoService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/UserUpdateInfoService.cs @@ -1,4 +1,6 @@ +using System.Threading.Tasks; using AutoMapper; +using Microsoft.AspNetCore.Http; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/UserUpdateInfoServiceValidator.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/UserUpdateInfoServiceValidator.cs index c7db0b1..270df43 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/UserUpdateInfoServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdateInfoService/UserUpdateInfoServiceValidator.cs @@ -1,4 +1,8 @@ -using RelationshipAnalysis.Context; +using System; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using RelationshipAnalysis.Context; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/Abstraction/IUserUpdatePasswordService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/Abstraction/IUserUpdatePasswordService.cs index c8580ff..f58203f 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/Abstraction/IUserUpdatePasswordService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/Abstraction/IUserUpdatePasswordService.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/Abstraction/IUserUpdatePasswordServiceValidator.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/Abstraction/IUserUpdatePasswordServiceValidator.cs index ebccf6e..50ee11f 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/Abstraction/IUserUpdatePasswordServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/Abstraction/IUserUpdatePasswordServiceValidator.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Models.Auth; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/UserUpdatePasswordService.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/UserUpdatePasswordService.cs index a2e0a86..c3a79e3 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/UserUpdatePasswordService.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/UserUpdatePasswordService.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Enums; diff --git a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/UserUpdatePasswordServiceValidator.cs b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/UserUpdatePasswordServiceValidator.cs index e583549..328ca55 100644 --- a/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/UserUpdatePasswordServiceValidator.cs +++ b/RelationshipAnalysis/Services/Panel/UserPanelServices/UserUpdatePasswordService/UserUpdatePasswordServiceValidator.cs @@ -1,4 +1,5 @@ -using RelationshipAnalysis.Dto; +using System.Threading.Tasks; +using RelationshipAnalysis.Dto; using RelationshipAnalysis.Dto.Panel.User; using RelationshipAnalysis.Enums; using RelationshipAnalysis.Models.Auth; From e6bf5d7993396a65d233d2b8a4f6db1eda65328f Mon Sep 17 00:00:00 2001 From: sadq Date: Sat, 7 Sep 2024 23:16:47 +0330 Subject: [PATCH 2/3] merge --- .../20240907090417_InitialCreate.Designer.cs | 427 ++++++++++++++++++ .../20240907090417_InitialCreate.cs | 319 +++++++++++++ 2 files changed, 746 insertions(+) create mode 100644 RelationshipAnalysis/Migrations/20240907090417_InitialCreate.Designer.cs create mode 100644 RelationshipAnalysis/Migrations/20240907090417_InitialCreate.cs diff --git a/RelationshipAnalysis/Migrations/20240907090417_InitialCreate.Designer.cs b/RelationshipAnalysis/Migrations/20240907090417_InitialCreate.Designer.cs new file mode 100644 index 0000000..adf7560 --- /dev/null +++ b/RelationshipAnalysis/Migrations/20240907090417_InitialCreate.Designer.cs @@ -0,0 +1,427 @@ +// +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using RelationshipAnalysis.Context; + +#nullable disable + +namespace RelationshipAnalysis.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20240907090417_InitialCreate")] + partial class InitialCreate + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "8.0.8") + .HasAnnotation("Proxies:ChangeTracking", false) + .HasAnnotation("Proxies:CheckEquality", false) + .HasAnnotation("Proxies:LazyLoading", true) + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("RelationshipAnalysis.Models.Auth.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("character varying(50)"); + + b.Property("Permissions") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Roles"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Auth.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Email") + .IsRequired() + .HasColumnType("text"); + + b.Property("FirstName") + .IsRequired() + .HasColumnType("text"); + + b.Property("LastName") + .IsRequired() + .HasColumnType("text"); + + b.Property("PasswordHash") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("Username") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("character varying(50)"); + + b.HasKey("Id"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Auth.UserRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.HasIndex("UserId"); + + b.ToTable("UserRoles"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Edge.Edge", b => + { + b.Property("EdgeId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("EdgeId")); + + b.Property("EdgeCategoryId") + .HasColumnType("integer"); + + b.Property("EdgeDestinationNodeId") + .HasColumnType("integer"); + + b.Property("EdgeSourceNodeId") + .HasColumnType("integer"); + + b.Property("EdgeUniqueString") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("EdgeId"); + + b.HasIndex("EdgeCategoryId"); + + b.HasIndex("EdgeDestinationNodeId"); + + b.HasIndex("EdgeSourceNodeId"); + + b.ToTable("Edges"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Edge.EdgeAttribute", b => + { + b.Property("EdgeAttributeId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("EdgeAttributeId")); + + b.Property("EdgeAttributeName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("EdgeAttributeId"); + + b.ToTable("EdgeAttributes"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Edge.EdgeCategory", b => + { + b.Property("EdgeCategoryId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("EdgeCategoryId")); + + b.Property("EdgeCategoryName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("EdgeCategoryId"); + + b.ToTable("EdgeCategories"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Edge.EdgeValue", b => + { + b.Property("ValueId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("ValueId")); + + b.Property("EdgeAttributeId") + .HasColumnType("integer"); + + b.Property("EdgeId") + .HasColumnType("integer"); + + b.Property("ValueData") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("ValueId"); + + b.HasIndex("EdgeAttributeId"); + + b.HasIndex("EdgeId"); + + b.ToTable("EdgeValues"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Node.Node", b => + { + b.Property("NodeId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("NodeId")); + + b.Property("NodeCategoryId") + .HasColumnType("integer"); + + b.Property("NodeUniqueString") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("NodeId"); + + b.HasIndex("NodeCategoryId"); + + b.ToTable("Nodes"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Node.NodeAttribute", b => + { + b.Property("NodeAttributeId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("NodeAttributeId")); + + b.Property("NodeAttributeName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("NodeAttributeId"); + + b.ToTable("NodeAttributes"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Node.NodeCategory", b => + { + b.Property("NodeCategoryId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("NodeCategoryId")); + + b.Property("NodeCategoryName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("NodeCategoryId"); + + b.ToTable("NodeCategories"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Node.NodeValue", b => + { + b.Property("ValueId") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("ValueId")); + + b.Property("NodeAttributeId") + .HasColumnType("integer"); + + b.Property("NodeId") + .HasColumnType("integer"); + + b.Property("ValueData") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("ValueId"); + + b.HasIndex("NodeAttributeId"); + + b.HasIndex("NodeId"); + + b.ToTable("NodeValues"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Auth.UserRole", b => + { + b.HasOne("RelationshipAnalysis.Models.Auth.Role", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("RelationshipAnalysis.Models.Auth.User", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Edge.Edge", b => + { + b.HasOne("RelationshipAnalysis.Models.Graph.Edge.EdgeCategory", "EdgeCategory") + .WithMany("Edges") + .HasForeignKey("EdgeCategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("RelationshipAnalysis.Models.Graph.Node.Node", "NodeDestination") + .WithMany("DestinationEdges") + .HasForeignKey("EdgeDestinationNodeId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("RelationshipAnalysis.Models.Graph.Node.Node", "NodeSource") + .WithMany("SourceEdges") + .HasForeignKey("EdgeSourceNodeId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("EdgeCategory"); + + b.Navigation("NodeDestination"); + + b.Navigation("NodeSource"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Edge.EdgeValue", b => + { + b.HasOne("RelationshipAnalysis.Models.Graph.Edge.EdgeAttribute", "EdgeAttribute") + .WithMany("EdgeValues") + .HasForeignKey("EdgeAttributeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("RelationshipAnalysis.Models.Graph.Edge.Edge", "Edge") + .WithMany("EdgeValues") + .HasForeignKey("EdgeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Edge"); + + b.Navigation("EdgeAttribute"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Node.Node", b => + { + b.HasOne("RelationshipAnalysis.Models.Graph.Node.NodeCategory", "NodeCategory") + .WithMany("Nodes") + .HasForeignKey("NodeCategoryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("NodeCategory"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Node.NodeValue", b => + { + b.HasOne("RelationshipAnalysis.Models.Graph.Node.NodeAttribute", "NodeAttribute") + .WithMany("Values") + .HasForeignKey("NodeAttributeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("RelationshipAnalysis.Models.Graph.Node.Node", "Node") + .WithMany("Values") + .HasForeignKey("NodeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Node"); + + b.Navigation("NodeAttribute"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Auth.Role", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Auth.User", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Edge.Edge", b => + { + b.Navigation("EdgeValues"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Edge.EdgeAttribute", b => + { + b.Navigation("EdgeValues"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Edge.EdgeCategory", b => + { + b.Navigation("Edges"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Node.Node", b => + { + b.Navigation("DestinationEdges"); + + b.Navigation("SourceEdges"); + + b.Navigation("Values"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Node.NodeAttribute", b => + { + b.Navigation("Values"); + }); + + modelBuilder.Entity("RelationshipAnalysis.Models.Graph.Node.NodeCategory", b => + { + b.Navigation("Nodes"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/RelationshipAnalysis/Migrations/20240907090417_InitialCreate.cs b/RelationshipAnalysis/Migrations/20240907090417_InitialCreate.cs new file mode 100644 index 0000000..c5eb62a --- /dev/null +++ b/RelationshipAnalysis/Migrations/20240907090417_InitialCreate.cs @@ -0,0 +1,319 @@ +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace RelationshipAnalysis.Migrations +{ + /// + public partial class InitialCreate : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "EdgeAttributes", + columns: table => new + { + EdgeAttributeId = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + EdgeAttributeName = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_EdgeAttributes", x => x.EdgeAttributeId); + }); + + migrationBuilder.CreateTable( + name: "EdgeCategories", + columns: table => new + { + EdgeCategoryId = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + EdgeCategoryName = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_EdgeCategories", x => x.EdgeCategoryId); + }); + + migrationBuilder.CreateTable( + name: "NodeAttributes", + columns: table => new + { + NodeAttributeId = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + NodeAttributeName = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_NodeAttributes", x => x.NodeAttributeId); + }); + + migrationBuilder.CreateTable( + name: "NodeCategories", + columns: table => new + { + NodeCategoryId = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + NodeCategoryName = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_NodeCategories", x => x.NodeCategoryId); + }); + + migrationBuilder.CreateTable( + name: "Roles", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + Name = table.Column(type: "character varying(50)", maxLength: 50, nullable: false), + Permissions = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Roles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Users", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + Username = table.Column(type: "character varying(50)", maxLength: 50, nullable: false), + PasswordHash = table.Column(type: "character varying(256)", maxLength: 256, nullable: false), + FirstName = table.Column(type: "text", nullable: false), + LastName = table.Column(type: "text", nullable: false), + Email = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Users", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Nodes", + columns: table => new + { + NodeId = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + NodeUniqueString = table.Column(type: "text", nullable: false), + NodeCategoryId = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Nodes", x => x.NodeId); + table.ForeignKey( + name: "FK_Nodes_NodeCategories_NodeCategoryId", + column: x => x.NodeCategoryId, + principalTable: "NodeCategories", + principalColumn: "NodeCategoryId", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "UserRoles", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + UserId = table.Column(type: "integer", nullable: false), + RoleId = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_UserRoles", x => x.Id); + table.ForeignKey( + name: "FK_UserRoles_Roles_RoleId", + column: x => x.RoleId, + principalTable: "Roles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_UserRoles_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Edges", + columns: table => new + { + EdgeId = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + EdgeSourceNodeId = table.Column(type: "integer", nullable: false), + EdgeDestinationNodeId = table.Column(type: "integer", nullable: false), + EdgeCategoryId = table.Column(type: "integer", nullable: false), + EdgeUniqueString = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Edges", x => x.EdgeId); + table.ForeignKey( + name: "FK_Edges_EdgeCategories_EdgeCategoryId", + column: x => x.EdgeCategoryId, + principalTable: "EdgeCategories", + principalColumn: "EdgeCategoryId", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Edges_Nodes_EdgeDestinationNodeId", + column: x => x.EdgeDestinationNodeId, + principalTable: "Nodes", + principalColumn: "NodeId", + onDelete: ReferentialAction.Restrict); + table.ForeignKey( + name: "FK_Edges_Nodes_EdgeSourceNodeId", + column: x => x.EdgeSourceNodeId, + principalTable: "Nodes", + principalColumn: "NodeId", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "NodeValues", + columns: table => new + { + ValueId = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + NodeId = table.Column(type: "integer", nullable: false), + NodeAttributeId = table.Column(type: "integer", nullable: false), + ValueData = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_NodeValues", x => x.ValueId); + table.ForeignKey( + name: "FK_NodeValues_NodeAttributes_NodeAttributeId", + column: x => x.NodeAttributeId, + principalTable: "NodeAttributes", + principalColumn: "NodeAttributeId", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_NodeValues_Nodes_NodeId", + column: x => x.NodeId, + principalTable: "Nodes", + principalColumn: "NodeId", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "EdgeValues", + columns: table => new + { + ValueId = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + EdgeId = table.Column(type: "integer", nullable: false), + EdgeAttributeId = table.Column(type: "integer", nullable: false), + ValueData = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_EdgeValues", x => x.ValueId); + table.ForeignKey( + name: "FK_EdgeValues_EdgeAttributes_EdgeAttributeId", + column: x => x.EdgeAttributeId, + principalTable: "EdgeAttributes", + principalColumn: "EdgeAttributeId", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_EdgeValues_Edges_EdgeId", + column: x => x.EdgeId, + principalTable: "Edges", + principalColumn: "EdgeId", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_Edges_EdgeCategoryId", + table: "Edges", + column: "EdgeCategoryId"); + + migrationBuilder.CreateIndex( + name: "IX_Edges_EdgeDestinationNodeId", + table: "Edges", + column: "EdgeDestinationNodeId"); + + migrationBuilder.CreateIndex( + name: "IX_Edges_EdgeSourceNodeId", + table: "Edges", + column: "EdgeSourceNodeId"); + + migrationBuilder.CreateIndex( + name: "IX_EdgeValues_EdgeAttributeId", + table: "EdgeValues", + column: "EdgeAttributeId"); + + migrationBuilder.CreateIndex( + name: "IX_EdgeValues_EdgeId", + table: "EdgeValues", + column: "EdgeId"); + + migrationBuilder.CreateIndex( + name: "IX_Nodes_NodeCategoryId", + table: "Nodes", + column: "NodeCategoryId"); + + migrationBuilder.CreateIndex( + name: "IX_NodeValues_NodeAttributeId", + table: "NodeValues", + column: "NodeAttributeId"); + + migrationBuilder.CreateIndex( + name: "IX_NodeValues_NodeId", + table: "NodeValues", + column: "NodeId"); + + migrationBuilder.CreateIndex( + name: "IX_UserRoles_RoleId", + table: "UserRoles", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "IX_UserRoles_UserId", + table: "UserRoles", + column: "UserId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "EdgeValues"); + + migrationBuilder.DropTable( + name: "NodeValues"); + + migrationBuilder.DropTable( + name: "UserRoles"); + + migrationBuilder.DropTable( + name: "EdgeAttributes"); + + migrationBuilder.DropTable( + name: "Edges"); + + migrationBuilder.DropTable( + name: "NodeAttributes"); + + migrationBuilder.DropTable( + name: "Roles"); + + migrationBuilder.DropTable( + name: "Users"); + + migrationBuilder.DropTable( + name: "EdgeCategories"); + + migrationBuilder.DropTable( + name: "Nodes"); + + migrationBuilder.DropTable( + name: "NodeCategories"); + } + } +} From 58f4ba88f7d421b03b8c6136a0af6729781929d6 Mon Sep 17 00:00:00 2001 From: sadq Date: Sun, 8 Sep 2024 23:42:38 +0330 Subject: [PATCH 3/3] fix clause validator dependency and inject it in search service --- .../Resources.Designer.cs | 204 --------------- .../Resources.resx | 108 -------- .../Resources.Designer.cs | 246 ------------------ RelationshipAnalysis.Test/Resources.resx | 130 --------- .../ClauseValidatorServiceTests.cs | 108 ++++++++ RelationshipAnalysis/Program.cs | 1 + RelationshipAnalysis/Resources.Designer.cs | 80 +++--- .../Abstraction/IClauseValidatorService.cs | 13 + .../GraphServices/ClauseValidatorService.cs | 49 ++++ .../Graph/GraphSearcherService.cs | 168 +++++------- 10 files changed, 277 insertions(+), 830 deletions(-) delete mode 100644 RelationshipAnalysis.Integration.Test/Resources.Designer.cs delete mode 100644 RelationshipAnalysis.Integration.Test/Resources.resx delete mode 100644 RelationshipAnalysis.Test/Resources.Designer.cs delete mode 100644 RelationshipAnalysis.Test/Resources.resx create mode 100644 RelationshipAnalysis.Test/Services/GraphServices/ClauseValidatorServiceTests.cs create mode 100644 RelationshipAnalysis/Services/GraphServices/Abstraction/IClauseValidatorService.cs create mode 100644 RelationshipAnalysis/Services/GraphServices/ClauseValidatorService.cs diff --git a/RelationshipAnalysis.Integration.Test/Resources.Designer.cs b/RelationshipAnalysis.Integration.Test/Resources.Designer.cs deleted file mode 100644 index 434b002..0000000 --- a/RelationshipAnalysis.Integration.Test/Resources.Designer.cs +++ /dev/null @@ -1,204 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace RelationshipAnalysis.Integration.Test { - using System; - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Resources.ResourceManager ResourceManager { - get { - if (object.Equals(null, resourceMan)) { - System.Resources.ResourceManager temp = new System.Resources.ResourceManager("RelationshipAnalysis.Integration.Test.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - internal static string ValidFileMessage { - get { - return ResourceManager.GetString("ValidFileMessage", resourceCulture); - } - } - - internal static string FailedAddRecordsMessage { - get { - return ResourceManager.GetString("FailedAddRecordsMessage", resourceCulture); - } - } - - internal static string InvalidHeaderAttribute { - get { - return ResourceManager.GetString("InvalidHeaderAttribute", resourceCulture); - } - } - - internal static string TwoSameHeadersMessage { - get { - return ResourceManager.GetString("TwoSameHeadersMessage", resourceCulture); - } - } - - internal static string InvalidNodeCategory { - get { - return ResourceManager.GetString("InvalidNodeCategory", resourceCulture); - } - } - - internal static string SuccessfulNodeAdditionMessage { - get { - return ResourceManager.GetString("SuccessfulNodeAdditionMessage", resourceCulture); - } - } - - internal static string NoFileUploadedMessage { - get { - return ResourceManager.GetString("NoFileUploadedMessage", resourceCulture); - } - } - - internal static string EmailExistsMessage { - get { - return ResourceManager.GetString("EmailExistsMessage", resourceCulture); - } - } - - internal static string SuccessfulLogoutMessage { - get { - return ResourceManager.GetString("SuccessfulLogoutMessage", resourceCulture); - } - } - - internal static string InvalidPasswordMessage { - get { - return ResourceManager.GetString("InvalidPasswordMessage", resourceCulture); - } - } - - internal static string UserNotFoundMessage { - get { - return ResourceManager.GetString("UserNotFoundMessage", resourceCulture); - } - } - - internal static string WrongOldPasswordMessage { - get { - return ResourceManager.GetString("WrongOldPasswordMessage", resourceCulture); - } - } - - internal static string OldPasswordRequired { - get { - return ResourceManager.GetString("OldPasswordRequired", resourceCulture); - } - } - - internal static string NewPasswordRequired { - get { - return ResourceManager.GetString("NewPasswordRequired", resourceCulture); - } - } - - internal static string UsernameRequired { - get { - return ResourceManager.GetString("UsernameRequired", resourceCulture); - } - } - - internal static string PasswordRequired { - get { - return ResourceManager.GetString("PasswordRequired", resourceCulture); - } - } - - internal static string SuccessfulUpdateUserMessage { - get { - return ResourceManager.GetString("SuccessfulUpdateUserMessage", resourceCulture); - } - } - - internal static string SuccessfulDeleteUserMessage { - get { - return ResourceManager.GetString("SuccessfulDeleteUserMessage", resourceCulture); - } - } - - internal static string UsernameExistsMessage { - get { - return ResourceManager.GetString("UsernameExistsMessage", resourceCulture); - } - } - - internal static string SucceddfulCreateUser { - get { - return ResourceManager.GetString("SucceddfulCreateUser", resourceCulture); - } - } - - internal static string EmptyRolesMessage { - get { - return ResourceManager.GetString("EmptyRolesMessage", resourceCulture); - } - } - - internal static string InvalidRolesListMessage { - get { - return ResourceManager.GetString("InvalidRolesListMessage", resourceCulture); - } - } - - internal static string SuccessfulUpdateRolesMessage { - get { - return ResourceManager.GetString("SuccessfulUpdateRolesMessage", resourceCulture); - } - } - - internal static string LoginFailedMessage { - get { - return ResourceManager.GetString("LoginFailedMessage", resourceCulture); - } - } - - internal static string SuccessfulLoginMessage { - get { - return ResourceManager.GetString("SuccessfulLoginMessage", resourceCulture); - } - } - - internal static string DeleteAccountAccessErrorMessage { - get { - return ResourceManager.GetString("DeleteAccountAccessErrorMessage", resourceCulture); - } - } - } -} diff --git a/RelationshipAnalysis.Integration.Test/Resources.resx b/RelationshipAnalysis.Integration.Test/Resources.resx deleted file mode 100644 index 6f03822..0000000 --- a/RelationshipAnalysis.Integration.Test/Resources.resx +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - File is valid! - - - Add records failed! - - - Entered header is invalid - - - Two headers have the same title! - - - Entered node category is invalid - - - Nodes added successfully - - - No file uploaded! - - - Chosen email already exists - - - Logout was successful! - - - Password must contain one digit from 1 to 9, one lowercase letter, one uppercase letter, one special - character, no space, and it must be 8-16 characters long. - - - - Could not find user! - - - Entered old password is wrong - - - Old password is required - - - New password is required - - - Username is required! - - - Password is required! - - - User updated successfully! - - - User Deleted successfully! - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, - PublicKeyToken=b77a5c561934e089 - - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, - PublicKeyToken=b77a5c561934e089 - - - - Chosen username already exists - - - User Created Successfuly! - - - Roles cant be empty! - - - Roles are invalid! - - - User roles updated successfuly! - - - Login Failed! - - - Login was successful! - - - You cant delete your account! - - \ No newline at end of file diff --git a/RelationshipAnalysis.Test/Resources.Designer.cs b/RelationshipAnalysis.Test/Resources.Designer.cs deleted file mode 100644 index 7b293ca..0000000 --- a/RelationshipAnalysis.Test/Resources.Designer.cs +++ /dev/null @@ -1,246 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace RelationshipAnalysis.Test { - using System; - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Resources.ResourceManager ResourceManager { - get { - if (object.Equals(null, resourceMan)) { - System.Resources.ResourceManager temp = new System.Resources.ResourceManager("RelationshipAnalysis.Test.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - internal static string InvalidTargetNodeCategory { - get { - return ResourceManager.GetString("InvalidTargetNodeCategory", resourceCulture); - } - } - - internal static string InvalidSourceNodeCategory { - get { - return ResourceManager.GetString("InvalidSourceNodeCategory", resourceCulture); - } - } - - internal static string InvalidEdgeCategory { - get { - return ResourceManager.GetString("InvalidEdgeCategory", resourceCulture); - } - } - - internal static string SuccessfulEdgeAdditionMessage { - get { - return ResourceManager.GetString("SuccessfulEdgeAdditionMessage", resourceCulture); - } - } - - internal static string ValidFileMessage { - get { - return ResourceManager.GetString("ValidFileMessage", resourceCulture); - } - } - - internal static string FailedAddRecordsMessage { - get { - return ResourceManager.GetString("FailedAddRecordsMessage", resourceCulture); - } - } - - internal static string InvalidHeaderAttribute { - get { - return ResourceManager.GetString("InvalidHeaderAttribute", resourceCulture); - } - } - - internal static string TwoSameHeadersMessage { - get { - return ResourceManager.GetString("TwoSameHeadersMessage", resourceCulture); - } - } - - internal static string InvalidNodeCategory { - get { - return ResourceManager.GetString("InvalidNodeCategory", resourceCulture); - } - } - - internal static string SuccessfulNodeAdditionMessage { - get { - return ResourceManager.GetString("SuccessfulNodeAdditionMessage", resourceCulture); - } - } - - internal static string NoFileUploadedMessage { - get { - return ResourceManager.GetString("NoFileUploadedMessage", resourceCulture); - } - } - - internal static string EmailExistsMessage { - get { - return ResourceManager.GetString("EmailExistsMessage", resourceCulture); - } - } - - internal static string SuccessfulLogoutMessage { - get { - return ResourceManager.GetString("SuccessfulLogoutMessage", resourceCulture); - } - } - - internal static string InvalidPasswordMessage { - get { - return ResourceManager.GetString("InvalidPasswordMessage", resourceCulture); - } - } - - internal static string UserNotFoundMessage { - get { - return ResourceManager.GetString("UserNotFoundMessage", resourceCulture); - } - } - - internal static string WrongOldPasswordMessage { - get { - return ResourceManager.GetString("WrongOldPasswordMessage", resourceCulture); - } - } - - internal static string OldPasswordRequired { - get { - return ResourceManager.GetString("OldPasswordRequired", resourceCulture); - } - } - - internal static string NewPasswordRequired { - get { - return ResourceManager.GetString("NewPasswordRequired", resourceCulture); - } - } - - internal static string UsernameRequired { - get { - return ResourceManager.GetString("UsernameRequired", resourceCulture); - } - } - - internal static string PasswordRequired { - get { - return ResourceManager.GetString("PasswordRequired", resourceCulture); - } - } - - internal static string SuccessfulUpdateUserMessage { - get { - return ResourceManager.GetString("SuccessfulUpdateUserMessage", resourceCulture); - } - } - - internal static string SuccessfulDeleteUserMessage { - get { - return ResourceManager.GetString("SuccessfulDeleteUserMessage", resourceCulture); - } - } - - internal static string UsernameExistsMessage { - get { - return ResourceManager.GetString("UsernameExistsMessage", resourceCulture); - } - } - - internal static string SucceddfulCreateUser { - get { - return ResourceManager.GetString("SucceddfulCreateUser", resourceCulture); - } - } - - internal static string EmptyRolesMessage { - get { - return ResourceManager.GetString("EmptyRolesMessage", resourceCulture); - } - } - - internal static string InvalidRolesListMessage { - get { - return ResourceManager.GetString("InvalidRolesListMessage", resourceCulture); - } - } - - internal static string SuccessfulUpdateRolesMessage { - get { - return ResourceManager.GetString("SuccessfulUpdateRolesMessage", resourceCulture); - } - } - - internal static string LoginFailedMessage { - get { - return ResourceManager.GetString("LoginFailedMessage", resourceCulture); - } - } - - internal static string SuccessfulLoginMessage { - get { - return ResourceManager.GetString("SuccessfulLoginMessage", resourceCulture); - } - } - - internal static string DeleteAccountAccessErrorMessage { - get { - return ResourceManager.GetString("DeleteAccountAccessErrorMessage", resourceCulture); - } - } - - internal static string NullDtoErrorMessage { - get { - return ResourceManager.GetString("NullDtoErrorMessage", resourceCulture); - } - } - - internal static string NotUniqueCategoryNameErrorMessage { - get { - return ResourceManager.GetString("NotUniqueCategoryNameErrorMessage", resourceCulture); - } - } - - internal static string SuccessfulCreateCategory { - get { - return ResourceManager.GetString("SuccessfulCreateCategory", resourceCulture); - } - } - } -} diff --git a/RelationshipAnalysis.Test/Resources.resx b/RelationshipAnalysis.Test/Resources.resx deleted file mode 100644 index a3c6f68..0000000 --- a/RelationshipAnalysis.Test/Resources.resx +++ /dev/null @@ -1,130 +0,0 @@ - - - - - Target Node category is invalid! - - - Source Node category is invalid! - - - Edge category is invalid! - - - Edges added successfully! - - - - - File is valid! - - - Add records failed! - - - Entered header is invalid - - - Two headers have the same title! - - - Entered node category is invalid - - - Nodes added successfully - - - No file uploaded! - - - Chosen email already exists - - - Logout was successful! - - - Password must contain one digit from 1 to 9, one lowercase letter, one uppercase letter, one special - character, no space, and it must be 8-16 characters long. - - - - Could not find user! - - - Entered old password is wrong - - - Old password is required - - - New password is required - - - Username is required! - - - Password is required! - - - User updated successfully! - - - User Deleted successfully! - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, - PublicKeyToken=b77a5c561934e089 - - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, - PublicKeyToken=b77a5c561934e089 - - - - Chosen username already exists - - - User Created Successfuly! - - - Roles cant be empty! - - - Roles are invalid! - - - User roles updated successfuly! - - - Login Failed! - - - Login was successful! - - - You cant delete your account! - - - Input Dto can not be null! - - - Category Name is not unique! - - - Category Created successfylly! - - \ No newline at end of file diff --git a/RelationshipAnalysis.Test/Services/GraphServices/ClauseValidatorServiceTests.cs b/RelationshipAnalysis.Test/Services/GraphServices/ClauseValidatorServiceTests.cs new file mode 100644 index 0000000..c07f75c --- /dev/null +++ b/RelationshipAnalysis.Test/Services/GraphServices/ClauseValidatorServiceTests.cs @@ -0,0 +1,108 @@ + +using RelationshipAnalysis.Dto.Graph; +using RelationshipAnalysis.Enums; +using RelationshipAnalysis.Services.GraphServices; + +namespace RelationshipAnalysis.Test.Services.GraphServices; + +public class ClauseValidatorServiceTests +{ + private readonly ClauseValidatorService _sut; + + public ClauseValidatorServiceTests() + { + _sut = new ClauseValidatorService(); + } + + [Fact] + public async Task AreClausesValid_ShouldReturnSuccess_WhenAllClausesAreValid() + { + // Arrange + var searchGraphDto = new SearchGraphDto + { + SourceCategoryClauses = new Dictionary { { "validSource", "value" } }, + TargetCategoryClauses = new Dictionary { { "validTarget", "value" } }, + EdgeCategoryClauses = new Dictionary { { "validEdge", "value" } } + }; + + var sourceAttributes = new List { "validSource" }; + var targetAttributes = new List { "validTarget" }; + var edgeAttributes = new List { "validEdge" }; + + // Act + var result = await _sut.AreClausesValid(searchGraphDto, sourceAttributes, targetAttributes, edgeAttributes); + + // Assert + Assert.Equal(StatusCodeType.Success, result.StatusCode); + Assert.Null(result.Data); + } + + [Fact] + public async Task AreClausesValid_ShouldReturnNotFound_WhenSourceCategoryClausesAreInvalid() + { + // Arrange + var searchGraphDto = new SearchGraphDto + { + SourceCategoryClauses = new Dictionary { { "invalidSource", "value" } }, + TargetCategoryClauses = new Dictionary { { "validTarget", "value" } }, + EdgeCategoryClauses = new Dictionary { { "validEdge", "value" } } + }; + + var sourceAttributes = new List { "validSource" }; + var targetAttributes = new List { "validTarget" }; + var edgeAttributes = new List { "validEdge" }; + + // Act + var result = await _sut.AreClausesValid(searchGraphDto, sourceAttributes, targetAttributes, edgeAttributes); + + // Assert + Assert.Equal(StatusCodeType.NotFound, result.StatusCode); + Assert.Equal(Resources.InvalidClauseInSourceCategory, result.Data.Message); + } + + [Fact] + public async Task AreClausesValid_ShouldReturnNotFound_WhenTargetCategoryClausesAreInvalid() + { + // Arrange + var searchGraphDto = new SearchGraphDto + { + SourceCategoryClauses = new Dictionary { { "validSource", "value" } }, + TargetCategoryClauses = new Dictionary { { "invalidTarget", "value" } }, + EdgeCategoryClauses = new Dictionary { { "validEdge", "value" } } + }; + + var sourceAttributes = new List { "validSource" }; + var targetAttributes = new List { "validTarget" }; + var edgeAttributes = new List { "validEdge" }; + + // Act + var result = await _sut.AreClausesValid(searchGraphDto, sourceAttributes, targetAttributes, edgeAttributes); + + // Assert + Assert.Equal(StatusCodeType.NotFound, result.StatusCode); + Assert.Equal(Resources.InvalidClauseInDestinationCategory, result.Data.Message); + } + + [Fact] + public async Task AreClausesValid_ShouldReturnNotFound_WhenEdgeCategoryClausesAreInvalid() + { + // Arrange + var searchGraphDto = new SearchGraphDto + { + SourceCategoryClauses = new Dictionary { { "validSource", "value" } }, + TargetCategoryClauses = new Dictionary { { "validTarget", "value" } }, + EdgeCategoryClauses = new Dictionary { { "invalidEdge", "value" } } + }; + + var sourceAttributes = new List { "validSource" }; + var targetAttributes = new List { "validTarget" }; + var edgeAttributes = new List { "validEdge" }; + + // Act + var result = await _sut.AreClausesValid(searchGraphDto, sourceAttributes, targetAttributes, edgeAttributes); + + // Assert + Assert.Equal(StatusCodeType.NotFound, result.StatusCode); + Assert.Equal(Resources.InvalidClauseInDestinationCategory, result.Data.Message); + } +} diff --git a/RelationshipAnalysis/Program.cs b/RelationshipAnalysis/Program.cs index 67d8dda..b565464 100644 --- a/RelationshipAnalysis/Program.cs +++ b/RelationshipAnalysis/Program.cs @@ -116,6 +116,7 @@ .AddSingleton() .AddSingleton() .AddSingleton() + .AddSingleton() .AddKeyedSingleton("node") .AddKeyedSingleton("edge") .AddKeyedSingleton("node") diff --git a/RelationshipAnalysis/Resources.Designer.cs b/RelationshipAnalysis/Resources.Designer.cs index a73de16..2038af7 100644 --- a/RelationshipAnalysis/Resources.Designer.cs +++ b/RelationshipAnalysis/Resources.Designer.cs @@ -14,18 +14,18 @@ namespace RelationshipAnalysis { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { + public class Resources { private static System.Resources.ResourceManager resourceMan; private static System.Globalization.CultureInfo resourceCulture; [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { + public Resources() { } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Resources.ResourceManager ResourceManager { + public static System.Resources.ResourceManager ResourceManager { get { if (object.Equals(null, resourceMan)) { System.Resources.ResourceManager temp = new System.Resources.ResourceManager("RelationshipAnalysis.Resources", typeof(Resources).Assembly); @@ -36,7 +36,7 @@ internal static System.Resources.ResourceManager ResourceManager { } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Globalization.CultureInfo Culture { + public static System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -45,211 +45,211 @@ internal static System.Globalization.CultureInfo Culture { } } - internal static string InvalidPasswordMessage { + public static string InvalidPasswordMessage { get { return ResourceManager.GetString("InvalidPasswordMessage", resourceCulture); } } - internal static string InvalidClauseInSourceCategory { + public static string InvalidClauseInSourceCategory { get { return ResourceManager.GetString("InvalidClauseInSourceCategory", resourceCulture); } } - internal static string InvalidClauseInDestinationCategory { + public static string InvalidClauseInDestinationCategory { get { return ResourceManager.GetString("InvalidClauseInDestinationCategory", resourceCulture); } } - internal static string InvalidClauseInEdgeCategory { + public static string InvalidClauseInEdgeCategory { get { return ResourceManager.GetString("InvalidClauseInEdgeCategory", resourceCulture); } } - internal static string SuccessfulLogoutMessage { + public static string SuccessfulLogoutMessage { get { return ResourceManager.GetString("SuccessfulLogoutMessage", resourceCulture); } } - internal static string UserNotFoundMessage { + public static string UserNotFoundMessage { get { return ResourceManager.GetString("UserNotFoundMessage", resourceCulture); } } - internal static string WrongOldPasswordMessage { + public static string WrongOldPasswordMessage { get { return ResourceManager.GetString("WrongOldPasswordMessage", resourceCulture); } } - internal static string NoFileUploadedMessage { + public static string NoFileUploadedMessage { get { return ResourceManager.GetString("NoFileUploadedMessage", resourceCulture); } } - internal static string SuccessfulNodeAdditionMessage { + public static string SuccessfulNodeAdditionMessage { get { return ResourceManager.GetString("SuccessfulNodeAdditionMessage", resourceCulture); } } - internal static string TwoSameHeadersMessage { + public static string TwoSameHeadersMessage { get { return ResourceManager.GetString("TwoSameHeadersMessage", resourceCulture); } } - internal static string InvalidNodeCategory { + public static string InvalidNodeCategory { get { return ResourceManager.GetString("InvalidNodeCategory", resourceCulture); } } - internal static string InvalidHeaderAttribute { + public static string InvalidHeaderAttribute { get { return ResourceManager.GetString("InvalidHeaderAttribute", resourceCulture); } } - internal static string FailedAddRecordsMessage { + public static string FailedAddRecordsMessage { get { return ResourceManager.GetString("FailedAddRecordsMessage", resourceCulture); } } - internal static string ValidFileMessage { + public static string ValidFileMessage { get { return ResourceManager.GetString("ValidFileMessage", resourceCulture); } } - internal static string OldPasswordRequired { + public static string OldPasswordRequired { get { return ResourceManager.GetString("OldPasswordRequired", resourceCulture); } } - internal static string NewPasswordRequired { + public static string NewPasswordRequired { get { return ResourceManager.GetString("NewPasswordRequired", resourceCulture); } } - internal static string UsernameRequired { + public static string UsernameRequired { get { return ResourceManager.GetString("UsernameRequired", resourceCulture); } } - internal static string PasswordRequired { + public static string PasswordRequired { get { return ResourceManager.GetString("PasswordRequired", resourceCulture); } } - internal static string SuccessfulUpdateUserMessage { + public static string SuccessfulUpdateUserMessage { get { return ResourceManager.GetString("SuccessfulUpdateUserMessage", resourceCulture); } } - internal static string SuccessfulDeleteUserMessage { + public static string SuccessfulDeleteUserMessage { get { return ResourceManager.GetString("SuccessfulDeleteUserMessage", resourceCulture); } } - internal static string UsernameExistsMessage { + public static string UsernameExistsMessage { get { return ResourceManager.GetString("UsernameExistsMessage", resourceCulture); } } - internal static string EmailExistsMessage { + public static string EmailExistsMessage { get { return ResourceManager.GetString("EmailExistsMessage", resourceCulture); } } - internal static string SucceddfulCreateUser { + public static string SucceddfulCreateUser { get { return ResourceManager.GetString("SucceddfulCreateUser", resourceCulture); } } - internal static string EmptyRolesMessage { + public static string EmptyRolesMessage { get { return ResourceManager.GetString("EmptyRolesMessage", resourceCulture); } } - internal static string InvalidRolesListMessage { + public static string InvalidRolesListMessage { get { return ResourceManager.GetString("InvalidRolesListMessage", resourceCulture); } } - internal static string SuccessfulUpdateRolesMessage { + public static string SuccessfulUpdateRolesMessage { get { return ResourceManager.GetString("SuccessfulUpdateRolesMessage", resourceCulture); } } - internal static string LoginFailedMessage { + public static string LoginFailedMessage { get { return ResourceManager.GetString("LoginFailedMessage", resourceCulture); } } - internal static string SuccessfulLoginMessage { + public static string SuccessfulLoginMessage { get { return ResourceManager.GetString("SuccessfulLoginMessage", resourceCulture); } } - internal static string DeleteAccountAccessErrorMessage { + public static string DeleteAccountAccessErrorMessage { get { return ResourceManager.GetString("DeleteAccountAccessErrorMessage", resourceCulture); } } - internal static string NullDtoErrorMessage { + public static string NullDtoErrorMessage { get { return ResourceManager.GetString("NullDtoErrorMessage", resourceCulture); } } - internal static string NotUniqueCategoryNameErrorMessage { + public static string NotUniqueCategoryNameErrorMessage { get { return ResourceManager.GetString("NotUniqueCategoryNameErrorMessage", resourceCulture); } } - internal static string SuccessfulCreateCategory { + public static string SuccessfulCreateCategory { get { return ResourceManager.GetString("SuccessfulCreateCategory", resourceCulture); } } - internal static string SuccessfulEdgeAdditionMessage { + public static string SuccessfulEdgeAdditionMessage { get { return ResourceManager.GetString("SuccessfulEdgeAdditionMessage", resourceCulture); } } - internal static string InvalidEdgeCategory { + public static string InvalidEdgeCategory { get { return ResourceManager.GetString("InvalidEdgeCategory", resourceCulture); } } - internal static string InvalidSourceNodeCategory { + public static string InvalidSourceNodeCategory { get { return ResourceManager.GetString("InvalidSourceNodeCategory", resourceCulture); } } - internal static string InvalidTargetNodeCategory { + public static string InvalidTargetNodeCategory { get { return ResourceManager.GetString("InvalidTargetNodeCategory", resourceCulture); } diff --git a/RelationshipAnalysis/Services/GraphServices/Abstraction/IClauseValidatorService.cs b/RelationshipAnalysis/Services/GraphServices/Abstraction/IClauseValidatorService.cs new file mode 100644 index 0000000..1f46dd2 --- /dev/null +++ b/RelationshipAnalysis/Services/GraphServices/Abstraction/IClauseValidatorService.cs @@ -0,0 +1,13 @@ +using RelationshipAnalysis.Dto; +using RelationshipAnalysis.Dto.Graph; + +namespace RelationshipAnalysis.Services.GraphServices.Abstraction; + +public interface IClauseValidatorService +{ + Task> AreClausesValid( + SearchGraphDto searchGraphDto, + List sourceAttributes, + List targetAttributes, + List edgeAttributes); +} \ No newline at end of file diff --git a/RelationshipAnalysis/Services/GraphServices/ClauseValidatorService.cs b/RelationshipAnalysis/Services/GraphServices/ClauseValidatorService.cs new file mode 100644 index 0000000..1996173 --- /dev/null +++ b/RelationshipAnalysis/Services/GraphServices/ClauseValidatorService.cs @@ -0,0 +1,49 @@ +using RelationshipAnalysis.Dto; +using RelationshipAnalysis.Dto.Graph; +using RelationshipAnalysis.Enums; +using RelationshipAnalysis.Services.GraphServices.Abstraction; + +namespace RelationshipAnalysis.Services.GraphServices +{ + public class ClauseValidatorService : IClauseValidatorService + { + public async Task> AreClausesValid( + SearchGraphDto searchGraphDto, + List sourceAttributes, + List targetAttributes, + List edgeAttributes) + { + if (!searchGraphDto.SourceCategoryClauses.Keys.All(item => sourceAttributes.Contains(item))) + return NotFoundResult(Resources.InvalidClauseInSourceCategory); + + if (!searchGraphDto.TargetCategoryClauses.Keys.All(item => targetAttributes.Contains(item))) + return NotFoundResult(Resources.InvalidClauseInDestinationCategory); + + if (!searchGraphDto.EdgeCategoryClauses.Keys.All(item => edgeAttributes.Contains(item))) + return NotFoundResult(Resources.InvalidClauseInDestinationCategory); + + return SuccessResult(); + } + + private ActionResponse SuccessResult() + { + return new ActionResponse + { + StatusCode = StatusCodeType.Success, + Data = null + }; + } + + private ActionResponse NotFoundResult(string message) + { + return new ActionResponse + { + StatusCode = StatusCodeType.NotFound, + Data = new GraphDto + { + Message = message + } + }; + } + } +} \ No newline at end of file diff --git a/RelationshipAnalysis/Services/GraphServices/Graph/GraphSearcherService.cs b/RelationshipAnalysis/Services/GraphServices/Graph/GraphSearcherService.cs index 90b36a6..5101a21 100644 --- a/RelationshipAnalysis/Services/GraphServices/Graph/GraphSearcherService.cs +++ b/RelationshipAnalysis/Services/GraphServices/Graph/GraphSearcherService.cs @@ -6,126 +6,90 @@ using RelationshipAnalysis.Services.GraphServices.Graph.Abstraction; using ApplicationDbContext = RelationshipAnalysis.Context.ApplicationDbContext; -namespace RelationshipAnalysis.Services.GraphServices.Graph; - -public class GraphSearcherService( - IGraphDtoCreator graphDtoCreator, - IServiceProvider serviceProvider, - [FromKeyedServices("node")] IAttributesReceiver nodeCategoryReceiver, - [FromKeyedServices("edge")] IAttributesReceiver edgeCategoryReceiver) : IGraphSearcherService +namespace RelationshipAnalysis.Services.GraphServices.Graph { - public async Task> Search(SearchGraphDto searchGraphDto) + public class GraphSearcherService( + IGraphDtoCreator graphDtoCreator, + IServiceProvider serviceProvider, + [FromKeyedServices("node")] IAttributesReceiver nodeCategoryReceiver, + [FromKeyedServices("edge")] IAttributesReceiver edgeCategoryReceiver, + IClauseValidatorService clauseValidatorService) : IGraphSearcherService { - using var scope = serviceProvider.CreateScope(); - var context = scope.ServiceProvider.GetRequiredService(); - - - var sourceAttributes = await nodeCategoryReceiver.GetAllAttributes(searchGraphDto.SourceCategoryName); - var targetAttributes = await nodeCategoryReceiver.GetAllAttributes(searchGraphDto.TargetCategoryName); - var edgeAttributes = await edgeCategoryReceiver.GetAllAttributes(searchGraphDto.EdgeCategoryName); - var validation = await AreClausesValid(searchGraphDto, sourceAttributes, targetAttributes, edgeAttributes); - if (validation.StatusCode != StatusCodeType.Success) return validation; + public async Task> Search(SearchGraphDto searchGraphDto) + { + using var scope = serviceProvider.CreateScope(); + var context = scope.ServiceProvider.GetRequiredService(); - var sourceNodes = await context.Nodes - .Where(n => searchGraphDto.SourceCategoryName == n.NodeCategory.NodeCategoryName).ToListAsync(); - var targetNodes = await context.Nodes - .Where(n => searchGraphDto.TargetCategoryName == n.NodeCategory.NodeCategoryName).ToListAsync(); + var sourceAttributes = await nodeCategoryReceiver.GetAllAttributes(searchGraphDto.SourceCategoryName); + var targetAttributes = await nodeCategoryReceiver.GetAllAttributes(searchGraphDto.TargetCategoryName); + var edgeAttributes = await edgeCategoryReceiver.GetAllAttributes(searchGraphDto.EdgeCategoryName); - sourceNodes = sourceNodes.Where(sn => IsNodeValid(sn, searchGraphDto.SourceCategoryClauses)).ToList(); - targetNodes = targetNodes.Where(tn => IsNodeValid(tn, searchGraphDto.TargetCategoryClauses)).ToList(); + var validation = await clauseValidatorService.AreClausesValid(searchGraphDto, sourceAttributes, targetAttributes, edgeAttributes); + if (validation.StatusCode != StatusCodeType.Success) return validation; - var edges = await GetValidEdges(sourceNodes, targetNodes, searchGraphDto.SourceCategoryName, - searchGraphDto.TargetCategoryName, searchGraphDto.EdgeCategoryName); + var sourceNodes = await context.Nodes + .Where(n => searchGraphDto.SourceCategoryName == n.NodeCategory.NodeCategoryName).ToListAsync(); + var targetNodes = await context.Nodes + .Where(n => searchGraphDto.TargetCategoryName == n.NodeCategory.NodeCategoryName).ToListAsync(); - edges = edges.Where(e => IsEdgeValid(e, searchGraphDto.EdgeCategoryClauses)).ToList(); + sourceNodes = sourceNodes.Where(sn => IsNodeValid(sn, searchGraphDto.SourceCategoryClauses)).ToList(); + targetNodes = targetNodes.Where(tn => IsNodeValid(tn, searchGraphDto.TargetCategoryClauses)).ToList(); - validation.Data = graphDtoCreator.CreateResultGraphDto(sourceNodes.Union(targetNodes).ToList(), edges); - return validation; - } + var edges = await GetValidEdges(sourceNodes, targetNodes, searchGraphDto.SourceCategoryName, + searchGraphDto.TargetCategoryName, searchGraphDto.EdgeCategoryName); + edges = edges.Where(e => IsEdgeValid(e, searchGraphDto.EdgeCategoryClauses)).ToList(); - private bool IsNodeValid(Models.Graph.Node.Node node, Dictionary clauses) - { - var attributeValues = new Dictionary(); - node.Values.ToList().ForEach(nv => attributeValues.Add(nv.NodeAttribute.NodeAttributeName, nv.ValueData)); - - foreach (var kvp in clauses) - { - var actualValue = attributeValues[kvp.Key]; - if (!actualValue.StartsWith(kvp.Value)) return false; + validation.Data = graphDtoCreator.CreateResultGraphDto(sourceNodes.Union(targetNodes).ToList(), edges); + return validation; } - return true; - } - - private bool IsEdgeValid(Models.Graph.Edge.Edge edge, Dictionary clauses) - { - var attributeValues = new Dictionary(); - edge.EdgeValues.ToList().ForEach(ev => attributeValues.Add(ev.EdgeAttribute.EdgeAttributeName, ev.ValueData)); - - foreach (var kvp in clauses) + private bool IsNodeValid(Models.Graph.Node.Node node, Dictionary clauses) { - var actualValue = attributeValues[kvp.Key]; - if (!actualValue.StartsWith(kvp.Value)) return false; - } - - return true; - } - - private async Task> GetValidEdges(List sourceNodes, - List targetNodes, string sourceCategory, string targetCategory, - string edgeCategory) - { - var sourceNodeIds = sourceNodes.Select(n => n.NodeId).ToList(); - var targetNodeIds = targetNodes.Select(n => n.NodeId).ToList(); - - using var scope = serviceProvider.CreateScope(); - var context = scope.ServiceProvider.GetRequiredService(); - - var edges = await context.Edges.Include(e => e.EdgeValues) - .ThenInclude(ev => ev.EdgeAttribute) - .Where(e => edgeCategory == e.EdgeCategory.EdgeCategoryName && - sourceNodeIds.Contains(e.EdgeSourceNodeId) && - targetNodeIds.Contains(e.EdgeDestinationNodeId)) - .ToListAsync(); - return edges; - } - - private async Task> AreClausesValid(SearchGraphDto searchGraphDto, - List sourceAttributes, List targetAttributes, - List edgeAttributes) - { - if (!searchGraphDto.SourceCategoryClauses.Keys.All(item => sourceAttributes.Contains(item))) - return NotFoundResult(Resources.InvalidClauseInSourceCategory); + var attributeValues = new Dictionary(); + node.Values.ToList().ForEach(nv => attributeValues.Add(nv.NodeAttribute.NodeAttributeName, nv.ValueData)); - if (!searchGraphDto.TargetCategoryClauses.Keys.All(item => targetAttributes.Contains(item))) - return NotFoundResult(Resources.InvalidClauseInDestinationCategory); - - if (!searchGraphDto.EdgeCategoryClauses.Keys.All(item => edgeAttributes.Contains(item))) - return NotFoundResult(Resources.InvalidClauseInDestinationCategory); + foreach (var kvp in clauses) + { + var actualValue = attributeValues[kvp.Key]; + if (!actualValue.StartsWith(kvp.Value)) return false; + } - return SuccessResult(); - } + return true; + } - private ActionResponse SuccessResult() - { - return new ActionResponse + private bool IsEdgeValid(Models.Graph.Edge.Edge edge, Dictionary clauses) { - StatusCode = StatusCodeType.Success, - Data = null - }; - } + var attributeValues = new Dictionary(); + edge.EdgeValues.ToList().ForEach(ev => attributeValues.Add(ev.EdgeAttribute.EdgeAttributeName, ev.ValueData)); - private ActionResponse NotFoundResult(string message) - { - return new ActionResponse - { - StatusCode = StatusCodeType.NotFound, - Data = new GraphDto + foreach (var kvp in clauses) { - Message = message + var actualValue = attributeValues[kvp.Key]; + if (!actualValue.StartsWith(kvp.Value)) return false; } - }; + + return true; + } + + private async Task> GetValidEdges(List sourceNodes, + List targetNodes, string sourceCategory, string targetCategory, + string edgeCategory) + { + var sourceNodeIds = sourceNodes.Select(n => n.NodeId).ToList(); + var targetNodeIds = targetNodes.Select(n => n.NodeId).ToList(); + + using var scope = serviceProvider.CreateScope(); + var context = scope.ServiceProvider.GetRequiredService(); + + var edges = await context.Edges.Include(e => e.EdgeValues) + .ThenInclude(ev => ev.EdgeAttribute) + .Where(e => edgeCategory == e.EdgeCategory.EdgeCategoryName && + sourceNodeIds.Contains(e.EdgeSourceNodeId) && + targetNodeIds.Contains(e.EdgeDestinationNodeId)) + .ToListAsync(); + return edges; + } } -} \ No newline at end of file +}