Restructure Successful

15 files changed, 35 insertions, 30 deletions

diff --git a/src/Web/DevHive.Web/Attributes/GoodPasswordModelValidation.cs b/src/Web/DevHive.Web.Models/Attributes/GoodPasswordModelValidation.cs
index 7d6a1ea..5ecb41a 100644
--- a/src/Web/DevHive.Web/Attributes/GoodPasswordModelValidation.cs
+++ b/src/Web/DevHive.Web.Models/Attributes/GoodPasswordModelValidation.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace DevHive.Web.Attributes
+namespace DevHive.Web.Models.Attributes
 {
 	public class GoodPassword : ValidationAttribute
 	{
diff --git a/src/Web/DevHive.Web/Attributes/OnlyLettersModelValidation.cs b/src/Web/DevHive.Web.Models/Attributes/OnlyLettersModelValidation.cs
index 07afee9..0f6adb1 100644
--- a/src/Web/DevHive.Web/Attributes/OnlyLettersModelValidation.cs
+++ b/src/Web/DevHive.Web.Models/Attributes/OnlyLettersModelValidation.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace DevHive.Web.Attributes
+namespace DevHive.Web.Models.Attributes
 {
 	public class OnlyLetters : ValidationAttribute
 	{
diff --git a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj
index 65892c5..ca49b8c 100644
--- a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj
+++ b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj
@@ -2,9 +2,11 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
-  <ItemGroup/>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" />
+  </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2"/>
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs b/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs
index 9a2544d..5fdb757 100644
--- a/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
-using DevHive.Web.Attributes;
+using DevHive.Web.Models.Attributes;
 
 namespace DevHive.Web.Models.User
 {
diff --git a/src/Web/DevHive.Web.Models/User/LoginWebModel.cs b/src/Web/DevHive.Web.Models/User/LoginWebModel.cs
index c821721..7d4e93a 100644
--- a/src/Web/DevHive.Web.Models/User/LoginWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/LoginWebModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
-using DevHive.Web.Attributes;
+using DevHive.Web.Models.Attributes;
 
 namespace DevHive.Web.Models.User
 {
diff --git a/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs b/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs
index 754c8eb..999ff00 100644
--- a/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
-using DevHive.Web.Attributes;
+using DevHive.Web.Models.Attributes;
 
 namespace DevHive.Web.Models.User
 {
diff --git a/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs b/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs
index 86f6bfe..f74927e 100644
--- a/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
-using DevHive.Web.Attributes;
+using DevHive.Web.Models.Attributes;
 using DevHive.Web.Models.Role;
 using DevHive.Web.Models.Language;
 using DevHive.Web.Models.Technology;
diff --git a/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs b/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs
index fc0a7ff..638cb15 100644
--- a/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs
+++ b/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
-using DevHive.Web.Attributes;
+using DevHive.Web.Models.Attributes;
 
 namespace DevHive.Web.Models.User
 {
diff --git a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj
index ee390b5..f8390de 100644
--- a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj
+++ b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj
@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.16.0" />
-    <PackageReference Include="NUnit" Version="3.13.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
   </ItemGroup>
-
+  <ItemGroup>
+    <ProjectReference Include="..\DevHive.Web\DevHive.Web.csproj" />
+  </ItemGroup>
   <PropertyGroup>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
index b5deba0..8e33bee 100644
--- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
@@ -111,7 +111,7 @@ namespace DevHive.Web.Tests
 			Assert.IsInstanceOf<OkObjectResult>(result);
 
 			OkObjectResult okObjectResult = result as OkObjectResult;
-			RoleWebModel resultModel = okObjectResult.Value as Models.Identity.Role.RoleWebModel;
+			RoleWebModel resultModel = okObjectResult.Value as RoleWebModel;
 
 			Assert.AreEqual(NAME, resultModel.Name);
 		}
diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
index 3e858f6..efdfdbb 100644
--- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
@@ -113,7 +113,7 @@ namespace DevHive.Web.Tests
 			Assert.IsInstanceOf<OkObjectResult>(result);
 
 			OkObjectResult okObjectResult = result as OkObjectResult;
-			UserWebModel resultModel = okObjectResult.Value as Models.Identity.User.UserWebModel;
+			UserWebModel resultModel = okObjectResult.Value as UserWebModel;
 
 			Assert.AreEqual(USERNAME, resultModel.UserName);
 		}
@@ -155,7 +155,7 @@ namespace DevHive.Web.Tests
 			Assert.IsInstanceOf<OkObjectResult>(result);
 
 			OkObjectResult okObjectResult = result as OkObjectResult;
-			UserWebModel resultModel = okObjectResult.Value as Models.Identity.User.UserWebModel;
+			UserWebModel resultModel = okObjectResult.Value as UserWebModel;
 
 			Assert.AreEqual(USERNAME, resultModel.UserName);
 		}
@@ -214,7 +214,7 @@ namespace DevHive.Web.Tests
 			Assert.IsInstanceOf<AcceptedResult>(result);
 
 			AcceptedResult acceptedResult = result as AcceptedResult;
-			ProfilePictureWebModel resultModel = acceptedResult.Value as Models.Identity.User.ProfilePictureWebModel;
+			ProfilePictureWebModel resultModel = acceptedResult.Value as ProfilePictureWebModel;
 
 			Assert.AreEqual(profilePictureURL, resultModel.ProfilePictureURL);
 		}
diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
index 88f21d4..c547951 100644
--- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
+++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
@@ -1,4 +1,4 @@
-using DevHive.Data.Interfaces.Repositories;
+using DevHive.Data.Interfaces;
 using DevHive.Data.Repositories;
 using DevHive.Services.Interfaces;
 using DevHive.Services.Services;
diff --git a/src/Web/DevHive.Web/Configurations/Mapping/RatingMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/RatingMappings.cs
index 4e071de..a29e06c 100644
--- a/src/Web/DevHive.Web/Configurations/Mapping/RatingMappings.cs
+++ b/src/Web/DevHive.Web/Configurations/Mapping/RatingMappings.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using DevHive.Services.Models.Post.Rating;
-using DevHive.Web.Models.Post.Rating;
+using DevHive.Web.Models.Rating;
 
 namespace DevHive.Web.Configurations.Mapping
 {
diff --git a/src/Web/DevHive.Web/Controllers/RateController.cs b/src/Web/DevHive.Web/Controllers/RateController.cs
index 68b859b..72eb932 100644
--- a/src/Web/DevHive.Web/Controllers/RateController.cs
+++ b/src/Web/DevHive.Web/Controllers/RateController.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Services.Interfaces;
 using DevHive.Services.Models.Post.Rating;
-using DevHive.Web.Models.Post.Rating;
+using DevHive.Web.Models.Rating;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
diff --git a/src/Web/DevHive.Web/DevHive.Web.csproj b/src/Web/DevHive.Web/DevHive.Web.csproj
index 7ba07b1..6f78b69 100644
--- a/src/Web/DevHive.Web/DevHive.Web.csproj
+++ b/src/Web/DevHive.Web/DevHive.Web.csproj
@@ -7,17 +7,21 @@
     <AnalysisLevel>latest</AnalysisLevel>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.1" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.1" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.3" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.3" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.2" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.0.5" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
     <PackageReference Include="AutoMapper" Version="10.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.3" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <ProjectReference Include="..\DevHive.Web.Models\DevHive.Web.Models.csproj" />
+    <ProjectReference Include="..\..\Services\DevHive.Services\DevHive.Services.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file