final

dimdeli · Jun 15, 2018 · e737aea · e737aea
1 parent 77fee9b
commit e737aea
Show file tree

Hide file tree

Showing 40 changed files with 492 additions and 86 deletions.
diff --git a/DI_v2.pptx b/DI_v2.pptx
diff --git a/Domain/Context/MoviesMvcContext.cs b/Domain/Context/MoviesMvcContext.cs
@@ -60,7 +60,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
                 entity.Property(e => e.ReleaseDate).HasColumnType("date");
 
-                entity.Property(e => e.Revenue).HasColumnType("decimal(14, 2)");
+                entity.Property(e => e.Price).HasColumnType("decimal(14, 2)");
 
                 entity.Property(e => e.Summary).HasMaxLength(1024);
 

diff --git a/Domain/Interfaces/IMovieService.cs b/Domain/Interfaces/IMovieService.cs
@@ -11,7 +11,7 @@ public interface IMovieService
     {
         Task<IList<Movie>> GetAllAsync();
 
-        Task<Movie> GetAsync(int id);
+        Task<Movie> GetAsync(int id, string code = null);
 
         Task<IList<ContentRating>> GetContentRatingsAsync();
 

diff --git a/Domain/Models/Movie.cs b/Domain/Models/Movie.cs
@@ -16,7 +16,7 @@ public Movie()
 
         [Required]
         public string Title { get; set; }
-        public decimal? Revenue { get; set; }
+        public decimal? Price { get; set; }
         public string PosterUrl { get; set; }
         public string VideoUrl { get; set; }
         public string VideoPosterUrl { get; set; }

diff --git a/Domain/Services/FakePricingService.cs b/Domain/Services/FakePricingService.cs
@@ -0,0 +1,17 @@
+using Domain.Interfaces;
+
+namespace Domain.Services
+{
+    public class FakePricingService : IPricingService
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public decimal DiscountPercentage(string code)
+        {
+            return 0M;
+        }
+    }
+}
diff --git a/Domain/Services/MovieService.cs b/Domain/Services/MovieService.cs
@@ -13,10 +13,12 @@ namespace Domain.Services
     public class MovieService : IMovieService
     {
         private readonly MoviesMvcContext context_;
+        private readonly IPricingService pricing_;
 
-        public MovieService(MoviesMvcContext context)
+        public MovieService(MoviesMvcContext context, IPricingService pricing)
         {
             context_ = context;
+            pricing_ = pricing;
         }
 
         public async Task<bool> AddAsync(Movie movie)
@@ -39,12 +41,19 @@ public async Task<IList<Movie>> GetAllAsync()
             return movies;
         }
 
-        public async Task<Movie> GetAsync(int id)
+        public async Task<Movie> GetAsync(int id, string code = null)
         {
             var movie = await context_.Movie
-                .Include(m => m.ContentRating)
                 .SingleOrDefaultAsync(m => m.MovieId == id);
 
+            if (movie == null) {
+                return null;
+            }
+
+            var discount = pricing_.DiscountPercentage(code);
+
+            movie.Price -= movie.Price * (discount / 100);
+
             return movie;
         }
 

diff --git a/MoviesApi/Controllers/MoviesController.cs b/MoviesApi/Controllers/MoviesController.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Domain.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace MoviesApi.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class MoviesController : ControllerBase
+    {
+        private readonly IMovieService movieService_;
+
+        public MoviesController(IMovieService movieService)
+        {
+            movieService_ = movieService;
+        }
+
+        // GET api/movies
+        [HttpGet]
+        public async Task<IActionResult> GetAllAsync()
+        {
+            var movies = await movieService_.GetAllAsync();
+
+            return Ok(movies);
+        }
+
+        // GET api/movies/1?code=12abc
+        [HttpGet("{id}")]
+        public async Task<IActionResult> GetAsync(int id, string code)
+        {
+            var movie = await movieService_.GetAsync(id, code);
+
+            if (movie == null) {
+                return NotFound(movie);
+            }
+
+            return Ok(movie);
+        }
+    }
+}
diff --git a/MoviesApi/MoviesApi.csproj b/MoviesApi/MoviesApi.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Domain\Domain.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/MoviesApi/Program.cs b/MoviesApi/Program.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace MoviesApi
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateWebHostBuilder(args).Build().Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .UseStartup<Startup>();
+    }
+}
diff --git a/MoviesApi/Properties/launchSettings.json b/MoviesApi/Properties/launchSettings.json
@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:59201",
+      "sslPort": 44372
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "api/values",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "MoviesApi": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "api/values",
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/MoviesApi/Startup.cs b/MoviesApi/Startup.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Domain.Context;
+using Domain.Interfaces;
+using Domain.Services;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.HttpsPolicy;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace MoviesApi
+{
+    public class Startup
+    {
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
+        // This method gets called by the runtime. Use this method to add services to the container.
+        public void ConfigureServices(IServiceCollection services)
+        {
+            var connection = @"Server=localhost,1433;Database=MoviesMvc;Persist Security Info=True;uid=sa;pwd=D1m1tr1s!;ConnectRetryCount=0";
+
+            services.AddDbContext<MoviesMvcContext>(
+                options => options.UseSqlServer(connection));
+
+            services.AddTransient<IMovieService, MovieService>();
+            services.AddTransient<IPricingService, PricingService>();
+
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+            else
+            {
+                app.UseHsts();
+            }
+
+            app.UseHttpsRedirection();
+            app.UseMvc();
+        }
+    }
+}
diff --git a/MoviesApi/appsettings.Development.json b/MoviesApi/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/MoviesApi/appsettings.json b/MoviesApi/appsettings.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/MoviesHub/Models/Movie.cs b/MoviesHub/Models/Movie.cs
@@ -16,7 +16,7 @@ public Movie()
 
         [Required]
         public string Title { get; set; }
-        public decimal? Revenue { get; set; }
+        public decimal? Price { get; set; }
         public string PosterUrl { get; set; }
         public string VideoUrl { get; set; }
         public string VideoPosterUrl { get; set; }

diff --git a/MoviesHub/Models/MoviesMvcContext.cs b/MoviesHub/Models/MoviesMvcContext.cs
@@ -60,7 +60,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
                 entity.Property(e => e.ReleaseDate).HasColumnType("date");
 
-                entity.Property(e => e.Revenue).HasColumnType("decimal(14, 2)");
+                entity.Property(e => e.Price).HasColumnType("decimal(14, 2)");
 
                 entity.Property(e => e.Summary).HasMaxLength(1024);
 

diff --git a/MoviesHub/Views/Movies/Create.cshtml b/MoviesHub/Views/Movies/Create.cshtml
@@ -18,9 +18,9 @@
                 <span asp-validation-for="Title" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <label asp-for="Revenue" class="control-label"></label>
-                <input asp-for="Revenue" class="form-control" />
-                <span asp-validation-for="Revenue" class="text-danger"></span>
+                <label asp-for="Price" class="control-label"></label>
+                <input asp-for="Price" class="form-control" />
+                <span asp-validation-for="Price" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="PosterUrl" class="control-label"></label>

diff --git a/MoviesHub/Views/Movies/Delete.cshtml b/MoviesHub/Views/Movies/Delete.cshtml
@@ -18,10 +18,10 @@
             @Html.DisplayFor(model => model.Title)
         </dd>
         <dt>
-            @Html.DisplayNameFor(model => model.Revenue)
+            @Html.DisplayNameFor(model => model.Price)
         </dt>
         <dd>
-            @Html.DisplayFor(model => model.Revenue)
+            @Html.DisplayFor(model => model.Price)
         </dd>
         <dt>
             @Html.DisplayNameFor(model => model.PosterUrl)

diff --git a/MoviesHub/Views/Movies/Details.cshtml b/MoviesHub/Views/Movies/Details.cshtml
@@ -17,10 +17,10 @@
             @Html.DisplayFor(model => model.Title)
         </dd>
         <dt>
-            @Html.DisplayNameFor(model => model.Revenue)
+            @Html.DisplayNameFor(model => model.Price)
         </dt>
         <dd>
-            @Html.DisplayFor(model => model.Revenue)
+            @Html.DisplayFor(model => model.Price)
         </dd>
         <dt>
             @Html.DisplayNameFor(model => model.PosterUrl)

diff --git a/MoviesHub/Views/Movies/Edit.cshtml b/MoviesHub/Views/Movies/Edit.cshtml
@@ -19,9 +19,9 @@
                 <span asp-validation-for="Title" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <label asp-for="Revenue" class="control-label"></label>
-                <input asp-for="Revenue" class="form-control" />
-                <span asp-validation-for="Revenue" class="text-danger"></span>
+                <label asp-for="Price" class="control-label"></label>
+                <input asp-for="Price" class="form-control" />
+                <span asp-validation-for="Price" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="PosterUrl" class="control-label"></label>

diff --git a/MoviesHub/Views/Movies/Index.cshtml b/MoviesHub/Views/Movies/Index.cshtml
@@ -16,7 +16,7 @@
                 @Html.DisplayNameFor(model => model.Title)
             </th>
             <th>
-                @Html.DisplayNameFor(model => model.Revenue)
+                @Html.DisplayNameFor(model => model.Price)
             </th>
             <th>
                 @Html.DisplayNameFor(model => model.PosterUrl)
@@ -46,7 +46,7 @@
                 @Html.DisplayFor(modelItem => item.Title)
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.Revenue)
+                @Html.DisplayFor(modelItem => item.Price)
             </td>
             <td>
                 @Html.DisplayFor(modelItem => item.PosterUrl)
@@ -67,9 +67,9 @@
                 @Html.DisplayFor(modelItem => item.ContentRating.ShortDescription)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.MovieId">Edit</a> |
+                @*<a asp-action="Edit" asp-route-id="@item.MovieId">Edit</a> |
                 <a asp-action="Details" asp-route-id="@item.MovieId">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.MovieId">Delete</a>
+                <a asp-action="Delete" asp-route-id="@item.MovieId">Delete</a>*@
             </td>
         </tr>
 }

diff --git a/MoviesHub/Views/MoviesNew/Create.cshtml b/MoviesHub/Views/MoviesNew/Create.cshtml
@@ -18,9 +18,9 @@
                 <span asp-validation-for="Title" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <label asp-for="Revenue" class="control-label"></label>
-                <input asp-for="Revenue" class="form-control" />
-                <span asp-validation-for="Revenue" class="text-danger"></span>
+                <label asp-for="Price" class="control-label"></label>
+                <input asp-for="Price" class="form-control" />
+                <span asp-validation-for="Price" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="PosterUrl" class="control-label"></label>