From 447478836b01f9a9d95a915957509b645f5c38cf Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Wed, 21 Jun 2023 12:33:18 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=D1=81=D1=8B=D0=BB=D0=BE=D0=BA=20=D0=BD?= =?UTF-8?q?=D0=B0=20namespace=20=D0=B2=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B8=20?= =?UTF-8?q?=D1=81=20=D0=BF=D1=80=D0=B5=D0=B5=D0=BC=D0=B5=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=D0=BC=20UserDto=20=D0=B2=20=D0=BF=D0=B0=D0=BF?= =?UTF-8?q?=D0=BA=D1=83=20User?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/DrillingProgramPartDto.cs | 1 + AsbCloudApp/Data/FileInfoDto.cs | 1 + AsbCloudApp/Data/FileMarkDto.cs | 1 + AsbCloudApp/Data/RequestLogUserDto.cs | 1 + AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs | 1 + AsbCloudApp/Data/{ => User}/UserDto.cs | 2 +- AsbCloudApp/Data/{ => User}/UserExtendedDto.cs | 2 +- AsbCloudApp/Data/{ => User}/UserRegistrationDto.cs | 2 +- AsbCloudApp/Data/{ => User}/UserRoleDto.cs | 4 ++-- AsbCloudApp/Data/{ => User}/UserTokenDto.cs | 2 +- AsbCloudApp/Data/WellFinalDocumentDto.cs | 1 + AsbCloudApp/Repositories/IUserRepository.cs | 1 + AsbCloudApp/Repositories/IUserRoleRepository.cs | 4 ++-- AsbCloudApp/Repositories/IWellFinalDocumentsRepository.cs | 1 + AsbCloudApp/Services/IAuthService.cs | 2 +- AsbCloudApp/Services/IDrillingProgramService.cs | 1 + AsbCloudInfrastructure/Repository/UserRepository.cs | 1 + AsbCloudInfrastructure/Repository/UserRoleRepository.cs | 1 + .../Repository/WellFinalDocumentsRepository.cs | 1 + AsbCloudInfrastructure/Services/AuthService.cs | 2 +- .../Services/DailyReport/DailyReportService.cs | 1 + .../Services/DrillingProgram/DrillingProgramService.cs | 1 + AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs | 1 + .../ServicesTests/DrillingProgramServiceTest.cs | 1 + AsbCloudWebApi.Tests/ServicesTests/FileServiceTest.cs | 1 + .../ServicesTests/WellFinalDocumentsServiceTest.cs | 1 + AsbCloudWebApi/Controllers/AdminUserController.cs | 2 +- AsbCloudWebApi/Controllers/AdminUserRoleController.cs | 3 +-- AsbCloudWebApi/Controllers/AuthController.cs | 1 + AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs | 1 + AsbCloudWebApi/Extentions.cs | 2 +- 31 files changed, 33 insertions(+), 14 deletions(-) rename AsbCloudApp/Data/{ => User}/UserDto.cs (98%) rename AsbCloudApp/Data/{ => User}/UserExtendedDto.cs (90%) rename AsbCloudApp/Data/{ => User}/UserRegistrationDto.cs (94%) rename AsbCloudApp/Data/{ => User}/UserRoleDto.cs (83%) rename AsbCloudApp/Data/{ => User}/UserTokenDto.cs (94%) diff --git a/AsbCloudApp/Data/DrillingProgramPartDto.cs b/AsbCloudApp/Data/DrillingProgramPartDto.cs index 482fe0c4..f349c9de 100644 --- a/AsbCloudApp/Data/DrillingProgramPartDto.cs +++ b/AsbCloudApp/Data/DrillingProgramPartDto.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using AsbCloudApp.Data.User; namespace AsbCloudApp.Data { diff --git a/AsbCloudApp/Data/FileInfoDto.cs b/AsbCloudApp/Data/FileInfoDto.cs index 1be97623..9b98c092 100644 --- a/AsbCloudApp/Data/FileInfoDto.cs +++ b/AsbCloudApp/Data/FileInfoDto.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using AsbCloudApp.Data.User; namespace AsbCloudApp.Data { diff --git a/AsbCloudApp/Data/FileMarkDto.cs b/AsbCloudApp/Data/FileMarkDto.cs index ca8b98cc..4d37457d 100644 --- a/AsbCloudApp/Data/FileMarkDto.cs +++ b/AsbCloudApp/Data/FileMarkDto.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.DataAnnotations; +using AsbCloudApp.Data.User; namespace AsbCloudApp.Data { diff --git a/AsbCloudApp/Data/RequestLogUserDto.cs b/AsbCloudApp/Data/RequestLogUserDto.cs index 3f5d6a39..935e9f43 100644 --- a/AsbCloudApp/Data/RequestLogUserDto.cs +++ b/AsbCloudApp/Data/RequestLogUserDto.cs @@ -1,4 +1,5 @@ using System; +using AsbCloudApp.Data.User; namespace AsbCloudApp.Data { diff --git a/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs b/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs index f9544e9d..cfb8212f 100644 --- a/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs +++ b/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using AsbCloudApp.Data.User; namespace AsbCloudApp.Data.SAUB { diff --git a/AsbCloudApp/Data/UserDto.cs b/AsbCloudApp/Data/User/UserDto.cs similarity index 98% rename from AsbCloudApp/Data/UserDto.cs rename to AsbCloudApp/Data/User/UserDto.cs index bff9d61e..fe4dfb94 100644 --- a/AsbCloudApp/Data/UserDto.cs +++ b/AsbCloudApp/Data/User/UserDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace AsbCloudApp.Data +namespace AsbCloudApp.Data.User { /// /// DTO пользователя платформы diff --git a/AsbCloudApp/Data/UserExtendedDto.cs b/AsbCloudApp/Data/User/UserExtendedDto.cs similarity index 90% rename from AsbCloudApp/Data/UserExtendedDto.cs rename to AsbCloudApp/Data/User/UserExtendedDto.cs index 8585532c..d59518de 100644 --- a/AsbCloudApp/Data/UserExtendedDto.cs +++ b/AsbCloudApp/Data/User/UserExtendedDto.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace AsbCloudApp.Data +namespace AsbCloudApp.Data.User { /// public class UserExtendedDto : UserDto diff --git a/AsbCloudApp/Data/UserRegistrationDto.cs b/AsbCloudApp/Data/User/UserRegistrationDto.cs similarity index 94% rename from AsbCloudApp/Data/UserRegistrationDto.cs rename to AsbCloudApp/Data/User/UserRegistrationDto.cs index da17cc0c..8e6ce164 100644 --- a/AsbCloudApp/Data/UserRegistrationDto.cs +++ b/AsbCloudApp/Data/User/UserRegistrationDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace AsbCloudApp.Data +namespace AsbCloudApp.Data.User { /// public class UserRegistrationDto : UserDto diff --git a/AsbCloudApp/Data/UserRoleDto.cs b/AsbCloudApp/Data/User/UserRoleDto.cs similarity index 83% rename from AsbCloudApp/Data/UserRoleDto.cs rename to AsbCloudApp/Data/User/UserRoleDto.cs index 75a95dc7..cc34713c 100644 --- a/AsbCloudApp/Data/UserRoleDto.cs +++ b/AsbCloudApp/Data/User/UserRoleDto.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; -namespace AsbCloudApp.Data +namespace AsbCloudApp.Data.User { /// /// Роль пользователя платформы @@ -16,7 +16,7 @@ namespace AsbCloudApp.Data /// название /// [Required] - [StringLength(50, MinimumLength = 1,ErrorMessage = "Допустимая длина названия роли от 1 до 50 символов")] + [StringLength(50, MinimumLength = 1, ErrorMessage = "Допустимая длина названия роли от 1 до 50 символов")] public string Caption { get; set; } = null!; /// diff --git a/AsbCloudApp/Data/UserTokenDto.cs b/AsbCloudApp/Data/User/UserTokenDto.cs similarity index 94% rename from AsbCloudApp/Data/UserTokenDto.cs rename to AsbCloudApp/Data/User/UserTokenDto.cs index 06016008..cfd538f7 100644 --- a/AsbCloudApp/Data/UserTokenDto.cs +++ b/AsbCloudApp/Data/User/UserTokenDto.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace AsbCloudApp.Data +namespace AsbCloudApp.Data.User { /// public class UserTokenDto : UserExtendedDto diff --git a/AsbCloudApp/Data/WellFinalDocumentDto.cs b/AsbCloudApp/Data/WellFinalDocumentDto.cs index 6fd72407..1dab3ac0 100644 --- a/AsbCloudApp/Data/WellFinalDocumentDto.cs +++ b/AsbCloudApp/Data/WellFinalDocumentDto.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using AsbCloudApp.Data.User; namespace AsbCloudApp.Data { diff --git a/AsbCloudApp/Repositories/IUserRepository.cs b/AsbCloudApp/Repositories/IUserRepository.cs index f23dc67b..1b4e86af 100644 --- a/AsbCloudApp/Repositories/IUserRepository.cs +++ b/AsbCloudApp/Repositories/IUserRepository.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Services; using System.Collections.Generic; diff --git a/AsbCloudApp/Repositories/IUserRoleRepository.cs b/AsbCloudApp/Repositories/IUserRoleRepository.cs index 2ad7b8ee..7fa59e62 100644 --- a/AsbCloudApp/Repositories/IUserRoleRepository.cs +++ b/AsbCloudApp/Repositories/IUserRoleRepository.cs @@ -1,8 +1,8 @@ -using AsbCloudApp.Data; -using AsbCloudApp.Services; +using AsbCloudApp.Services; using System.Collections.Generic; using System.Threading.Tasks; using System.Threading; +using AsbCloudApp.Data.User; namespace AsbCloudApp.Repositories { diff --git a/AsbCloudApp/Repositories/IWellFinalDocumentsRepository.cs b/AsbCloudApp/Repositories/IWellFinalDocumentsRepository.cs index 46efa847..d80bd352 100644 --- a/AsbCloudApp/Repositories/IWellFinalDocumentsRepository.cs +++ b/AsbCloudApp/Repositories/IWellFinalDocumentsRepository.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; diff --git a/AsbCloudApp/Services/IAuthService.cs b/AsbCloudApp/Services/IAuthService.cs index 1b332a84..17a22fd1 100644 --- a/AsbCloudApp/Services/IAuthService.cs +++ b/AsbCloudApp/Services/IAuthService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using System.Security.Claims; using System.Threading; using System.Threading.Tasks; diff --git a/AsbCloudApp/Services/IDrillingProgramService.cs b/AsbCloudApp/Services/IDrillingProgramService.cs index ee24d34e..fb1e45f2 100644 --- a/AsbCloudApp/Services/IDrillingProgramService.cs +++ b/AsbCloudApp/Services/IDrillingProgramService.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; diff --git a/AsbCloudInfrastructure/Repository/UserRepository.cs b/AsbCloudInfrastructure/Repository/UserRepository.cs index 9df24b47..4876a9e2 100644 --- a/AsbCloudInfrastructure/Repository/UserRepository.cs +++ b/AsbCloudInfrastructure/Repository/UserRepository.cs @@ -10,6 +10,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Caching.Memory; +using AsbCloudApp.Data.User; namespace AsbCloudInfrastructure.Repository { diff --git a/AsbCloudInfrastructure/Repository/UserRoleRepository.cs b/AsbCloudInfrastructure/Repository/UserRoleRepository.cs index 0fd26331..7b946cab 100644 --- a/AsbCloudInfrastructure/Repository/UserRoleRepository.cs +++ b/AsbCloudInfrastructure/Repository/UserRoleRepository.cs @@ -1,5 +1,6 @@ using AsbCloudApp.Comparators; using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Exceptions; using AsbCloudApp.Repositories; using AsbCloudDb; diff --git a/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs b/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs index 6d32cc30..01413ba2 100644 --- a/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs +++ b/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Exceptions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; diff --git a/AsbCloudInfrastructure/Services/AuthService.cs b/AsbCloudInfrastructure/Services/AuthService.cs index 169f4e70..d1af9d71 100644 --- a/AsbCloudInfrastructure/Services/AuthService.cs +++ b/AsbCloudInfrastructure/Services/AuthService.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Repositories; using AsbCloudApp.Services; using AsbCloudDb.Model; diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs index d52aaa0b..8b3b11ef 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs @@ -1,5 +1,6 @@ using AsbCloudApp.Data; using AsbCloudApp.Data.DailyReport; +using AsbCloudApp.Data.User; using AsbCloudApp.Exceptions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs index bf35438d..1f41a959 100644 --- a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs +++ b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Exceptions; using AsbCloudApp.Repositories; using AsbCloudApp.Services; diff --git a/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs b/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs index 5f100850..373e2433 100644 --- a/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs +++ b/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Exceptions; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; diff --git a/AsbCloudWebApi.Tests/ServicesTests/DrillingProgramServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/DrillingProgramServiceTest.cs index 05833333..751013bb 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/DrillingProgramServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/DrillingProgramServiceTest.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Repositories; using AsbCloudApp.Services; using AsbCloudDb.Model; diff --git a/AsbCloudWebApi.Tests/ServicesTests/FileServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/FileServiceTest.cs index 698f83cd..9fb13366 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/FileServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/FileServiceTest.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; using AsbCloudApp.Services; diff --git a/AsbCloudWebApi.Tests/ServicesTests/WellFinalDocumentsServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/WellFinalDocumentsServiceTest.cs index ef1cac15..e6ae7a4a 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/WellFinalDocumentsServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/WellFinalDocumentsServiceTest.cs @@ -9,6 +9,7 @@ using System.IO; using System.Linq; using AsbCloudApp.Repositories; using System.Collections.Generic; +using AsbCloudApp.Data.User; namespace AsbCloudWebApi.Tests.ServicesTests { diff --git a/AsbCloudWebApi/Controllers/AdminUserController.cs b/AsbCloudWebApi/Controllers/AdminUserController.cs index 288f838a..1f662ed7 100644 --- a/AsbCloudWebApi/Controllers/AdminUserController.cs +++ b/AsbCloudWebApi/Controllers/AdminUserController.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Repositories; using AsbCloudApp.Services; using AsbCloudInfrastructure.Repository; diff --git a/AsbCloudWebApi/Controllers/AdminUserRoleController.cs b/AsbCloudWebApi/Controllers/AdminUserRoleController.cs index d3ca48ba..38575530 100644 --- a/AsbCloudWebApi/Controllers/AdminUserRoleController.cs +++ b/AsbCloudWebApi/Controllers/AdminUserRoleController.cs @@ -1,6 +1,5 @@ -using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Repositories; -using AsbCloudApp.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; diff --git a/AsbCloudWebApi/Controllers/AuthController.cs b/AsbCloudWebApi/Controllers/AuthController.cs index b2702f81..5318c6ec 100644 --- a/AsbCloudWebApi/Controllers/AuthController.cs +++ b/AsbCloudWebApi/Controllers/AuthController.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudApp.Repositories; using AsbCloudApp.Services; using AsbCloudInfrastructure.Repository; diff --git a/AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs b/AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs index 53e1d61a..8178bed7 100644 --- a/AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs +++ b/AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Http; using System.ComponentModel.DataAnnotations; using AsbCloudApp.Repositories; +using AsbCloudApp.Data.User; namespace AsbCloudWebApi.Controllers { diff --git a/AsbCloudWebApi/Extentions.cs b/AsbCloudWebApi/Extentions.cs index aff16969..021594fc 100644 --- a/AsbCloudWebApi/Extentions.cs +++ b/AsbCloudWebApi/Extentions.cs @@ -1,4 +1,4 @@ -using AsbCloudApp.Data; +using AsbCloudApp.Data.User; using AsbCloudWebApi.Converters; using System; using System.ComponentModel;