Splited project

czechitas · Jan 22, 2024 · f6cbd9b · f6cbd9b
1 parent 5e13a50
commit f6cbd9b
Show file tree

Hide file tree

Showing 20 changed files with 83 additions and 33 deletions.
diff --git a/AutomatedTestingApp.sln b/AutomatedTestingApp.sln
@@ -6,6 +6,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomatedTestingApp.Tests",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E59DE8FE-A6EE-40B3-AD51-442955494864}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomatedTestingApp.Core", "src\AutomatedTestingApp.Core\AutomatedTestingApp.Core.csproj", "{91D08566-7879-4E76-B1F8-4322167BCC28}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomatedTestingApp.Infrastructure", "src\AutomatedTestingApp.Infrastructure\AutomatedTestingApp.Infrastructure.csproj", "{4F09B7B7-A22A-4C27-B82F-6AEE0B222141}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,6 +24,14 @@ Global
 		{61CB4E97-F8C4-412C-BC70-72EF359172CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{61CB4E97-F8C4-412C-BC70-72EF359172CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61CB4E97-F8C4-412C-BC70-72EF359172CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91D08566-7879-4E76-B1F8-4322167BCC28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91D08566-7879-4E76-B1F8-4322167BCC28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91D08566-7879-4E76-B1F8-4322167BCC28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91D08566-7879-4E76-B1F8-4322167BCC28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F09B7B7-A22A-4C27-B82F-6AEE0B222141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F09B7B7-A22A-4C27-B82F-6AEE0B222141}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F09B7B7-A22A-4C27-B82F-6AEE0B222141}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F09B7B7-A22A-4C27-B82F-6AEE0B222141}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{61CB4E97-F8C4-412C-BC70-72EF359172CB} = {E59DE8FE-A6EE-40B3-AD51-442955494864}

diff --git a/src/AutomatedTestingApp.Core/AutomatedTestingApp.Core.csproj b/src/AutomatedTestingApp.Core/AutomatedTestingApp.Core.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.1" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/AutomatedTestingApp.Core/Courses/Course.cs b/src/AutomatedTestingApp.Core/Courses/Course.cs
@@ -0,0 +1,8 @@
+namespace AutomatedTestingApp.Core.Courses;
+
+public class Course
+{
+    public Guid CourseId { get; set; }
+    public string Name { get; set; }
+    public string Description { get; set; }
+}
diff --git a/...App/Areas/Identity/Models/IdentityUser.cs → ...atedTestingApp.Core/Users/IdentityUser.cs b/...App/Areas/Identity/Models/IdentityUser.cs → ...atedTestingApp.Core/Users/IdentityUser.cs
@@ -1,7 +1,7 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace AutomatedTestingApp.Areas.Identity.Models;
+namespace AutomatedTestingApp.Core.Users;
 
 [Keyless]
 public class IdentityUser

diff --git a/src/AutomatedTestingApp.Infrastructure/AutomatedTestingApp.Infrastructure.csproj b/src/AutomatedTestingApp.Infrastructure/AutomatedTestingApp.Infrastructure.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\AutomatedTestingApp.Core\AutomatedTestingApp.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Update="Data\AutomatedTestingApp.db">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
+    </ItemGroup>
+
+</Project>
diff --git a/...tedTestingApp/Data/AutomatedTestingApp.db → ...nfrastructure/Data/AutomatedTestingApp.db b/...tedTestingApp/Data/AutomatedTestingApp.db → ...nfrastructure/Data/AutomatedTestingApp.db
diff --git a/...utomatedTestingApp/Helpers/DataContext.cs → ...dTestingApp.Infrastructure/DataContext.cs b/...utomatedTestingApp/Helpers/DataContext.cs → ...dTestingApp.Infrastructure/DataContext.cs
@@ -1,7 +1,7 @@
-using AutomatedTestingApp.Areas.Identity.Models;
+using AutomatedTestingApp.Core.Users;
 using Microsoft.EntityFrameworkCore;
 
-namespace AutomatedTestingApp.Helpers;
+namespace AutomatedTestingApp.Infrastructure;
 
 public class DataContext : DbContext
 {

diff --git a/.../20230918081031_InitialCreate.Designer.cs → .../20230918081031_InitialCreate.Designer.cs b/.../20230918081031_InitialCreate.Designer.cs → .../20230918081031_InitialCreate.Designer.cs
diff --git a/...igrations/20230918081031_InitialCreate.cs → ...igrations/20230918081031_InitialCreate.cs b/...igrations/20230918081031_InitialCreate.cs → ...igrations/20230918081031_InitialCreate.cs
diff --git a/...pp/Migrations/DataContextModelSnapshot.cs → ...re/Migrations/DataContextModelSnapshot.cs b/...pp/Migrations/DataContextModelSnapshot.cs → ...re/Migrations/DataContextModelSnapshot.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using AutomatedTestingApp.Helpers;
+using AutomatedTestingApp.Infrastructure;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

diff --git a/...tedTestingApp/Repositories/IRepository.cs → ...nfrastructure/Repositories/IRepository.cs b/...tedTestingApp/Repositories/IRepository.cs → ...nfrastructure/Repositories/IRepository.cs
@@ -1,6 +1,6 @@
 using System.Linq.Expressions;
 
-namespace AutomatedTestingApp.Repositories;
+namespace AutomatedTestingApp.Infrastructure.Repositories;
 
 public interface IRepository<TEntity>
 {

diff --git a/...tedTestingApp/Repositories/IUnitOfWork.cs → ...nfrastructure/Repositories/IUnitOfWork.cs b/...tedTestingApp/Repositories/IUnitOfWork.cs → ...nfrastructure/Repositories/IUnitOfWork.cs
@@ -1,4 +1,4 @@
-namespace AutomatedTestingApp.Repositories;
+namespace AutomatedTestingApp.Infrastructure.Repositories;
 
 public interface IUnitOfWork
 {

diff --git a/...atedTestingApp/Repositories/Repository.cs → ...Infrastructure/Repositories/Repository.cs b/...atedTestingApp/Repositories/Repository.cs → ...Infrastructure/Repositories/Repository.cs
@@ -1,8 +1,7 @@
 using System.Linq.Expressions;
-using AutomatedTestingApp.Helpers;
 using Microsoft.EntityFrameworkCore;
 
-namespace AutomatedTestingApp.Repositories;
+namespace AutomatedTestingApp.Infrastructure.Repositories;
 
 public class Repository<TEntity> : IRepository<TEntity> where TEntity : class
 {

diff --git a/...atedTestingApp/Repositories/UnitOfWork.cs → ...Infrastructure/Repositories/UnitOfWork.cs b/...atedTestingApp/Repositories/UnitOfWork.cs → ...Infrastructure/Repositories/UnitOfWork.cs
@@ -1,6 +1,4 @@
-using AutomatedTestingApp.Helpers;
-
-namespace AutomatedTestingApp.Repositories;
+namespace AutomatedTestingApp.Infrastructure.Repositories;
 
 public class UnitOfWork : IUnitOfWork, IDisposable
 {

diff --git a/src/AutomatedTestingApp/Areas/Identity/Controllers/AccountController.cs b/src/AutomatedTestingApp/Areas/Identity/Controllers/AccountController.cs
@@ -1,9 +1,9 @@
 using System.Security.Claims;
-using AutomatedTestingApp.Areas.Identity.Models;
-using AutomatedTestingApp.Repositories;
+using AutomatedTestingApp.Infrastructure.Repositories;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Mvc;
+using IdentityUser = AutomatedTestingApp.Core.Users.IdentityUser;
 
 namespace AutomatedTestingApp.Areas.Identity.Controllers;
 

diff --git a/src/AutomatedTestingApp/Areas/Identity/Views/Account/Login.cshtml b/src/AutomatedTestingApp/Areas/Identity/Views/Account/Login.cshtml
@@ -1,4 +1,4 @@
-@model AutomatedTestingApp.Areas.Identity.Models.IdentityUser
+@model AutomatedTestingApp.Core.Users.IdentityUser
 
 <!DOCTYPE html>
 <html lang="en">

diff --git a/src/AutomatedTestingApp/AutomatedTestingApp.csproj b/src/AutomatedTestingApp/AutomatedTestingApp.csproj
@@ -7,32 +7,24 @@
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11">
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        <PrivateAssets>all</PrivateAssets>
-      </PackageReference>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
-    </ItemGroup>
 
 
     <ItemGroup>
-      <Folder Include="Migrations\" />
+      <_ContentIncludedByDefault Remove="Views\Account\Index.cshtml" />
+      <_ContentIncludedByDefault Remove="Views\Articles\Index.cshtml" />
     </ItemGroup>
 
 
 
     <ItemGroup>
-      <None Update="Data\AutomatedTestingApp.db">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
+      <ProjectReference Include="..\..\AutomatedTestingApp.Infrastructure\AutomatedTestingApp.Infrastructure.csproj" />
+      <ProjectReference Include="..\AutomatedTestingApp.Infrastructure\AutomatedTestingApp.Infrastructure.csproj" />
     </ItemGroup>
 
 
 
     <ItemGroup>
-      <_ContentIncludedByDefault Remove="Views\Account\Index.cshtml" />
-      <_ContentIncludedByDefault Remove="Views\Articles\Index.cshtml" />
+      <Folder Include="Areas\Identity\Models\" />
     </ItemGroup>
 
 

diff --git a/src/AutomatedTestingApp/Program.cs b/src/AutomatedTestingApp/Program.cs
@@ -1,5 +1,5 @@
-using AutomatedTestingApp.Helpers;
-using AutomatedTestingApp.Repositories;
+using AutomatedTestingApp.Infrastructure;
+using AutomatedTestingApp.Infrastructure.Repositories;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.EntityFrameworkCore;
 

diff --git a/src/AutomatedTestingApp/Properties/launchSettings.json b/src/AutomatedTestingApp/Properties/launchSettings.json
@@ -15,7 +15,7 @@
       "applicationUrl": "http://localhost:5142",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "CUSTOMCONNSTR_SQLITE": "Data/AutomatedTestingApp.db"
+        "CUSTOMCONNSTR_SQLITE": "../AutomatedTestingApp.Infrastructure/Data/AutomatedTestingApp.db"
       }
     },
     "https": {

diff --git a/tests/AutomatedTestingApp.Tests/Areas/Identity/Controllers/AccountControllerTest.cs b/tests/AutomatedTestingApp.Tests/Areas/Identity/Controllers/AccountControllerTest.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using AutomatedTestingApp.Areas.Identity.Controllers;
 using AutomatedTestingApp.Areas.Identity.Models;
-using AutomatedTestingApp.Repositories;
+using AutomatedTestingApp.Infrastructure.Repositories;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Mvc;
 using Moq;