Added commands for order

Alligator.BusinessLayer/Configuration/CustomMapper.cs

@@ -1,4 +1,5 @@
 using Alligator.BusinessLayer.Models;
+using Alligator.DataLayer;
 using Alligator.DataLayer.Entities;
 using AutoMapper;
 
@@ -22,9 +23,7 @@ private static void InitializeInstance()
                 cfg.CreateMap<ProductTag, ProductTagModel>();
                 cfg.CreateMap<ProductTagModel, ProductTag>();
                 cfg.CreateMap<Category, CategoryModel>();
-                cfg.CreateMap<CategoryModel, Category>();
-                cfg.CreateMap<Order, OrderShortModel>();
-                cfg.CreateMap<OrderShortModel, Order>();
+                cfg.CreateMap<CategoryModel, Category>();                
                 cfg.CreateMap<Order, OrderModel>();
                 cfg.CreateMap<OrderModel, Order>();
                 cfg.CreateMap<OrderDetail, OrderDetailModel>();

Alligator.BusinessLayer/Models/OrderModel.cs

@@ -6,8 +6,12 @@
 
 namespace Alligator.BusinessLayer.Models
 {
-    public class OrderModel: OrderShortModel
-    {      
+    public class OrderModel
+    {
+        public int Id { get; set; }
+        public DateTime Date { get; set; }
+        public string Address { get; set; }
+        public ClientModel Client { get; set; }
         public List<OrderDetailModel> OrderDetails { get; set; }
         public List<OrderReviewModel> OrderReviews { get; set; }
     }

Alligator.BusinessLayer/OrderService.cs

@@ -26,46 +26,86 @@ public OrderService()
             _repositoryOrderReview = new OrderReviewRepository();
         }
 
-        public List<OrderShortModel> GetOrdersWithoutSensitiveData()
+        public ActionResult<List<OrderModel>> GetOrders()
         {
             var orders = _repositoryOrder.GetAllOrders();
-            return CustomMapper.GetInstance().Map<List<OrderShortModel>>(orders);
+            try
+            {
+                return new ActionResult<List<OrderModel>>(true, CustomMapper.GetInstance().Map<List<OrderModel>>(orders));
+            }
+            catch (Exception exception)
+            {
+                return new ActionResult<List<OrderModel>>(false, null) { ErrorMessage = exception.Message };
+            }
         }
 
-        public List<OrderModel> GetOrders()
-        {
-            var orders = _repositoryOrder.GetAllOrders();
-            return CustomMapper.GetInstance().Map<List<OrderModel>>(orders);
-        }
-
-        public List<OrderModel> GetOrdersByClientId(int id)
+        public ActionResult<List<OrderModel>> GetOrdersByClientId(int id)
         {
             var orders = _repositoryOrder.GetOrdersByClientId(id);
-            return CustomMapper.GetInstance().Map<List<OrderModel>>(orders);
+            try
+            {
+                return new ActionResult<List<OrderModel>>(true, CustomMapper.GetInstance().Map<List<OrderModel>>(orders));
+            }
+            catch (Exception exception)
+            {
+                return new ActionResult<List<OrderModel>>(false, null) { ErrorMessage = exception.Message };
+            }
         }
 
-        public OrderModel GetOrderByIdWithDetailsAndReviews(int id)
+        public ActionResult<OrderModel> GetOrderByIdWithDetailsAndReviews(int id)
         {
             var order = _repositoryOrder.GetOrderById(id);
             order.OrderDetails = _repositoryOrderDetail.GetOrderDetailsByOrderId(id);
             order.OrderReviews = _repositoryOrderReview.GetOrderReviewsByOrderId(id);
-            return CustomMapper.GetInstance().Map<OrderModel>(order);
+            try
+            {
+                return new ActionResult<OrderModel>(true, CustomMapper.GetInstance().Map<OrderModel>(order));
+            }
+            catch
+            (Exception exception)
+            {
+                return new ActionResult<OrderModel>(false, null) { ErrorMessage = exception.Message };
+
+            }
         }
 
         public int AddOrderModel(DateTime date, int clientId, string address)
         {           
-           int id =_repositoryOrder.AddOrder(date, clientId, address);
-           return id;
+            try
+            {
+              int id =_repositoryOrder.AddOrder(date, clientId, address);
+              return id;
+            }
+            catch
+            {
+                return -1;
+            }
         }
 
-        public void DeleteOrderModel(int id)
+        public bool DeleteOrderModel(int id)
         {
-            _repositoryOrder.DeleteOrder(id);
+            try
+            {
+                _repositoryOrder.DeleteOrder(id);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
         }
 
-        public void EditOrderModel(DateTime date, int id, string address)
+        public bool EditOrderModel(DateTime date, int orderId, int clientId, string address)
         {
-            _repositoryOrder.EditOrder(date, id, address);
+            try
+            {
+              _repositoryOrder.EditOrder(date, orderId, clientId, address);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
         }
     }
 }

Alligator.DB/Procedures/Order_SelectAll.sql

@@ -2,9 +2,11 @@
 AS
 BEGIN
 	select
-	id,
-	date,
-	clientId,
-	Address
-	from dbo.[Order]
+	o.id,
+	o.date,
+	o.Address,
+	c.Id,
+	c.FirstName,
+	c.LastName
+	from dbo.[Order] o inner join dbo.[Client] c on o.ClientId=c.Id	
 END

Alligator.DB/Procedures/Order_Update.sql

@@ -1,10 +1,12 @@
 create proc dbo.Order_Update
 @Id int, 
+@ClientId int,
 @Address varchar(200),
 @Date date
 AS
 BEGIN
-	update dbo.[Order] set Address=@Address, 
+	update dbo.[Order] set ClientId=@ClientId,
+	Address=@Address, 
 	Date=@Date
 	where Id=@Id
 END

Alligator.DataLayer/Repositories/BaseRepository.cs

@@ -1,17 +1,18 @@
-using System.Data.SqlClient;
+
+using System.Data.SqlClient;
 
 namespace Alligator.DataLayer.Repositories
 {
     public abstract class BaseRepository
     {
         private const string _connection = "Data Source=80.78.240.16;Database=AggregatorAlligator;User Id=student;Password=qwe!23;";
 
-        protected static SqlConnection ProvideConnection() => new SqlConnection(_connection);
+        public static SqlConnection ProvideConnection() => new SqlConnection(_connection);
 
         protected enum AffectedRows
         {
             Zero,
             One
         }
     }
-}
+}

Alligator.DataLayer/Repositories/IOrderRepository.cs

@@ -8,7 +8,7 @@ public interface IOrderRepository
     {
         int AddOrder(DateTime date, int clientId, string address);
         void DeleteOrder(int id);
-        void EditOrder(DateTime date, int id, string address);
+        void EditOrder(DateTime date, int orderId, int clientId, string address);
         List<Order> GetAllOrders();
         Order GetOrderById(int id);
         List<Order> GetOrdersByClientId(int id);

Alligator.DataLayer/Repositories/OrderDetailRepository.cs

@@ -24,7 +24,7 @@ public OrderDetail GetOrderDetailById(int id)
                 orderdetail.Product = product;
                 return orderdetail;
             },
-            new { Id = id },
+            new { id },
             commandType: CommandType.StoredProcedure,
             splitOn: "Id")
             .FirstOrDefault();
@@ -41,7 +41,7 @@ public List<OrderDetail> GetOrderDetailsByOrderId(int id)
                 orderdetail.Product = product;
                 return orderdetail;
             },
-            new { OrderId = id },
+            new { orderId=id },
             commandType: CommandType.StoredProcedure,
             splitOn: "Id")
             .Distinct().ToList();
@@ -58,7 +58,7 @@ public List<OrderDetail> GetOrderDetailsByProductId(int id)
                 orderdetail.Product = product;
                 return orderdetail;
             },
-            new { ProductId = id },
+            new { id },
             commandType: CommandType.StoredProcedure,
             splitOn: "Id")
             .Distinct().ToList();
@@ -69,38 +69,38 @@ public void AddOrderDetail(int amount, int orderId, int productId)
             using var connection = ProvideConnection();
             string procString = "dbo.OrderDetail_Insert";
             connection.Execute(procString,
-            new { Amount = amount, OrdertId = orderId, ProductId = productId },
+            new { amount, orderId, productId },
             commandType: CommandType.StoredProcedure);
         }
 
         public void EditOrderDetail(int id, int amount)
         {
             using var connection = ProvideConnection();
             string procString = "dbo.OrderDetail_Update";
-            connection.Execute(procString, new { Id = id, Amount = amount },
+            connection.Execute(procString, new { id, amount },
             commandType: CommandType.StoredProcedure);
         }
 
         public void DeleteOrderDetail(int id)
         {
             using var connection = ProvideConnection();
             string procString = "dbo.OrderDetail_Delete";
-            connection.Execute(procString, new { Id = id },
+            connection.Execute(procString, new { id },
             commandType: CommandType.StoredProcedure);
         }
 
         public void DeleteOrderDetailByOrderId(int id)
         {
             using var connection = ProvideConnection();
             string procString = "dbo.OrderDetail_DeleteByOrderId";
-            connection.Execute(procString, new { OrderId=id },
+            connection.Execute(procString, new { orderId=id },
             commandType: CommandType.StoredProcedure);
         }
         public void DeleteOrderDetailByProductId(int id)
         {
             using var connection = ProvideConnection();
             string procString = "dbo.OrderDetail_DeleteByProductId";
-            connection.Execute(procString, new { ProductId = id },
+            connection.Execute(procString, new { id },
             commandType: CommandType.StoredProcedure);
         }
     }

Alligator.DataLayer/Repositories/OrderRepository.cs

@@ -17,7 +17,12 @@ public List<Order> GetAllOrders()
         {
             using var connection = ProvideConnection();
             var orderDictionary = new Dictionary<int, Order>();
-            return connection.Query<Order>("dbo.Order_SelectAll",
+            return connection.Query<Order, Client, Order>("dbo.Order_SelectAll", (order, client) =>
+            {
+                order.Client = client;
+
+                return order;
+            },
             commandType: CommandType.StoredProcedure)
             .ToList();
         }
@@ -31,7 +36,7 @@ public Order GetOrderById(int id)
 
                 return order;
             },
-            new { Id = id },
+            new { id },
             commandType: CommandType.StoredProcedure,
             splitOn: "Id").
             FirstOrDefault();
@@ -47,7 +52,7 @@ public List<Order> GetOrdersByClientId(int id)
                 order.Client = client;
                 return order;
             },
-            new { ClientId = id },
+            new { id },
             commandType: CommandType.StoredProcedure,
             splitOn: "Id").
             Distinct().ToList();
@@ -58,7 +63,7 @@ public int AddOrder(DateTime date, int clientId, string address)
             using var connection = ProvideConnection();
             string procString = "dbo.Order_Insert";
             return connection.QueryFirstOrDefault<int>(procString,
-            new { Date = date, ClientId = clientId, Address = address },
+            new { date,clientId, address },
             commandType: CommandType.StoredProcedure);
         }
 
@@ -71,12 +76,12 @@ public void DeleteOrder(int id)
             commandType: CommandType.StoredProcedure);
         }
 
-        public void EditOrder(DateTime date, int id, string address)
+        public void EditOrder(DateTime date, int orderId, int clientId, string address)
         {
             using var connection = ProvideConnection();
             string procString = "dbo.Order_Update";
             connection.Execute(procString,
-            new { Date = date, Id = id, Address = address },
+            new { date, Id=orderId, clientId, address },
             commandType: CommandType.StoredProcedure);
         }
 

Alligator.DataLayer/Repositories/OrderReviewRepository.cs

@@ -18,11 +18,10 @@ public OrderReview GetOrderReviewById(int id)
             return connection.Query<OrderReview, Order, Client, OrderReview>
             ("dbo.OrderReview_SelectById", (orderreview, order, client) =>
             {
-                orderreview.Order = order;
-                //orderreview.Client = client;
+                orderreview.Order = order;               
                 return orderreview;
             },
-            new { Id = id },
+            new {  id },
             commandType: CommandType.StoredProcedure,
             splitOn: "Id").
             FirstOrDefault();
@@ -36,10 +35,9 @@ public List<OrderReview> GetOrderReviewsByOrderId(int id)
             ("dbo.OrderReview_SelectByOrderId", (orderreview, order, client) =>
             {
                 orderreview.Order = order;
-                //orderreview.Client = client;
                 return orderreview;
             },
-            new { OrderId = id },
+            new { OrderId=id },
             commandType: CommandType.StoredProcedure,
             splitOn: "Id").
             Distinct().ToList();
@@ -59,23 +57,23 @@ public void DeleteOrderReview(int id)
             using var connection = ProvideConnection();
             string procString = "dbo.OrderReview_Delete";
             connection.Execute(procString,
-            new { Id = id },
+            new { id },
             commandType: CommandType.StoredProcedure);
         }
 
         public void DeleteOrderReviewByOrderId(int orderId)
         {
             using var connection = ProvideConnection();
             string procString = "dbo.OrderReview_DeleteByOrderId";
-            connection.Execute(procString, new { OrderId = orderId },
+            connection.Execute(procString, new { orderId },
             commandType: CommandType.StoredProcedure);
         }
 
         public void EditOrderReview(int id, string text)
         {
             using var connection = ProvideConnection();
             string procString = "dbo.OrderReview_Update";
-            connection.Execute(procString, new { Id = id, Text = text },
+            connection.Execute(procString, new { id, text },
             commandType: CommandType.StoredProcedure);
         }