zsdsa

src/Basket/Basket.API/Controllers/BasketController.cs

@@ -61,27 +61,27 @@ public async Task<ActionResult> Checkout([FromBody] BasketCheckout basketCheckou
 // remove the basket
 // send checkout event to rabbitMq
 
-var basket = await _repository.GetBasket(basketCheckout.UserName);
-if (basket == null)
-{
-_logger.LogError("Basket not exist with this user : {EventId}", basketCheckout.UserName);
-return BadRequest();
-}
+//var basket = await _repository.GetBasket(basketCheckout.UserName);
+//if (basket == null)
+//{
+// _logger.LogError("Basket not exist with this user : {EventId}", basketCheckout.UserName);
+// return BadRequest();
+//}
 
-var basketRemoved = await _repository.DeleteBasket(basketCheckout.UserName);
-if (!basketRemoved)
-{
-_logger.LogError("Basket can not deleted");
-return BadRequest();
-}
+//var basketRemoved = await _repository.DeleteBasket(basketCheckout.UserName);
+//if (!basketRemoved)
+//{
+// _logger.LogError("Basket can not deleted");
+// return BadRequest();
+//}
 
 // Once basket is checkout, sends an integration event to
 // ordering.api to convert basket to order and proceeds with
 // order creation process
 
 var eventMessage = _mapper.Map<BasketCheckoutEvent>(basketCheckout);
 eventMessage.RequestId = Guid.NewGuid();
-eventMessage.TotalPrice = basket.TotalPrice;
+eventMessage.TotalPrice = basketCheckout.TotalPrice;
 
 try
 {

src/Catalog/Catalog.API/Data/CatalogContextSeed.cs

@@ -26,7 +26,9 @@ private static IEnumerable<Product> GetPreconfiguredProducts()
 Description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus.",
 ImageFile = "product-1.png",
 Price = 950.00M,
-Category = "Smart Phone"
+Category = "Smart Phone",
+InStock=false,
+UrlVideo = "https://www.youtube.com/embed/UqyD2PgOw9Q"
 },
 new Product()
 {
@@ -35,16 +37,20 @@ private static IEnumerable<Product> GetPreconfiguredProducts()
 Description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus.",
 ImageFile = "product-2.png",
 Price = 840.00M,
-Category = "Smart Phone"
+Category = "Smart Phone",
+InStock=true,
+UrlVideo = "https://www.youtube.com/embed/UqyD2PgOw9Q"
 },
 new Product()
 {
 Name = "Huawei Plus",
 Summary = "This phone is the company's biggest change to its flagship smartphone in years. It includes a borderless.",
 Description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus.",
 ImageFile = "product-3.png",
-Price = 650.00M,
-Category = "White Appliances"
+Price = 470.00M,
+Category = "White Appliances",
+InStock=true,
+UrlVideo = "https://www.youtube.com/embed/UqyD2PgOw9Q"
 },
 new Product()
 {
@@ -53,7 +59,9 @@ private static IEnumerable<Product> GetPreconfiguredProducts()
 Description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus.",
 ImageFile = "product-4.png",
 Price = 470.00M,
-Category = "White Appliances"
+Category = "White Appliances",
+InStock=false,
+UrlVideo = "https://www.youtube.com/embed/UqyD2PgOw9Q"
 },
 new Product()
 {
@@ -62,7 +70,9 @@ private static IEnumerable<Product> GetPreconfiguredProducts()
 Description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus.",
 ImageFile = "product-5.png",
 Price = 380.00M,
-Category = "Smart Phone"
+Category = "Smart Phone",
+InStock=true,
+UrlVideo = "https://www.youtube.com/embed/UqyD2PgOw9Q"
 },
 new Product()
 {
@@ -71,7 +81,9 @@ private static IEnumerable<Product> GetPreconfiguredProducts()
 Description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, tenetur natus doloremque laborum quos iste ipsum rerum obcaecati impedit odit illo dolorum ab tempora nihil dicta earum fugiat. Temporibus, voluptatibus.",
 ImageFile = "product-6.png",
 Price = 240.00M,
-Category = "Home Kitchen"
+Category = "Home Kitchen",
+InStock=true,
+UrlVideo = "https://www.youtube.com/embed/UqyD2PgOw9Q"
 }
 };
 }

src/Catalog/Catalog.API/Entities/Product.cs

@@ -16,5 +16,7 @@ public class Product
 public string Description { get; set; }
 public string ImageFile { get; set; }
 public decimal Price { get; set; }
+public bool InStock { get; set; }
+public string UrlVideo { get; set; }
 }
 }

src/WebApp/AspnetRunBasics/ApiCollection/BasketRepository.cs

@@ -0,0 +1,41 @@
+using AspnetRunBasics.ApiCollection.Interfaces;
+using AspnetRunBasics.CustomExtensions;
+using AspnetRunBasics.Models;
+using Microsoft.AspNetCore.Http;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AspnetRunBasics.ApiCollection
+{
+public class BasketRepository : IBasketRepository
+{
+private readonly IHttpContextAccessor _httpContextAccessor;
+public BasketRepository(IHttpContextAccessor httpContextAccessor)
+{
+_httpContextAccessor = httpContextAccessor;
+}
+public void Update(BasketRepositoryModel basketRepositoryModel)
+{
+_httpContextAccessor.HttpContext.Session.SetObject("basket", basketRepositoryModel);
+}
+
+
+public BasketRepositoryModel GetAllBasket()
+{
+var result = _httpContextAccessor.HttpContext.Session.GetObject<BasketRepositoryModel>("basket");
+if (result == null)
+{
+return new BasketRepositoryModel();
+}
+return result;
+}
+
+public void RemoveAllBasket()
+{
+_httpContextAccessor.HttpContext.Session.Remove("basket");
+}
+
+}
+}

src/WebApp/AspnetRunBasics/ApiCollection/CatalogApi.cs

@@ -2,6 +2,7 @@
 using AspnetRunBasics.ApiCollection.Interfaces;
 using AspnetRunBasics.Models;
 using AspnetRunBasics.Settings;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -51,12 +52,23 @@ public async Task<IEnumerable<CatalogModel>> GetCatalogByCategory(string categor
 .GetHttpMessage();
 
 return await SendRequest<IEnumerable<CatalogModel>>(message);
+}
+
+public async Task<CatalogModel> GetProduct(string id)
+{
+var message = new HttpRequestBuilder(_settings.BaseAddress)
+.SetPath(_settings.CatalogPath)
+.AddToPath(id)
+.HttpMethod(HttpMethod.Get)
+.GetHttpMessage();
+
+return await SendRequest<CatalogModel>(message);
 }
 
 public async Task<CatalogModel> CreateCatalog(CatalogModel catalogModel)
 {
 var message = new HttpRequestBuilder(_settings.BaseAddress)
-.SetPath(_settings.CatalogPath)
+.SetPath(_settings.CatalogPath)
 .HttpMethod(HttpMethod.Post)
 .GetHttpMessage();
 
@@ -65,5 +77,30 @@ public async Task<CatalogModel> CreateCatalog(CatalogModel catalogModel)
 
 return await SendRequest<CatalogModel>(message);
 }
+
+public async Task<IActionResult> UpdateCatalog(CatalogModel catalogModel)
+{
+var message = new HttpRequestBuilder(_settings.BaseAddress)
+.SetPath(_settings.CatalogPath)
+.HttpMethod(HttpMethod.Put)
+.GetHttpMessage();
+
+var json = JsonConvert.SerializeObject(catalogModel);
+message.Content = new StringContent(json, Encoding.UTF8, "application/json");
+
+return await SendRequest<IActionResult>(message);
+}
+
+public async Task<IActionResult> DeleteCatalog(string id)
+{
+var message = new HttpRequestBuilder(_settings.BaseAddress)
+.SetPath(_settings.CatalogPath)
+.HttpMethod(HttpMethod.Delete)
+.AddToPath(id)
+.GetHttpMessage();
+
+return await SendRequest<IActionResult>(message);
+}
+
 }
 }

src/WebApp/AspnetRunBasics/ApiCollection/Interfaces/IBasketRepository.cs

@@ -0,0 +1,16 @@
+using AspnetRunBasics.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AspnetRunBasics.ApiCollection.Interfaces
+{
+public interface IBasketRepository
+{
+void Update(BasketRepositoryModel basketRepositoryModel);
+BasketRepositoryModel GetAllBasket();
+void RemoveAllBasket();
+
+}
+}

src/WebApp/AspnetRunBasics/ApiCollection/Interfaces/ICatalogApi.cs

@@ -1,4 +1,5 @@
 using AspnetRunBasics.Models;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -10,5 +11,9 @@ public interface ICatalogApi
 Task<IEnumerable<CatalogModel>> GetCatalogByCategory(string category);
 Task<CatalogModel> GetCatalog(string id);
 Task<CatalogModel> CreateCatalog(CatalogModel model);
+Task<CatalogModel> GetProduct(string id);
+Task<IActionResult> UpdateCatalog(CatalogModel catalogModel);
+Task<IActionResult> DeleteCatalog(string id);
+
 }
 }

src/WebApp/AspnetRunBasics/Areas/Admin/Controllers/HomeController.cs

@@ -0,0 +1,123 @@
+using AspnetRunBasics.ApiCollection.Interfaces;
+using AspnetRunBasics.Models;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AspnetRunBasics.Areas.Admin.Controllers
+{
+public class HomeController : Controller
+{
+private readonly ICatalogApi _catalogApi;
+
+public HomeController(ICatalogApi catalogApi, IBasketApi basketApi)
+{
+_catalogApi = catalogApi ?? throw new ArgumentNullException(nameof(catalogApi));
+}
+
+public async Task<IActionResult> IndexAsync()
+{
+var result = await _catalogApi.GetCatalog();
+
+return View(result);
+}
+public IActionResult Add()
+{
+return View(new AddCatalogModel());
+}
+
+[HttpPost]
+public IActionResult Add(AddCatalogModel catalog)
+{
+if (ModelState.IsValid)
+{
+CatalogModel catalogModel = new CatalogModel();
+
+if (catalog.ImageURL != null)
+{
+var type = Path.GetExtension(catalog.ImageURL.FileName);
+var newImageName = Guid.NewGuid() + type;
+
+var NewImagePath = Path.Combine(Directory.GetCurrentDirectory(),
+"wwwroot/images/product/" + newImageName);
+var stream = new FileStream(NewImagePath, FileMode.Create);
+
+//resmi NewImagePath adresine kopyaladık
+catalog.ImageURL.CopyTo(stream);
+catalogModel.ImageFile = newImageName;
+}
+
+catalogModel.Name = catalog.Name;
+catalogModel.Description = catalog.Description;
+catalogModel.Price = catalog.Price;
+catalogModel.Category = catalog.Category;
+catalogModel.Summary = catalog.Summary;
+
+_catalogApi.CreateCatalog(catalogModel);
+return RedirectToAction("Index", "Home", new { area = "Admin" });
+}
+return View(catalog);
+}
+
+
+public async Task<IActionResult> UpdateAsync(string id)
+{
+var catalogModel = await _catalogApi.GetProduct(id);
+
+
+AddCatalogModel addCatalogModel = new AddCatalogModel
+{
+Id = catalogModel.Id,
+Name = catalogModel.Name,
+Description = catalogModel.Description,
+Price = catalogModel.Price,
+Category = catalogModel.Category,
+Summary = catalogModel.Summary
+};
+return View(addCatalogModel);
+}
+
+[HttpPost]
+public async Task<IActionResult> UpdateAsync(AddCatalogModel addCatalogModel)
+{
+if (ModelState.IsValid)
+{
+var catalogModel = await _catalogApi.GetProduct(addCatalogModel.Id);
+if (addCatalogModel.ImageURL != null)
+{
+var type = Path.GetExtension(addCatalogModel.ImageURL.FileName);
+var newImageName = Guid.NewGuid() + type;
+
+var NewImagePath = Path.Combine(Directory.GetCurrentDirectory(),
+"wwwroot/images/product/" + newImageName);
+var stream = new FileStream(NewImagePath, FileMode.Create);
+
+addCatalogModel.ImageURL.CopyTo(stream);
+catalogModel.ImageFile = newImageName;
+
+}
+catalogModel.Id = addCatalogModel.Id;
+catalogModel.Name = addCatalogModel.Name;
+catalogModel.Description = addCatalogModel.Description;
+catalogModel.Price = addCatalogModel.Price;
+catalogModel.Category = addCatalogModel.Category;
+catalogModel.Summary = addCatalogModel.Summary;
+
+_catalogApi.UpdateCatalog(catalogModel);
+return RedirectToAction("Index", "Home", new { area = "Admin" });
+}
+return View(addCatalogModel);
+}
+
+public IActionResult Delete(string id)
+{
+_catalogApi.DeleteCatalog(id);
+
+return RedirectToAction("Index", "Home", new { area = "Admin" });
+}
+
+}
+}