diff options
Diffstat (limited to 'src/Services')
23 files changed, 23 insertions, 39 deletions
diff --git a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj index ebf5f9c..744a855 100644 --- a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj +++ b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj @@ -1,11 +1,9 @@ <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> <TargetFramework>net5.0</TargetFramework> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> + <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2"/> </ItemGroup> - </Project> diff --git a/src/Services/DevHive.Services.Models/Identity/Role/CreateRoleServiceModel.cs b/src/Services/DevHive.Services.Models/Role/CreateRoleServiceModel.cs index 3bed3fd..8b03c65 100644 --- a/src/Services/DevHive.Services.Models/Identity/Role/CreateRoleServiceModel.cs +++ b/src/Services/DevHive.Services.Models/Role/CreateRoleServiceModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; -namespace DevHive.Services.Models.Identity.Role +namespace DevHive.Services.Models.Role { public class CreateRoleServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/Role/RoleServiceModel.cs b/src/Services/DevHive.Services.Models/Role/RoleServiceModel.cs index 07249fe..77ca954 100644 --- a/src/Services/DevHive.Services.Models/Identity/Role/RoleServiceModel.cs +++ b/src/Services/DevHive.Services.Models/Role/RoleServiceModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Services.Models.Identity.Role +namespace DevHive.Services.Models.Role { public class RoleServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/Role/UpdateRoleServiceModel.cs b/src/Services/DevHive.Services.Models/Role/UpdateRoleServiceModel.cs index e21e6b4..9b8fbfe 100644 --- a/src/Services/DevHive.Services.Models/Identity/Role/UpdateRoleServiceModel.cs +++ b/src/Services/DevHive.Services.Models/Role/UpdateRoleServiceModel.cs @@ -1,6 +1,6 @@ using System; -namespace DevHive.Services.Models.Identity.Role +namespace DevHive.Services.Models.Role { public class UpdateRoleServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/BaseUserServiceModel.cs b/src/Services/DevHive.Services.Models/User/BaseUserServiceModel.cs index 514f82a..5c3dc6b 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/BaseUserServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/BaseUserServiceModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class BaseUserServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/FriendServiceModel.cs b/src/Services/DevHive.Services.Models/User/FriendServiceModel.cs index a784f5c..2241886 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/FriendServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/FriendServiceModel.cs @@ -1,6 +1,6 @@ using System; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class FriendServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/LoginServiceModel.cs b/src/Services/DevHive.Services.Models/User/LoginServiceModel.cs index 4d53283..6a0d128 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/LoginServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/LoginServiceModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class LoginServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/ProfilePictureServiceModel.cs b/src/Services/DevHive.Services.Models/User/ProfilePictureServiceModel.cs index ad81057..cbe64b2 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/ProfilePictureServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/ProfilePictureServiceModel.cs @@ -1,4 +1,4 @@ -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class ProfilePictureServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/RegisterServiceModel.cs b/src/Services/DevHive.Services.Models/User/RegisterServiceModel.cs index adc4119..5852d46 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/RegisterServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/RegisterServiceModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using DevHive.Services.Models.Language; using DevHive.Services.Models.Technology; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class RegisterServiceModel : BaseUserServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/UpdateFriendServiceModel.cs b/src/Services/DevHive.Services.Models/User/UpdateFriendServiceModel.cs index b0efe10..0d7a8c1 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/UpdateFriendServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/UpdateFriendServiceModel.cs @@ -1,6 +1,6 @@ using System; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class UpdateFriendServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/UpdateProfilePictureServiceModel.cs b/src/Services/DevHive.Services.Models/User/UpdateProfilePictureServiceModel.cs index 8563953..19ba08f 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/UpdateProfilePictureServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/UpdateProfilePictureServiceModel.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.Http; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class UpdateProfilePictureServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/UpdateUserServiceModel.cs b/src/Services/DevHive.Services.Models/User/UpdateUserServiceModel.cs index b4e4400..ff20e6b 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/UpdateUserServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/UpdateUserServiceModel.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Models.Language; using DevHive.Services.Models.Technology; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class UpdateUserServiceModel : BaseUserServiceModel { diff --git a/src/Services/DevHive.Services.Models/Identity/User/UserServiceModel.cs b/src/Services/DevHive.Services.Models/User/UserServiceModel.cs index ac7bba2..04b618b 100644 --- a/src/Services/DevHive.Services.Models/Identity/User/UserServiceModel.cs +++ b/src/Services/DevHive.Services.Models/User/UserServiceModel.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using DevHive.Common.Models.Misc; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Models.Language; using DevHive.Services.Models.Technology; -namespace DevHive.Services.Models.Identity.User +namespace DevHive.Services.Models.User { public class UserServiceModel : BaseUserServiceModel { diff --git a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj index af419df..d6d0876 100644 --- a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj +++ b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj @@ -14,14 +14,6 @@ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\DevHive.Services\DevHive.Services.csproj" /> - - <ProjectReference Include="..\DevHive.Services.Models\DevHive.Services.Models.csproj" /> - - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> - <PropertyGroup> <EnableNETAnalyzers>true</EnableNETAnalyzers> <AnalysisLevel>latest</AnalysisLevel> diff --git a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs index e500dd1..c4fac77 100644 --- a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using AutoMapper; using DevHive.Data.Interfaces.Repositories; using DevHive.Data.Models; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Services; using Moq; using NUnit.Framework; diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 21d4862..aff34c9 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -10,7 +10,7 @@ using DevHive.Common.Models.Misc; using DevHive.Data.Interfaces.Repositories; using DevHive.Data.Models; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using DevHive.Services.Options; using DevHive.Services.Services; using Microsoft.AspNetCore.Identity; diff --git a/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs b/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs index e61a107..37f259a 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs @@ -1,6 +1,6 @@ using DevHive.Data.Models; using AutoMapper; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; namespace DevHive.Services.Configurations.Mapping { diff --git a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs index 2b0f4ed..9a8e3d9 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs @@ -1,6 +1,6 @@ using DevHive.Data.Models; using AutoMapper; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using DevHive.Common.Models.Misc; using DevHive.Data.RelationModels; diff --git a/src/Services/DevHive.Services/DevHive.Services.csproj b/src/Services/DevHive.Services/DevHive.Services.csproj index 7a33166..1380248 100644 --- a/src/Services/DevHive.Services/DevHive.Services.csproj +++ b/src/Services/DevHive.Services/DevHive.Services.csproj @@ -18,12 +18,6 @@ <PackageReference Include="CloudinaryDotNet" Version="1.14.0" /> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\DevHive.Common\DevHive.Common.csproj" /> - <ProjectReference Include="..\DevHive.Services.Models\DevHive.Services.Models.csproj" /> - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> - </ItemGroup> - <PropertyGroup> <EnableNETAnalyzers>true</EnableNETAnalyzers> <AnalysisLevel>latest</AnalysisLevel> diff --git a/src/Services/DevHive.Services/Interfaces/IRoleService.cs b/src/Services/DevHive.Services/Interfaces/IRoleService.cs index d47728c..2c31b06 100644 --- a/src/Services/DevHive.Services/Interfaces/IRoleService.cs +++ b/src/Services/DevHive.Services/Interfaces/IRoleService.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; namespace DevHive.Services.Interfaces { diff --git a/src/Services/DevHive.Services/Interfaces/IUserService.cs b/src/Services/DevHive.Services/Interfaces/IUserService.cs index 9e2b4e3..daa5e5e 100644 --- a/src/Services/DevHive.Services/Interfaces/IUserService.cs +++ b/src/Services/DevHive.Services/Interfaces/IUserService.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using DevHive.Common.Models.Identity; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; namespace DevHive.Services.Interfaces { diff --git a/src/Services/DevHive.Services/Services/RoleService.cs b/src/Services/DevHive.Services/Services/RoleService.cs index a8b8e17..dbf8fcd 100644 --- a/src/Services/DevHive.Services/Services/RoleService.cs +++ b/src/Services/DevHive.Services/Services/RoleService.cs @@ -4,7 +4,7 @@ using AutoMapper; using DevHive.Data.Interfaces.Repositories; using DevHive.Data.Models; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Models.Language; namespace DevHive.Services.Services diff --git a/src/Services/DevHive.Services/Services/UserService.cs b/src/Services/DevHive.Services/Services/UserService.cs index 22d5052..f68e3aa 100644 --- a/src/Services/DevHive.Services/Services/UserService.cs +++ b/src/Services/DevHive.Services/Services/UserService.cs @@ -1,6 +1,6 @@ using AutoMapper; using DevHive.Services.Options; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using System.Threading.Tasks; using DevHive.Data.Models; using System; |