No DAL in API layer

samueleresca · Mar 14, 2017 · e18ac5d · e18ac5d
1 parent 1462cf5
commit e18ac5d
Show file tree

Hide file tree

Showing 22 changed files with 257 additions and 322 deletions.
diff --git a/Blog.Turnmeup.sln b/Blog.Turnmeup.sln
@@ -1,26 +1,23 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4008421C-FFE7-4EF5-9F95-C56C869B39A6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4548E54F-ECBD-4D62-8333-57A4E38DBF7E}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Blog.Turnmeup.DAL", "src\Blog.Turnmeup.DAL\Blog.Turnmeup.DAL.xproj", "{E461CE6B-B634-41DD-A22C-9E5C831F7DCC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{967E33BC-9E96-4588-84CE-435D8B788501}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Blog.Turnmeup.DL", "src\Blog.Turnmeup.DL\Blog.Turnmeup.DL.xproj", "{835E30FB-DC79-4E94-A03F-E734EFFEAB5F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blog.Turnmeup.DAL", "src\Blog.Turnmeup.DAL\Blog.Turnmeup.DAL.csproj", "{E461CE6B-B634-41DD-A22C-9E5C831F7DCC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{967E33BC-9E96-4588-84CE-435D8B788501}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blog.Turnmeup.DL", "src\Blog.Turnmeup.DL\Blog.Turnmeup.DL.csproj", "{835E30FB-DC79-4E94-A03F-E734EFFEAB5F}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Blog.Turnmeup.DL.Tests", "test\Blog.Turnmeup.DL.Tests\Blog.Turnmeup.DL.Tests.xproj", "{F1CEB6E7-84FA-4D4E-B3F9-88D8D385DA32}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blog.Turnmeup.DL.Tests", "test\Blog.Turnmeup.DL.Tests\Blog.Turnmeup.DL.Tests.csproj", "{F1CEB6E7-84FA-4D4E-B3F9-88D8D385DA32}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Blog.Turnmeup.API", "src\Blog.Turnmeup.API\Blog.Turnmeup.API.xproj", "{388D81B9-E725-4D45-B44D-ED2F561A99FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blog.Turnmeup.API", "src\Blog.Turnmeup.API\Blog.Turnmeup.API.csproj", "{388D81B9-E725-4D45-B44D-ED2F561A99FF}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Blog.Turnmeup.API.Tests", "test\Blog.Turnmeup.API.Tests\Blog.Turnmeup.API.Tests.xproj", "{D894924B-946E-49AB-BEC5-D165F8227D64}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blog.Turnmeup.API.Tests", "test\Blog.Turnmeup.API.Tests\Blog.Turnmeup.API.Tests.csproj", "{D894924B-946E-49AB-BEC5-D165F8227D64}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/global.json b/global.json
diff --git a/src/Blog.Turnmeup.API/Blog.Turnmeup.API.csproj b/src/Blog.Turnmeup.API/Blog.Turnmeup.API.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <AssemblyName>Blog.Turnmeup.API</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>Blog.Turnmeup.API</PackageId>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Blog.Turnmeup.DL\Blog.Turnmeup.DL.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AutoMapper" Version="5.2.0" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="1.2.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="1.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.1">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
+    <PackageReference Include="System.Linq" Version="4.3.0" />
+    <PackageReference Include="System.Linq.Parallel" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Blog.Turnmeup.API/Blog.Turnmeup.API.xproj b/src/Blog.Turnmeup.API/Blog.Turnmeup.API.xproj
diff --git a/src/Blog.Turnmeup.API/Controllers/CoursesController.cs b/src/Blog.Turnmeup.API/Controllers/CoursesController.cs
@@ -21,11 +21,11 @@ namespace Blog.Turnmeup.API.Controllers
     public class CoursesController : Controller
     {
 
-        private readonly IBaseService<Course> _service;
+        private readonly ICourseService _service;
         private readonly IMapper _mapper;
         private readonly IErrorHandler _errorHandler;
 
-        public CoursesController(IBaseService<Course> service, IMapper mapper, IErrorHandler errorHandler)
+        public CoursesController(ICourseService service, IMapper mapper, IErrorHandler errorHandler)
         {
             _service = service;
             _mapper = mapper;

diff --git a/src/Blog.Turnmeup.API/Infrastructure/InstallerDL.cs b/src/Blog.Turnmeup.API/Infrastructure/InstallerDL.cs
@@ -14,10 +14,9 @@ public static void ConfigureDALServices(IServiceCollection services)
         {
             services.AddDbContext<DataContext>();
 
-            //LABEL REPOSITORY
             services.AddTransient<IBaseRepository<Course>, BaseRepository<Course>>();
             services.AddTransient<IBaseService<Course>, BaseService<Course>>();
-
+            services.AddTransient<ICourseService, CourseService>();
             services.AddTransient<IErrorHandler, ErrorHandler>();
         }
 

diff --git a/src/Blog.Turnmeup.API/project.json b/src/Blog.Turnmeup.API/project.json
diff --git a/src/Blog.Turnmeup.DAL/Blog.Turnmeup.DAL.csproj b/src/Blog.Turnmeup.DAL/Blog.Turnmeup.DAL.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>Blog.Turnmeup.DAL</AssemblyName>
+    <PackageId>Blog.Turnmeup.DAL</PackageId>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="1.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.0.3">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.0.0" />
+    <PackageReference Include="System.Linq" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Blog.Turnmeup.DAL/Blog.Turnmeup.DAL.xproj b/src/Blog.Turnmeup.DAL/Blog.Turnmeup.DAL.xproj
diff --git a/src/Blog.Turnmeup.DAL/project.json b/src/Blog.Turnmeup.DAL/project.json
diff --git a/src/Blog.Turnmeup.DL/Blog.Turnmeup.DL.csproj b/src/Blog.Turnmeup.DL/Blog.Turnmeup.DL.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>Blog.Turnmeup.DL</AssemblyName>
+    <PackageId>Blog.Turnmeup.DL</PackageId>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Blog.Turnmeup.DAL\Blog.Turnmeup.DAL.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.1">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.0.0" />
+    <PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Blog.Turnmeup.DL/Blog.Turnmeup.DL.xproj b/src/Blog.Turnmeup.DL/Blog.Turnmeup.DL.xproj
diff --git a/src/Blog.Turnmeup.DL/Services/CourseService.cs b/src/Blog.Turnmeup.DL/Services/CourseService.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+using Blog.Turnmeup.Models;
+
+namespace Blog.Turnmeup.DL.Services
+{
+    public class CourseService : IBaseService<Course>, ICourseService
+    {
+        private readonly IBaseService<Course> _courseService;
+
+        public CourseService(IBaseService<Course> courseService)
+        {
+            _courseService = courseService;
+        }
+
+
+        public Task<IEnumerable<Course>> Get()
+        {
+            return _courseService.Get();
+        }
+
+        public Task<Course> GetById(int id)
+        {
+            return _courseService.GetById(id);
+        }
+
+        public IEnumerable<Course> Where(Expression<Func<Course, bool>> exp)
+        {
+            return _courseService.Where(exp);
+        }
+
+        public void AddOrUpdate(Course entry)
+        {
+            _courseService.AddOrUpdate(entry);
+        }
+
+        public void Remove(int id)
+        {
+            _courseService.Remove(id);
+        }
+    }
+}
diff --git a/src/Blog.Turnmeup.DL/Services/ICourseService.cs b/src/Blog.Turnmeup.DL/Services/ICourseService.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Blog.Turnmeup.Models;
+
+namespace Blog.Turnmeup.DL.Services
+{
+    public interface ICourseService
+    {
+        void AddOrUpdate(Course entry);
+        Task<IEnumerable<Course>> Get();
+        Task<Course> GetById(int id);
+        void Remove(int id);
+        IEnumerable<Course> Where(Expression<Func<Course, bool>> exp);
+    }
+}