s464958/FirmTracker-Server
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: s464958:abac84ccf26ee4bc7b3450e9f36a43dbea84294b
Branches Tags
s464958:master
s464958:PI2024-23
s464958:PI2024-14
s464958:PI2024-18
s464958:PI2024-16
s464958:PI2024-9
s464958:PI2024-8
s464958:zip_branch
..
compare: s464958:a25a1a3d232f3eedb5b76009cf2314694cadc54f
Branches Tags
s464958:PI2024-23
s464958:master
s464958:PI2024-14
s464958:PI2024-18
s464958:PI2024-16
s464958:PI2024-9
s464958:PI2024-8
s464958:zip_branch

No commits in common. "abac84ccf26ee4bc7b3450e9f36a43dbea84294b" and "a25a1a3d232f3eedb5b76009cf2314694cadc54f" have entirely different histories.
abac84ccf2 ... a25a1a3d23

3 changed files with 2 additions and 47 deletions
Show Stats Expand all files Collapse all files

11
Controllers/ProductController.cs
View File

@ -45,17 +45,6 @@ namespace FirmTracker_Server.Controllers
return Ok(product);
}
[HttpGet("name/{name}")]
[ProducesResponseType(200)]
[ProducesResponseType(404)]
public IActionResult GetProductByName(string name)
{
var product = _productCrud.GetProductByName(name);
if (product ==null)
return NotFound();
return Ok(product);
}
// PUT: api/Products/5
[HttpPut("{id}")]
[ProducesResponseType(200)] // Created

15
Controllers/TransactionController.cs
View File

@ -5,7 +5,6 @@ using System.Text.Json.Serialization;
using System.Text.Json;
using System.Transactions;
using FirmTracker_Server.nHibernate.Products;
using FirmTracker_Server.nHibernate;
namespace FirmTracker_Server.Controllers
{
@ -42,17 +41,7 @@ namespace FirmTracker_Server.Controllers
int type = _productCRUD.GetProductType(product.ProductID);
if (type == 1)
{
int availability = _productCRUD.GetProductAvailability(product.ProductID);
if (product.Quantity > availability)
{
return BadRequest($"Can't add product {product.ProductID} to transaction. Available: {availability}, Desired: {product.Quantity}");
}
else
{
transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100))));
}
transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100))));
}
else
{
@ -110,7 +99,7 @@ namespace FirmTracker_Server.Controllers
product.TransactionId = transaction.Id; // This might be 0 at this point if transaction isn't saved yet
decimal price = _productCRUD.GetProductPrice(product.ProductID);
transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100))));
}
}
_transactionCRUD.UpdateTransaction(transaction);
// Now that the transaction is saved, update each product with the correct TransactionId

23
nHIbernate/Products/ProductCRUD.cs
View File

@ -53,19 +53,6 @@ namespace FirmTracker_Server.nHibernate.Products
return product;
}
}
public int GetProductAvailability(int productId)
{
using(var session = SessionFactory.OpenSession())
{
var product = session.Query<Product>()
.Where(p => p.Id == productId)
.Select(p => p.Availability)
.FirstOrDefault();
return product;
}
}
public Product GetProduct(int productId)
{
using (var session = SessionFactory.OpenSession())
@ -74,16 +61,6 @@ namespace FirmTracker_Server.nHibernate.Products
}
}
public Product GetProductByName(string productName)
{
using (var session = SessionFactory.OpenSession())
{
var query = session.CreateQuery("from Product where Name = :name");
query.SetParameter("name", productName);
return query.UniqueResult<Product>();
}
}
public void UpdateProduct(Product product)
{
using (var session = SessionFactory.OpenSession())