working on authenthification

Author: weak0

WebAPI/Controllers/RestaurantController.cs

@@ -1,16 +1,14 @@
-using AutoMapper;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using WebAPI.Entities;
+using Microsoft.AspNetCore.Mvc;
 using WebAPI.Models;
 using WebAPI.Serivces;
 
 namespace WebAPI.Controllers
 {
     [Route("api/restaurant")]
+    [ApiController]
     public class RestaurantController : ControllerBase
     {
-  
+
         private readonly IRestauranServices _restaurantService;
 
         public RestaurantController(IRestauranServices restauranServices)
@@ -21,45 +19,35 @@ public RestaurantController(IRestauranServices restauranServices)
         public ActionResult<IEnumerable<RestaurantDto>> GetAll()
         {
             var resutarants = _restaurantService.GetAll();
-            return resutarants.Any() ?  Ok(resutarants) :  BadRequest();
+            return resutarants.Any() ? Ok(resutarants) : BadRequest();
         }
 
         [HttpGet("{id}")]
         public ActionResult<RestaurantDto> Get([FromRoute] int id)
         {
-            var restaurant = _restaurantService.GetById(id);            
-            return restaurant == null ? NotFound() : Ok(restaurant);
+            var restaurant = _restaurantService.GetById(id);
+            return Ok(restaurant);
         }
 
         [HttpPost]
         public ActionResult CreateRestaurant([FromBody] CreateRestuarantDto dto)
         {
-            if (!ModelState.IsValid)
-            {
-                return BadRequest(ModelState);
-            }
-           
             int id = _restaurantService.Create(dto);
             return Created($"/api/restuarant/{id}", "ok pomyslnie dodoano");
         }
         [HttpDelete("{id}")]
         public ActionResult Delete([FromRoute] int id)
         {
-          bool flag = _restaurantService.Delete(id);
-
-            return flag ? NoContent() : NotFound();
+            _restaurantService.Delete(id);
+            return NoContent();
 
         }
         [HttpPut]
         public ActionResult<RestaurantDto> UpdateRestaurant([FromBody] UpdateRestaurantDto dto)
         {
-            if (!ModelState.IsValid)
-            {
-                return BadRequest(ModelState);
-            }
-            bool flag = _restaurantService.UpdateRestaurant(dto);
+            _restaurantService.UpdateRestaurant(dto);
             var updatedRestaruant = _restaurantService.GetById(dto.Id);
-            return flag ? Ok(updatedRestaruant) : BadRequest();
+            return Ok(updatedRestaruant);
         }
     }
 }

WebAPI/Entities/Addres.cs

@@ -10,7 +10,7 @@ public class Addres
 
         public virtual Restaurant Restaurant { get; set; }
 
-     
+
 
     }
 }

WebAPI/Entities/Restaurant.cs

@@ -4,17 +4,17 @@ public class Restaurant
     {
 
         public int Id { get; set; }
-        public string Name { get; set; } 
+        public string Name { get; set; }
         public string Description { get; set; }
-        public string  Category { get; set; }
+        public string Category { get; set; }
         public bool HasDelivery { get; set; }
         public string ContactEmail { get; set; }
 
         public string ContactNumber { get; set; }
         public int AddresId { get; set; }
         public virtual Addres Addres { get; set; }
 
-        public virtual List<Dish> Dishes {  get; set; }
+        public virtual List<Dish> Dishes { get; set; }
 
     }
 }

WebAPI/Entities/RestaurantDbContext.cs

@@ -2,21 +2,28 @@
 
 namespace WebAPI.Entities
 {
-    public class RestaurantDbContext: DbContext
+    public class RestaurantDbContext : DbContext
     {
         private string _connectionString = "Server=MACIEK\\SQLEXPRESS;Database=RestaurantDb;Trusted_Connection=True;TrustServerCertificate=true;";
         public DbSet<Restaurant> Restaurants { get; set; }
         public DbSet<Addres> Adresses { get; set; }
 
         public DbSet<Dish> Dishes { get; set; }
 
+        public DbSet<User> Users { get; set; }
+
+        public DbSet<Role> Roles { get; set; }
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<Restaurant>()
                 .Property(r => r.Name)
                 .HasMaxLength(25);
+            modelBuilder.Entity<User>()
+                .Property(u => u.Email)
+                .IsRequired();
+
 
- 
 
         }
 

WebAPI/Entities/Role.cs

@@ -0,0 +1,8 @@
+namespace WebAPI.Entities
+{
+    public class Role
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}

WebAPI/Entities/User.cs

@@ -0,0 +1,12 @@
+namespace WebAPI.Entities
+{
+    public class User
+    {
+        public int Id { get; set; } 
+        public string Name { get; set; }
+        public string Email { get; set; }
+        public string Password { get; set; }
+        public virtual Role Role { get; set; }
+
+    }
+}

WebAPI/Exepction/NotFoundExeption.cs

@@ -0,0 +1,10 @@
+namespace WebAPI.Exepction
+{
+    public class NotFoundExeption : Exception 
+    {
+        public NotFoundExeption(string massage ) : base(massage) 
+        {
+            
+        }
+    }
+}

WebAPI/Middleware.cs/ErrorHandlingMiddlewarecs.cs

@@ -0,0 +1,34 @@
+using WebAPI.Exepction;
+
+namespace WebAPI.Middleware.cs
+{
+    public class ErrorHandlingMiddlewarecs : IMiddleware
+    {
+        private readonly ILogger _logger;
+
+        public ErrorHandlingMiddlewarecs(ILogger<ErrorHandlingMiddlewarecs> logger)
+        {
+            _logger = logger;
+
+        }
+        public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+        {
+            try
+            {
+                await next.Invoke(context);
+            }
+            catch (NotFoundExeption nfex)
+            {
+                _logger.LogError(nfex, "Source was not found");
+                context.Response.StatusCode = 404;
+                await context.Response.WriteAsync("Source was not found");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, ex.Message);
+                context.Response.StatusCode = 500;
+                await context.Response.WriteAsync("Something went wrong");
+            }
+        }
+    }
+}

WebAPI/Middleware.cs/RequestTimeMiddleware.cs

@@ -0,0 +1,22 @@
+using System.Diagnostics;
+
+namespace WebAPI.Middleware.cs
+{
+    public class RequestTimeMiddleware : IMiddleware
+    {
+        private readonly ILogger _logger;
+        private readonly Stopwatch _stopwatch;
+
+        public RequestTimeMiddleware(ILogger<RequestTimeMiddleware> logger) {
+        _logger = logger;
+        _stopwatch =  new Stopwatch();
+        }
+        public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+        {
+           _stopwatch.Start();
+            await next.Invoke(context);
+           _stopwatch.Stop();
+           _logger.LogWarning($"To zapytanie trwało: {_stopwatch.ElapsedMilliseconds}ms ", context.Request.Path);
+        }
+    }
+}