RentalDto Added

Business/Abstract/IRentalService.cs

@@ -1,5 +1,6 @@
 using Core.Utilities.Results;
 using Entities.Concrete;
+using Entities.DTOs;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -13,5 +14,7 @@ public interface IRentalService
         IResult Update(Rental rental);
         IDataResult<List<Rental>> GetAll();
         IDataResult<Rental> GetById(int id);
+        IDataResult<List<RentalDetailDto>> GetRentalDetails();
+
     }
 }

Business/Concrete/CarManager.cs

@@ -30,7 +30,6 @@ public CarManager(ICarDal carDal)
         [SecuredOperation("car.add,admin")]
         [ValidationAspect(typeof(CarValidator))]
         [CacheRemoveAspect("ICarService.Get")]
-
         public IResult Add(Car car)
         {
             _carDal.Add(car);
@@ -43,7 +42,7 @@ public IResult Delete(Car car)
             return new SuccessResult(Messages.CarDeleted);
         }
 
-        [CacheAspect] // key, value
+        //[CacheAspect] // key, value
         public IDataResult<List<Car>> GetAll()
         {
             return new SuccessDataResult<List<Car>>

Business/Concrete/RentalManager.cs

@@ -6,6 +6,7 @@
 using Core.Utilities.Results;
 using DataAccess.Abstract;
 using Entities.Concrete;
+using Entities.DTOs;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -49,6 +50,12 @@ public IDataResult<Rental> GetById(int id)
                 (_rentalDal.Get(r => r.Id == id));
         }
 
+        public IDataResult<List<RentalDetailDto>> GetRentalDetails()
+        {
+            return new SuccessDataResult<List<RentalDetailDto>>
+                (_rentalDal.GetRentalDetails());
+        }
+
         public IResult Update(Rental rental)
         {
             try

DataAccess/Abstract/IRentalDal.cs

@@ -1,12 +1,13 @@
 using Core.DataAccess;
 using Entities.Concrete;
+using Entities.DTOs;
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace DataAccess.Abstract
 {
     public interface IRentalDal : IEntityRepository<Rental>
     {
+        List<RentalDetailDto> GetRentalDetails();
     }
 }

DataAccess/Concrete/EntityFramework/EfCarDal.cs

@@ -29,6 +29,8 @@ on c.ColorId equals co.ColorId
                                  BrandName = b.BrandName,
                                  ColorName = co.ColorName,
                                  DailyPrice = c.DailyPrice,
+                                 ModelYear = c.ModelYear,
+                                 Description = c.Description
                              };
                 return result.ToList();
             }

DataAccess/Concrete/EntityFramework/EfRentalDal.cs

@@ -1,13 +1,41 @@
 using Core.DataAccess.EntityFramework;
 using DataAccess.Abstract;
 using Entities.Concrete;
+using Entities.DTOs;
 using System;
 using System.Collections.Generic;
 using System.Text;
-
+using System.Linq;
 namespace DataAccess.Concrete.EntityFramework
 {
     public class EfRentalDal : EfEntityRepositoryBase<Rental, ReCapContext>, IRentalDal
     {
+        // equals -> eşit ise
+        public List<RentalDetailDto> GetRentalDetails()
+        {
+            using (ReCapContext context = new ReCapContext())
+            {
+                var result = from r in context.Rentals
+                             join cr in context.Cars
+                             on r.CarId equals cr.CarId
+                             join cs in context.Customers
+                             on r.CustomerId equals cs.CustomerId
+                             join br in context.Brands
+                             on cr.BrandId equals br.BrandId
+                             join u in context.Users
+                             on cs.UserId equals u.Id
+
+                             select new RentalDetailDto
+                             {
+                                 RentalId = r.Id,
+                                 BrandName = br.BrandName,
+                                 CustomerName = u.FirstName + " " + u.LastName,
+                                 RentDate = r.RentDate,
+                                 ReturnDate = r.ReturnDate,
+
+                             };
+                return result.ToList();
+            }
+        }
     }
 }

Entities/DTOs/CarDetailDto.cs

@@ -12,5 +12,7 @@ public class CarDetailDto:IDto
         public string BrandName { get; set; }
         public string ColorName { get; set; }
         public decimal DailyPrice { get; set; }
+        public int ModelYear { get; set; }
+        public string Description { get; set; }
     }
 }

Entities/DTOs/RentalDetailDto.cs

@@ -0,0 +1,17 @@
+using Core.Entities;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Entities.DTOs
+{
+    public class RentalDetailDto:IDto
+    {
+        public int RentalId { get; set; }
+        public string BrandName { get; set; }
+        public string CustomerName { get; set; }
+        public DateTime RentDate { get; set; }
+        public DateTime ReturnDate { get; set; }
+
+    }
+}

Entities/obj/Debug/netstandard2.0/Entities.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-72f47d91b768cc3dd29cf8406463336c36526fe7
+9f6e973c25150bfb9f9dcd80fe110efe6ca62ca2

WebAPI/Controllers/CarsController.cs

@@ -1,21 +1,15 @@
 using Business.Abstract;
-using Business.Concrete;
-using DataAccess.Concrete.EntityFramework;
 using Entities.Concrete;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading;
 
 namespace WebAPI.Controllers
 {
     [Route("api/[controller]")]
     [ApiController] // attribute
     public class CarsController : ControllerBase
     {
-        //Ioc Container -- Inversion of Control
+        //IoC Container -- Inversion of Control
         ICarService _carService;
 
         public CarsController(ICarService carService)
@@ -26,6 +20,7 @@ public CarsController(ICarService carService)
         [HttpGet("getall")]
         public IActionResult GetAll()
         {
+            Thread.Sleep(1000);
 
             var result = _carService.GetAll();
             if (result.Success)
@@ -76,5 +71,16 @@ public IActionResult Update(Car car)
             }
             return BadRequest(result.Message);
         }
+
+        [HttpGet("getcardetailsbydto")]
+        public IActionResult GetDetailsByDto()
+        {
+            var result = _carService.GetCarDetails();
+            if (result.Success)
+            {
+                return Ok(result);
+            }
+            return BadRequest(result);
+        }
     }
 }

WebAPI/Controllers/RentalsController.cs

@@ -74,5 +74,16 @@ public IActionResult GetById(int id)
             }
             return BadRequest(result.Message);
         }
+
+        [HttpGet("getrentaldetails")]
+        public IActionResult GetRentalDetails()
+        {
+            var result = _rentalService.GetRentalDetails();
+            if (result.Success)
+            {
+                return Ok(result);
+            }
+            return BadRequest(result);
+        }
     }
 }

WebAPI/Startup.cs

@@ -44,6 +44,8 @@ public void ConfigureServices(IServiceCollection services)
             //services.AddSingleton<IBrandService, BrandManager>();
             //services.AddSingleton<IBrandDal, EfBrandDal>();
 
+            services.AddCors();
+
             var tokenOptions = Configuration.GetSection("TokenOptions").Get<TokenOptions>();
 
             services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
@@ -74,6 +76,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
+            app.UseCors(builder => builder.WithOrigins("http://localhost:4200").AllowAnyHeader());
+
             app.UseHttpsRedirection();
 
             app.UseRouting();