Merge pull request 'PO2024-29' (#5) from PO2024-29 into master

Reviewed-on: #5

Authentication/AuthenticationSettings.cs

@@ -0,0 +1,9 @@
+namespace FirmTracker_Server.Authentication
+{
+    public class AuthenticationSettings
+    {
+        public string JwtSecKey { get; set; }
+        public int JwtExpireDays { get; set; }
+        public string JwtIssuer { get; set; }
+    }
+}

Controllers/ExpenseController.cs

@@ -1,9 +1,29 @@
-using FirmTracker_Server.nHibernate.Expenses;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate.Expenses;
+using FirmTracker_Server.nHibernate.Products;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 namespace FirmTracker_Server.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
+    [Authorize]
     public class ExpensesController : ControllerBase
     {
         private readonly ExpenseCRUD _expenseCrud;
@@ -16,13 +36,24 @@ namespace FirmTracker_Server.Controllers
         [HttpPost]
         [ProducesResponseType(201)] // Created
         [ProducesResponseType(400)] // Bad Request
+        [Authorize(Roles = Roles.Admin)]
         public IActionResult CreateExpense([FromBody] Expense expense) {
             try
             {
+                if (expense.Value <= 0)
+                {
+                    throw new InvalidOperationException("Wydatek nie może posiadać kwoty mniejszej lub równej 0.");
+                }
+
                 _expenseCrud.AddExpense(expense);
                 return CreatedAtAction("GetExpense", new { id = expense.Id }, expense);
             }
-        catch (System.Exception ex) {
+            catch (InvalidOperationException ioe)
+            {
+                return BadRequest(ioe.Message);
+            }
+            catch (Exception ex)
+            {
                 return BadRequest(ex.Message);
             }
         }
@@ -30,7 +61,8 @@ namespace FirmTracker_Server.Controllers
         // GET: api/Expenses
         [HttpGet("{id}")]
         [ProducesResponseType(200)] // Created
-        [ProducesResponseType(400)] // Bad Request
+        [ProducesResponseType(404)] // Bad Request
+        [Authorize(Roles = Roles.Admin)]
         public IActionResult GetExpense(int id)
         {
             var expense = _expenseCrud.GetExpense(id);
@@ -43,28 +75,40 @@ namespace FirmTracker_Server.Controllers
 
         //PUT: api/Expenses
         [HttpPut("{id}")]
-        [ProducesResponseType(200)]
+        [ProducesResponseType(204)]
-        [ProducesResponseType(200)]
+        [ProducesResponseType(400)]
+        [Authorize(Roles = Roles.Admin)]
         public IActionResult UpdateExpense(int id, [FromBody] Expense expense)
+        {
+            try
             {
                 if (id != expense.Id)
                 {
-                return BadRequest("Expense ID mismatch");
+                    return BadRequest("Nieprawidłowe ID wydatku");
                 }
-            try
+                if (expense.Value <= 0)
                 {
+                    throw new InvalidOperationException("Wydatek nie może posiadać kwoty mniejszej lub równej 0.");
+                }
+
+
                 _expenseCrud.UpdateExpense(expense);
                 return NoContent();
             }
-            catch (System.Exception ex)
+            catch (InvalidOperationException ioe)
+            {
+                return BadRequest(ioe.Message);
+            }
+            catch (Exception ex)
             {
                 return BadRequest(ex.Message);
             }
         }
 
         [HttpDelete("{id}")]
-        [ProducesResponseType(200)]
+        [ProducesResponseType(204)]
-        [ProducesResponseType(400)]
+        [ProducesResponseType(404)]
+        [Authorize(Roles = Roles.Admin)]
         public IActionResult DeleteExpense(int id)
         {
             try
@@ -72,6 +116,10 @@ namespace FirmTracker_Server.Controllers
                 _expenseCrud.DeleteExpense(id);
                 return NoContent();
             }
+            catch (InvalidOperationException ioe)
+            {
+                return BadRequest($"{ioe.Message}");
+            }
             catch (System.Exception ex)
             {
                 return NotFound(ex.Message);
@@ -81,6 +129,7 @@ namespace FirmTracker_Server.Controllers
         [HttpGet]
         [ProducesResponseType(200)]
         [ProducesResponseType(400)]
+        [Authorize(Roles = Roles.Admin)]
         public IActionResult GetAllExpenses()
         {
             try

Controllers/ProductController.cs

@@ -1,9 +1,31 @@
-using FirmTracker_Server.nHibernate.Products;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate.Products;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization.Infrastructure;
 using Microsoft.AspNetCore.Mvc;
+using System;
+
 namespace FirmTracker_Server.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
+    [Authorize]
     public class ProductsController : ControllerBase
     {
         private readonly ProductCRUD _productCrud;
@@ -20,14 +42,36 @@ namespace FirmTracker_Server.Controllers
         [HttpPost]
         [ProducesResponseType(200)] // Created
         [ProducesResponseType(400)] // Bad Request
+        [Authorize(Roles = Roles.Admin)]
         public IActionResult CreateProduct([FromBody] Product product)
         {
             try
             {
+                if (product.Type != 0 && product.Type != 1)
+                {
+                    throw new InvalidOperationException("Kategoria produktu musi być ustawiona na 0 lub 1.");
+                }
+                if (product.Type == 0 && product.Availability != 0)
+                {
+                    throw new InvalidOperationException("Dostępność usługi musi być ustawiona na 0.");
+                }
+                if (product.Type == 1 && product.Availability < 0)
+                {
+                    throw new InvalidOperationException("Dostępność towaru nie może być ujemna.");
+                }
+                if (product.Price < 0)
+                {
+                    throw new InvalidOperationException("Produkt nie może posiadać ujemnej ceny.");
+                }
+
                 _productCrud.AddProduct(product);
                 return CreatedAtAction("GetProduct", new { id = product.Id }, product);
             }
-            catch (System.Exception ex)
+            catch (InvalidOperationException ioe)
+            {
+                return BadRequest(ioe.Message);
+            }
+            catch (Exception ex)
             {
                 return BadRequest(ex.Message);
             }
@@ -37,6 +81,7 @@ namespace FirmTracker_Server.Controllers
         [HttpGet("{id}")]
         [ProducesResponseType(200)] // Created
         [ProducesResponseType(400)] // Bad Request
+        [Authorize(Roles=Roles.Admin+","+Roles.User)]
         public IActionResult GetProduct(int id)
         {
             var product = _productCrud.GetProduct(id);
@@ -45,21 +90,55 @@ namespace FirmTracker_Server.Controllers
             return Ok(product);
         }
 
+        [HttpGet("name/{name}")]
+        [ProducesResponseType(200)]
+        [ProducesResponseType(404)]
+        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
+        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
         [ProducesResponseType(400)] // Bad Request
+        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
         public IActionResult UpdateProduct(int id, [FromBody] Product product)
         {
-            if (id != product.Id)
-                return BadRequest("Product ID mismatch");
-
             try
             {
+                if (id != product.Id)
+                    throw new InvalidOperationException("ID produktu nie zgadza się.");
+                if (product.Type != 0 && product.Type != 1)
+                {
+                    throw new InvalidOperationException("Kategoria produktu musi być ustawiona na 0 lub 1.");
+                }
+                if (product.Type == 0 && product.Availability != 0)
+                {
+                    throw new InvalidOperationException("Dostępność usługi musi być ustawiona na 0.");
+                }
+                if (product.Type == 1 && product.Availability < 0)
+                {
+                    throw new InvalidOperationException("Dostępność towaru nie może być ujemna.");
+                }
+                if (product.Price < 0)
+                {
+                    throw new InvalidOperationException("Produkt nie może posiadać ujemnej ceny.");
+                }
+
+
                 _productCrud.UpdateProduct(product);
                 return NoContent();
             }
-            catch (System.Exception ex)
+            catch (InvalidOperationException ioe)
+            {
+                return BadRequest(ioe.Message);
+            }
+            catch (Exception ex)
             {
                 return BadRequest(ex.Message);
             }
@@ -69,6 +148,7 @@ namespace FirmTracker_Server.Controllers
         [HttpDelete("{id}")]
         [ProducesResponseType(200)] // Created
         [ProducesResponseType(400)] // Bad Request
+        [Authorize(Roles = Roles.Admin)]
         public IActionResult DeleteProduct(int id)
         {
             try
@@ -76,6 +156,10 @@ namespace FirmTracker_Server.Controllers
                 _productCrud.DeleteProduct(id);
                 return NoContent();
             }
+            catch (InvalidOperationException ioe)
+            {
+                return BadRequest($"{ioe.Message}");
+            }
             catch (System.Exception ex)
             {
                 return NotFound(ex.Message);
@@ -86,6 +170,7 @@ namespace FirmTracker_Server.Controllers
         [HttpGet]
         [ProducesResponseType(200)] // Created
         [ProducesResponseType(400)] // Bad Request
+        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
         public IActionResult GetAllProducts()
         {
             var products = _productCrud.GetAllProducts();
@@ -105,7 +190,7 @@ namespace FirmTracker_Server.Controllers
                 var product = _productCrud.GetProduct(order.ProductId);
                 if (product == null)
                 {
-                    return BadRequest($"Product with ID {order.ProductId} not found.");
+                    return BadRequest($"Nie znaleziono produktu o ID {order.ProductId}.");
                 }
                 totalPrice += product.Price * order.Quantity;
             }

Controllers/ReportController.cs

@@ -0,0 +1,269 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate.Reports;
+using Microsoft.AspNetCore.Mvc;
+using System.Text.Json.Serialization;
+using System.Text.Json;
+using NuGet.Protocol;
+using FirmTracker_Server.nHibernate.Expenses;
+using FirmTracker_Server.nHibernate.Products;
+using FirmTracker_Server.nHibernate;
+using NHibernate.Linq;
+using Microsoft.AspNetCore.Authorization;
+
+
+namespace FirmTracker_Server.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    [Authorize]
+    public class ReportController : ControllerBase
+    {
+        private readonly ReportCRUD _reportCRUD;
+        private readonly ProductCRUD _productCRUD;
+
+        public ReportController()
+        {
+            _reportCRUD = new ReportCRUD();
+            _productCRUD = new ProductCRUD();
+        }
+        [HttpPost]
+        [ProducesResponseType(201)] //Created
+        [ProducesResponseType(400)] //Bad request
+        [Authorize(Roles = Roles.Admin)]
+        public IActionResult CreateReport([FromBody] Report.DateRangeDto dateRange)
+        {
+            try
+            {
+                var fromDate = dateRange.FromDate;
+                var toDate = dateRange.ToDate;
+                if (fromDate >= toDate)
+                {
+                    return BadRequest("Nieprawidłowy zakres dat.");
+                }
+                using (var session = SessionFactory.OpenSession())
+                {
+                    var transactions = session.Query<nHibernate.Transactions.Transaction>()
+                        .Where(t => t.Date >= fromDate && t.Date <= toDate)
+                        .FetchMany(t => t.TransactionProducts)
+                        .ToList();
+
+                    var expenses = session.Query<Expense>()
+                        .Where(e => e.Date >= fromDate && e.Date <= toDate)
+                        .ToList();
+
+
+                    decimal totalIncome = 0;
+                    foreach (var transaction in transactions)
+                    {
+                        foreach (var product in transaction.TransactionProducts)
+                        {
+                            decimal price = _productCRUD.GetProductPrice(product.ProductID);
+                            int type = _productCRUD.GetProductType(product.ProductID);
+                            if (type == 1)
+                            {
+                                totalIncome += ((product.Quantity * price) * ((1 - (transaction.Discount / 100))));
+                            }
+                            else
+                            {
+                                totalIncome += (price * ((1 - (transaction.Discount / 100))));
+                            }
+                        }
+                    }
+
+                    var totalExpenses = expenses.Sum(e => e.Value);
+                    var totalBalance = totalIncome - totalExpenses;
+
+                    var report = new Report
+                    {
+                        FromDate = fromDate,
+                        ToDate = toDate,
+                        TotalIncome = totalIncome,
+                        TotalExpenses = totalExpenses,
+                        TotalBalance = totalBalance
+                    };
+
+                    _reportCRUD.AddReport(report, transactions, expenses);
+
+                    return CreatedAtAction(nameof(GetReport), new { id = report.Id }, report);
+
+                    /*if (dateRange == null || dateRange.FromDate >= dateRange.ToDate)
+                    {
+                        return BadRequest("Invalid date range.");
+                    }
+
+                    var report = _reportCRUD.AddReport(dateRange.FromDate, dateRange.ToDate);
+                        return CreatedAtAction(nameof(GetReport), new { id = report.Id }, report); // to change?*/
+                }
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(ex.Message);
+            }
+
+        }
+
+        [HttpGet("{id}")]
+        [ProducesResponseType(200)]
+        [ProducesResponseType(404)]
+        [Authorize(Roles = Roles.Admin)]
+        public IActionResult GetReport(int id)
+        {
+            var report = _reportCRUD.GetReport(id);
+            if (report == null)
+                return NotFound();
+
+            var options = new JsonSerializerOptions
+            {
+                ReferenceHandler = ReferenceHandler.Preserve
+            };
+
+            var json = JsonSerializer.Serialize(report, options);
+            return Ok(json);
+        }
+
+        [HttpGet("{id}/transactions")]
+        [ProducesResponseType(200)]
+        [ProducesResponseType(404)]
+        [Authorize(Roles = Roles.Admin)]
+        public IActionResult GetReportTransactions(int id)
+        {
+            var transactions = _reportCRUD.GetReportTransactions(id);
+            if (transactions == null)
+            {
+                return NotFound();
+            }
+            return Ok(transactions);
+        }
+
+        [HttpGet("{id}/expenses")]
+        [ProducesResponseType(200)]
+        [ProducesResponseType(404)]
+        [Authorize(Roles = Roles.Admin)]
+        public IActionResult GetReportExpenses(int id)
+        {
+            var expenses = _reportCRUD.GetReportExpenses(id);
+            if (expenses == null)
+            {
+                return NotFound();
+            }
+            return Ok(expenses);
+        }
+
+
+        [HttpGet]
+        [ProducesResponseType(200)]
+        [ProducesResponseType(404)]
+        [Authorize(Roles = Roles.Admin)]
+        public IActionResult GetAllReports()
+        {
+            var reports = _reportCRUD.GetAllReports();
+            if (reports == null)
+                return NotFound();
+
+            return Ok(reports);
+        }
+
+        [HttpPut("{id}")]
+        [ProducesResponseType(204)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(404)]
+        [Authorize(Roles = Roles.Admin)]
+        public IActionResult UpdateReport(int id, [FromBody] Report.DateRangeDto dateRange)
+        {
+            try
+            {
+                var report = _reportCRUD.GetReport(id);
+                if (report == null)
+                {
+                    return NotFound();
+                }
+                using (var session = SessionFactory.OpenSession())
+                {
+                    var fromDate = dateRange.FromDate;
+                    var toDate = dateRange.ToDate;
+                    if (fromDate >= toDate)
+                    {
+                        return BadRequest("Nieprawidłowy zakres dat.");
+                    }
+                    var transactions = session.Query<nHibernate.Transactions.Transaction>()
+                .Where(t => t.Date >= fromDate && t.Date <= toDate)
+                .FetchMany(t => t.TransactionProducts)
+                .ToList();
+
+                    var expenses = session.Query<Expense>()
+                        .Where(e => e.Date >= fromDate && e.Date <= toDate)
+                        .ToList();
+
+
+                    decimal totalIncome = 0;
+                    foreach (var transaction in transactions)
+                    {
+                        foreach (var product in transaction.TransactionProducts)
+                        {
+                            decimal price = _productCRUD.GetProductPrice(product.ProductID);
+                            int type = _productCRUD.GetProductType(product.ProductID);
+                            if (type == 1)
+                            {
+                                totalIncome += ((product.Quantity * price) * ((1 - (transaction.Discount / 100))));
+                            }
+                            else
+                            {
+                                totalIncome += (price * ((1 - (transaction.Discount / 100))));
+                            }
+                        }
+                    }
+
+                    var totalExpenses = expenses.Sum(e => e.Value);
+                    var totalBalance = totalIncome - totalExpenses;
+
+                    report.FromDate = fromDate;
+                    report.ToDate = toDate;
+                    report.TotalIncome = totalIncome;
+                    report.TotalExpenses = totalExpenses;
+                    report.TotalBalance = totalBalance;
+
+                    _reportCRUD.UpdateReport(report, transactions, expenses);
+
+                    return NoContent();
+                }
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(ex.Message);
+            }
+        }
+
+        [HttpDelete("{id}")]
+        [ProducesResponseType(204)]
+        [ProducesResponseType(404)]
+        [Authorize(Roles = Roles.Admin)]
+        public IActionResult DeleteReport(int id)
+        {
+            try
+            {
+                _reportCRUD.DeleteReport(id);
+                return NoContent();
+            }
+            catch (Exception ex)
+            {
+                return NotFound(ex.Message);
+            }
+        }
+    }
+}

Controllers/TransactionController.cs

@@ -1,4 +1,21 @@
-using Microsoft.AspNetCore.Mvc;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using Microsoft.AspNetCore.Mvc;
 using FirmTracker_Server.nHibernate.Transactions;
 using System;
 using System.Text.Json.Serialization;
@@ -6,11 +23,14 @@ using System.Text.Json;
 using System.Transactions;
 using FirmTracker_Server.nHibernate.Products;
 using FirmTracker_Server.nHibernate;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Authorization;
 
 namespace FirmTracker_Server.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
+    [Authorize]
     public class TransactionController : ControllerBase
     {
         private readonly TransactionCRUD _transactionCRUD;
@@ -30,50 +50,54 @@ namespace FirmTracker_Server.Controllers
         [HttpPost]
         [ProducesResponseType(StatusCodes.Status201Created)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
         public IActionResult CreateTransaction([FromBody] nHibernate.Transactions.Transaction transaction)
         {
             try
             {
-                // Before adding the transaction, ensure each product is linked properly
+                
                 foreach (var product in transaction.TransactionProducts)
                 {
-                    product.TransactionId = transaction.Id; // This might be 0 at this point if transaction isn't saved yet
+                    var productByName = _productCRUD.GetProductByName(product.ProductName);
-                    decimal price = _productCRUD.GetProductPrice(product.ProductID);
+                    if (productByName == null)
-                    int type = _productCRUD.GetProductType(product.ProductID);
+                    {
+                        throw new InvalidOperationException($"Produkt o nazwie {product.ProductName} nie istnieje.");
+                    }
+                    product.ProductID = productByName.Id;
+                    product.TransactionId = transaction.Id;
+
+                    decimal price = productByName.Price;// _productCRUD.GetProductPrice(product.ProductID);
+                    int type = productByName.Type;//_productCRUD.GetProductType(product.ProductID);
                     if (type == 1)
                     {
-                        int availability = _productCRUD.GetProductAvailability(product.ProductID);
+                        var prod = _productCRUD.GetProduct(product.ProductID);
 
-                        if (product.Quantity > availability)
+                        if (product.Quantity > prod.Availability)
                         {
-                            return BadRequest($"Can't add product {product.ProductID} to transaction. Available: {availability}, Desired: {product.Quantity}");
+                            throw new InvalidOperationException($"Nie można dodać {prod.Name} do transakcji. Dostępność: {prod.Availability}, Zażądano: {product.Quantity}");
+                            //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))));
-                        }
-
-                    }
-                    else
-                    {
-                        transaction.TotalPrice += (price * ((1 - (transaction.Discount / 100))));
                     }
                 }
 
                 _transactionCRUD.AddTransaction(transaction);
 
-                // Now that the transaction is saved, update each product with the correct TransactionId
+                
                 foreach (var product in transaction.TransactionProducts)
                 {
-                    product.TransactionId = transaction.Id; // Now transaction.Id is a valid ID after saving
+                    product.TransactionId = transaction.Id; 
                     _transactionCRUD.UpdateTransactionProduct(product);
                 }
                 
 
-              //  session.Flush(); // Ensure changes are committed if managing session manually
+              //  session.Flush(); 
 
                 return CreatedAtAction(nameof(GetTransaction), new { id = transaction.Id }, transaction);
             }
+            catch (InvalidOperationException ioe)
+            { 
+                return BadRequest(ioe.Message);
+            }
             catch (Exception ex)
             {
                 return BadRequest(ex.Message);
@@ -85,6 +109,7 @@ namespace FirmTracker_Server.Controllers
         [HttpGet("{id}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
         public IActionResult GetTransaction(int id)
         {
             var transaction = _transactionCRUD.GetTransaction(id);
@@ -97,26 +122,35 @@ namespace FirmTracker_Server.Controllers
         [HttpPut("{id}")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
         public IActionResult UpdateTransaction(int id, [FromBody] nHibernate.Transactions.Transaction transaction)
         {
             if (id != transaction.Id)
-                return BadRequest("Transaction ID mismatch");
+                return BadRequest("ID transakcji nie zgadza się.");
 
             try
             {
-                // Before adding the transaction, ensure each product is linked properly
                 foreach (var product in transaction.TransactionProducts)
                 {
-                    product.TransactionId = transaction.Id; // This might be 0 at this point if transaction isn't saved yet
+                    var productByName = _productCRUD.GetProductByName(product.ProductName);
-                    decimal price = _productCRUD.GetProductPrice(product.ProductID);
+                    if (productByName == null)
-                    transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100))));
+                    {
+                        throw new InvalidOperationException($"Produkt o nazwie {product.ProductName} nie istnieje.");
                     }
+                    product.ProductID = productByName.Id;
+                    product.TransactionId = transaction.Id;
+
+                    decimal price = productByName.Price;// _productCRUD.GetProductPrice(product.ProductID);
+                    int type = productByName.Type;//_productCRUD.GetProductType(product.ProductID);
+                }
+
+
                 _transactionCRUD.UpdateTransaction(transaction);
 
-                // Now that the transaction is saved, update each product with the correct TransactionId
+               
                 foreach (var product in transaction.TransactionProducts)
                 {
-                    product.TransactionId = transaction.Id; // Now transaction.Id is a valid ID after saving
+                    product.TransactionId = transaction.Id; 
                     _transactionCRUD.UpdateTransactionProduct(product);
                 }
                 return NoContent();
@@ -131,6 +165,7 @@ namespace FirmTracker_Server.Controllers
         [HttpDelete("{id}")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
         public IActionResult DeleteTransaction(int id)
         {
             try
@@ -138,6 +173,10 @@ namespace FirmTracker_Server.Controllers
                 _transactionCRUD.DeleteTransaction(id);
                 return NoContent();
             }
+            catch (InvalidOperationException ioe)
+            {
+                return BadRequest($"{ioe.Message}");
+            }
             catch (Exception ex)
             {
                 return NotFound(ex.Message);
@@ -149,21 +188,22 @@ namespace FirmTracker_Server.Controllers
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
         public IActionResult GetAllTransactions()
         {
             var transactions = _transactionCRUD.GetAllTransactions();
             if (transactions == null)
                 return NotFound();
 
-            // Ustawienie opcji serializatora JSON
+            
             var options = new JsonSerializerOptions
             {
-                ReferenceHandler = ReferenceHandler.Preserve // Obsługa cykli obiektów
+                ReferenceHandler = ReferenceHandler.Preserve 
             };
 
            // var json = JsonSerializer.Serialize(transactions, options);
 
-            // Zwrócenie odpowiedzi z JSON
+            
             return Ok(transactions);
         }
 

Controllers/UserController.cs

@@ -0,0 +1,62 @@
+using FirmTracker_Server.Models;
+using FirmTracker_Server.Services;
+using FirmTracker_Server;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using FirmTracker_Server.Entities;
+using System.Security.Claims;
+
+namespace FirmTracker_Server.Controllers
+{
+    [Route("api/user")]
+    [ApiController]
+    [Authorize]
+    public class UserController : ControllerBase
+    {
+        private readonly IUserService UserService;
+
+        public UserController(IUserService userService)
+        {
+            UserService = userService;
+        }
+
+        [HttpPost("create")]
+        [Authorize(Roles = Roles.Admin)]
+        public ActionResult CreateUser([FromBody] CreateUserDto dto)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest("Nieprawidłowa wartość pola. /n" + ModelState);
+            }
+            var id = UserService.AddUser(dto);
+            return Created($"/api/user/{id}", "User dodany poprawnie");
+        }
+
+        [HttpPost("login")]
+        [AllowAnonymous]
+        public ActionResult Login([FromBody] LoginDto dto)
+        {
+            var token = UserService.CreateTokenJwt(dto);
+            return Ok(token);
+        }
+        [HttpGet("role")]
+        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
+        public ActionResult<string> GetUserRole()
+        {
+            var roleClaim = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Role)?.Value;
+            if (roleClaim == null)
+            {
+                return NotFound("Role not found for the logged-in user.");
+            }
+            return Ok(roleClaim);
+        }
+        // New method to get all users
+        /* [HttpGet("all")]
+         [AllowAnonymous]
+         public ActionResult<IList<User>> GetAllUsers()
+         {
+             var users = UserService.GetAllUsers();
+             return Ok(users);
+         }*/
+    }
+}

Entities/User.cs

@@ -0,0 +1,12 @@
+namespace FirmTracker_Server.Entities
+{
+    public class User
+    {
+        public virtual int Id { get; set; }
+        public virtual string Login { get; set; }
+        public virtual string Email { get; set; }
+        public virtual string Role { get; set; } = "User";
+        public virtual string PassHash { get; set; }
+        public virtual bool NewEncryption { get; set; }
+    }
+}

Exceptions/NoResultsException.cs

@@ -0,0 +1,11 @@
+namespace FirmTracker_Server.Exceptions
+{
+    public class NoResultsException : Exception
+    {
+        public NoResultsException() : base("Brak wyników") { }
+
+        public NoResultsException(string message) : base(message) { }
+
+        public NoResultsException(string message, Exception innerException) : base(message, innerException) { }
+    }
+}

Exceptions/PermissionException.cs

@@ -0,0 +1,11 @@
+namespace FirmTracker_Server.Exceptions
+{
+    public class PermissionException : Exception
+    {
+        public PermissionException() : base("Brak uprawnień") { }
+
+        public PermissionException(string message) : base(message) { }
+
+        public PermissionException(string message, Exception innerException) : base(message, innerException) { }
+    }
+}

Exceptions/WrongUserOrPasswordException.cs

@@ -0,0 +1,11 @@
+namespace FirmTracker_Server.Exceptions
+{
+    public class WrongUserOrPasswordException : Exception
+    {
+        public WrongUserOrPasswordException() : base("Nieprawidłowy użytkownik lub hasło.") { }
+
+        public WrongUserOrPasswordException(string message) : base(message) { }
+
+        public WrongUserOrPasswordException(string message, Exception innerException) : base(message, innerException) { }
+    }
+}

FirmTracker-Server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>FirmTracker_Server</RootNamespace>
@@ -17,13 +17,27 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentNHibernate" Version="3.3.0" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="FluentNHibernate" Version="3.4.0" />
+    <PackageReference Include="FluentValidation" Version="11.10.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.18" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.1.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.12" />
-    <PackageReference Include="NHibernate" Version="5.5.1" />
+    <PackageReference Include="NHibernate" Version="5.5.2" />
+    <PackageReference Include="NLog" Version="5.3.4" />
+    <PackageReference Include="NLog.Database" Version="5.3.4" />
     <PackageReference Include="NSwag.Annotations" Version="14.0.7" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="szyfrowanie">
+      <HintPath>..\..\..\Desktop\szyfrowanie.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
   <ItemGroup>

Helpers/RolesHelper.cs

@@ -0,0 +1,13 @@
+namespace FirmTracker_Server
+{
+    public static class RolesHelper
+    {
+        public static IEnumerable<string> GetRoles() => new List<string> { Roles.Admin, Roles.User };
+    }
+
+    public static class Roles
+    {
+        public const string Admin = "Admin";
+        public const string User = "User";
+    }
+}

LICENSE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Logger.cs

@@ -0,0 +1,75 @@
+using System;
+using System.IO;
+using NLog;
+using NLog.Config;
+using NLog.Targets;
+
+
+namespace IntegrationWithCzech
+{
+    public static class Logger
+    {
+        private static NLog.Logger log;
+
+        public static void ConfigLog()
+        {
+            var config = new LoggingConfiguration();
+
+            string appDirectory = Directory.GetCurrentDirectory();
+            string configFilePath = Path.Combine(appDirectory, "appsettings.json");
+            var config1 = new ConfigurationBuilder()
+                  .AddJsonFile(configFilePath)
+                  .Build();
+            var connectionstringsection = config1.GetSection("AppSettings:ConnectionString");
+
+            string connectionString = connectionstringsection.Value;
+
+            // Czech Database Target
+            var LogDbTarget = new DatabaseTarget("logDBTarget")
+            {
+                ConnectionString = connectionString,
+                CommandText = "INSERT INTO CDN.CzechLogTable(Date, Level, Message, Exception) VALUES(@date, @level, @message, @exception)"
+            };
+            LogDbTarget.Parameters.Add(new DatabaseParameterInfo("@date", "${longdate}"));
+            LogDbTarget.Parameters.Add(new DatabaseParameterInfo("@level", "${level}"));
+            LogDbTarget.Parameters.Add(new DatabaseParameterInfo("@message", "${message}"));
+            LogDbTarget.Parameters.Add(new DatabaseParameterInfo("@exception", "${exception}"));
+
+
+            var logconsole = new ConsoleTarget("logconsole")
+            {
+                Layout = "${longdate}  ${message} ${exception}"
+            };
+
+
+
+            // Adding Rules for Poland Logging
+            config.AddRuleForOneLevel(NLog.LogLevel.Error, LogDbTarget, "PolandLogger");
+            config.AddRuleForAllLevels(logconsole, "PolandLogger");
+
+            LogManager.Configuration = config;
+            log = LogManager.GetLogger("CzechLogger");
+            
+        }
+
+        public static void LogInfo(string message)
+        {
+            log?.Info(message);
+        }
+
+    
+
+        public static void Write2CzechLogError(string message, Exception ex = null)
+        {
+            if (ex is null)
+            {
+                log?.Error(message);
+            }
+            else
+            {
+                log?.Error(ex, message);
+            }
+        }
+
+    }
+}

Mappings/LicenseMappingProfile.cs

@@ -0,0 +1,24 @@
+using AutoMapper;
+using FirmTracker_Server.Entities;
+using FirmTracker_Server.Models;
+using NHibernate.Type;
+using NuGet.Packaging.Licenses;
+using System.ComponentModel;
+
+namespace FirmTracker_Server.Mappings
+{
+    public class LicenseMappingProfile : Profile
+    {
+        public LicenseMappingProfile()
+        {
+           // CreateMap<License, LicenseDto>();
+           // CreateMap<LicenseDto, License>();
+          //  CreateMap<CreateLicenseDto, License>();
+          //  CreateMap<LicType, LicTypeDto>();
+          //  CreateMap<LicTypeDto, LicType>();
+            CreateMap<UserDto, User>();
+            CreateMap<User, UserDto>();
+            CreateMap<CreateUserDto, User>().ForSourceMember(x => x.Password, y => y.DoNotValidate());
+        }
+    }
+}

Middleware/ErrorHandling.cs

@@ -0,0 +1,43 @@
+using FirmTracker_Server.Exceptions;
+
+namespace FirmTracker_Server.Middleware
+{
+    public class ErrorHandling : IMiddleware
+    {
+        private readonly ILogger Logger;
+
+        public ErrorHandling(ILogger<ErrorHandling> logger)
+        {
+            Logger = logger;
+        }
+
+        public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+        {
+            try
+            {
+                await next.Invoke(context);
+            }
+            catch (WrongUserOrPasswordException ex)
+            {
+                context.Response.StatusCode = 400;
+                await context.Response.WriteAsync(ex.Message);
+            }
+            catch (PermissionException ex)
+            {
+                context.Response.StatusCode = 403;
+                await context.Response.WriteAsync(ex.Message);
+            }
+            catch (NoResultsException ex)
+            {
+                context.Response.StatusCode = 404;
+                await context.Response.WriteAsync(ex.Message);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex, "Wystąpił nieoczekiwany błąd.");
+                context.Response.StatusCode = 500;
+                await context.Response.WriteAsJsonAsync("Wystąpił nieoczekiwany błąd.");
+            }
+        }
+    }
+}

Models/CreateUserDto.cs

@@ -0,0 +1,11 @@
+namespace FirmTracker_Server.Models
+{
+    public class CreateUserDto
+    {
+        public string Login { get; set; }
+        public string Password { get; set; }
+        public string Email { get; set; }
+        public string Role { get; set; }
+        public bool NewEncryption { get; set; } = true;
+    }
+}

Models/LoginDtocs.cs

@@ -0,0 +1,9 @@
+namespace FirmTracker_Server.Models
+{
+    public class LoginDto
+    {
+        public string Email { get; set; }
+        public string Password { get; set; }
+
+    }
+}

Models/UserDto.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace FirmTracker_Server.Models
+{
+    public class UserDto
+    {
+        [Required]
+        [MaxLength(16)]
+        public string Login { get; set; }
+
+        [Required]
+        [EmailAddress]
+        public string Email { get; set; }
+
+        [Required]
+        [MinLength(8, ErrorMessage = "Password must be at least 8 characters long.")]
+        [MaxLength(100, ErrorMessage = "Password cannot be longer than 100 characters.")]
+        [RegularExpression(@"^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[@$!%*?&#])[A-Za-z\d@$!%*?&#]{8,}$", ErrorMessage = "Password must contain at least one uppercase letter, one lowercase letter, one digit, and one special character.")]
+        public string Password { get; set; }
+
+    }
+}

Program.cs

@@ -1,3 +1,20 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Dialect;
@@ -5,13 +22,29 @@ using NHibernate.Driver;
 using FirmTracker_Server.Controllers;
 using FirmTracker_Server.nHibernate.Products;
 using FirmTracker_Server.nHibernate;
+using FirmTracker_Server.Utilities.Converters;
+using FirmTracker_Server.Utilities.Swagger;
+using FluentValidation;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.IdentityModel.Tokens;
+using AutoMapper;
+using Microsoft.AspNetCore.Authentication;
+using System.Text;
+using FirmTracker_Server.Entities;
+using FirmTracker_Server.Middleware;
+using FirmTracker_Server.Services;
+using System.Reflection;
+using FirmTracker_Server.Mappings;
+
 
 namespace FirmTracker_Server
 {
-    public class Program
+    internal static class Program
     {
 
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
             var builder = WebApplication.CreateBuilder(args);
             string appDirectory = Directory.GetCurrentDirectory();        
@@ -36,6 +69,7 @@ namespace FirmTracker_Server
 
             TestClass test = new TestClass();
             test.AddTestProduct();
+         
             builder.Services.AddCors(options =>
             {
                 options.AddPolicy("AllowSpecificOrigin",
@@ -43,10 +77,23 @@ namespace FirmTracker_Server
                         .AllowAnyHeader()
                         .AllowAnyMethod());
             });
-            builder.Services.AddControllers();
+            builder.Services.ConfigureAutoMapper();
-
+            builder.Services.ConfigureServiceInjection();
+            builder.Services.AddControllers()
+                .AddJsonOptions(options =>
+                {
+                    options.JsonSerializerOptions.Converters.Add(new DateTimeConverter());
+                });
+                ;
+            builder.ConfigureAuthentication();
+            builder.Services.AddAuthorization();
             builder.Services.AddEndpointsApiExplorer();
-            builder.Services.AddSwaggerGen();
+            builder.Services.AddSwaggerGen(c =>
+            {
+                c.SchemaFilter<SwaggerDateTimeSchemaFilter>();
+            });
+
+
 
             var app = builder.Build();
             var configSwagger = new ConfigurationBuilder()
@@ -80,6 +127,7 @@ namespace FirmTracker_Server
             app.UseCors("AllowSpecificOrigin");
 
 
+            app.UseAuthentication();
             app.UseAuthorization();
 
       
@@ -90,5 +138,43 @@ namespace FirmTracker_Server
 
             app.Run();
         }
+        private static void ConfigureAuthentication(this WebApplicationBuilder builder)
+        {
+            var authenticationSettings = new Authentication.AuthenticationSettings();
+            builder.Configuration.GetSection("TokenConfig").Bind(authenticationSettings);
+            builder.Services.AddAuthentication(option => {
+                option.DefaultAuthenticateScheme = "Bearer";
+                option.DefaultScheme = "Bearer";
+                option.DefaultChallengeScheme = "Bearer";
+            }).AddJwtBearer(options => {
+                options.RequireHttpsMetadata = false;
+                options.SaveToken = true;
+                options.TokenValidationParameters = new TokenValidationParameters
+                {
+                    ValidIssuer = authenticationSettings.JwtIssuer,
+                    ValidAudience = authenticationSettings.JwtIssuer,
+                    IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authenticationSettings.JwtSecKey)),
+                };
+            });
+            builder.Services.AddSingleton(authenticationSettings);
+        }
+        private static void ConfigureAutoMapper(this IServiceCollection services)
+        {
+            var mapperConfig = new MapperConfiguration(mc => {
+                mc.AddProfile<LicenseMappingProfile>();
+               // mc.AddProfile<PayLinkerMappingProfile>();
+            });
+            var mapper = mapperConfig.CreateMapper();
+            services.AddSingleton(mapper);
+            services.AddAutoMapper(Assembly.GetExecutingAssembly());
+        }
+        private static void ConfigureServiceInjection(this IServiceCollection services)
+        {         
+            services.AddScoped<IUserService, UserService>();          
+            services.AddScoped<ErrorHandling>();      
+            services.AddScoped<IPasswordHasher<User>, PasswordHasher<User>>();
+            services.AddMvc();
+        }
+
     }
 }

Services/UserService.cs

@@ -0,0 +1,144 @@
+using AutoMapper;
+using FirmTracker_Server.Authentication;
+using FirmTracker_Server.Entities;
+using FirmTracker_Server.Exceptions;
+using FirmTracker_Server.Models;
+using FirmTracker_Server.Authentication;
+using FirmTracker_Server.Exceptions;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.IdentityModel.Tokens;
+using System.Globalization;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using System.Text;
+using szyfrowanie;
+using FirmTracker_Server.nHibernate;
+using NHibernate;
+using NHibernate.Criterion;
+
+namespace FirmTracker_Server.Services
+{
+    public interface IUserService
+    {
+        UserDto GetById(int id);
+        int AddUser(CreateUserDto dto);
+        string CreateTokenJwt(LoginDto dto);
+
+    }
+
+    public class UserService : IUserService
+    {
+       // private readonly GeneralDbContext DbContext;
+        private readonly IMapper Mapper;
+        private readonly IPasswordHasher<User> PasswordHasher;
+        private readonly AuthenticationSettings AuthenticationSettings;
+       private readonly SimplerAES SimplerAES;
+        //private readonly SessionFactory sessionFactory;
+
+        public UserService( IMapper mapper, IPasswordHasher<User> passwordHasher, AuthenticationSettings authenticationSettings)
+        {
+           // DbContext = dbContext;
+            Mapper = mapper;
+            PasswordHasher = passwordHasher;
+            AuthenticationSettings = authenticationSettings;
+            SimplerAES = new SimplerAES();
+            //SessionFactory = sessionFactory;
+        }
+
+        public UserDto GetById(int id)
+        {
+            using (var session = SessionFactory.OpenSession())
+            {
+                var user = session.Get<User>(id);
+                return user == null ? null : Mapper.Map<UserDto>(user);
+            }
+        }
+
+        public int AddUser(CreateUserDto dto)
+        {
+            var user = Mapper.Map<User>(dto);
+
+            // Encrypt or hash the password based on NewEncryption flag
+            user.PassHash = dto.NewEncryption ? SimplerAES.Encrypt(dto.Password) : PasswordHasher.HashPassword(user, dto.Password);
+            user.Role = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(dto.Role.ToLower());
+
+            using (var session = SessionFactory.OpenSession())
+            using (var transaction = session.BeginTransaction())
+            {
+                try
+                {
+                    session.Save(user);
+                    transaction.Commit();
+                    return user.Id;
+                }
+                catch
+                {
+                    transaction.Rollback();
+                    throw;
+                }
+            }
+        }
+
+        public string CreateTokenJwt(LoginDto dto)
+        {
+            User user = null;
+
+            using (var session = SessionFactory.OpenSession())
+            {
+                if (!string.IsNullOrEmpty(dto.Email))
+                {
+                    user = session.Query<User>().FirstOrDefault(x => x.Email == dto.Email);
+                }
+                else
+                {
+                    throw new WrongUserOrPasswordException("Nieprawidłowy login lub hasło.");
+                }
+
+                if (user == null)
+                {
+                    throw new WrongUserOrPasswordException("Nieprawidłowy login lub hasło.");
+                }
+
+                // Password verification logic
+                if (user.NewEncryption)
+                {
+                    try
+                    {
+                        Console.WriteLine(SimplerAES.Decrypt(user.PassHash)+" "+SimplerAES.Decrypt(dto.Password));
+                        var ready = SimplerAES.Decrypt(user.PassHash) == SimplerAES.Decrypt(dto.Password);
+                        if (!ready)
+                        {
+                            throw new WrongUserOrPasswordException("Nieprawidłowy login lub hasło.");
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        throw new WrongUserOrPasswordException("Wystąpił błąd podczas logowania");
+                    }
+                }
+                else
+                {
+                    var ready = PasswordVerificationResult.Failed;
+                    if (SimplerAES.Decrypt(user.PassHash) == SimplerAES.Decrypt(dto.Password)) { ready = PasswordVerificationResult.Success; } //PasswordHasher.VerifyHashedPassword(user, user.PassHash, dto.Password);
+                    if (ready == PasswordVerificationResult.Failed)
+                    {
+                        throw new WrongUserOrPasswordException("Nieprawidłowy login lub hasło.");
+                    }
+                }
+
+                // Generate JWT token
+                var claims = new List<Claim>() {
+                    new(ClaimTypes.NameIdentifier, user.Id.ToString()),
+                    new(ClaimTypes.Role, user.Role)
+                };
+
+                var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(AuthenticationSettings.JwtSecKey));
+                var credential = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
+                var expires = DateTime.Now.AddDays(AuthenticationSettings.JwtExpireDays);
+                var token = new JwtSecurityToken(AuthenticationSettings.JwtIssuer, AuthenticationSettings.JwtIssuer, claims, expires: expires, signingCredentials: credential);
+                var finalToken = new JwtSecurityTokenHandler();
+                return finalToken.WriteToken(token);
+            }
+        }
+    }
+}

TestClass.cs

@@ -1,70 +1,133 @@
-using FirmTracker_Server.Controllers;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.Controllers;
 using FirmTracker_Server.nHibernate; 
 using FirmTracker_Server.nHibernate.Products;
 using FirmTracker_Server.nHibernate.Transactions;
 using FirmTracker_Server.nHibernate.Expenses;
 using NHibernate;
+using FirmTracker_Server.Entities;
+using FirmTracker_Server.Services;
+using AutoMapper;
+using FirmTracker_Server.Authentication;
+using Microsoft.AspNetCore.Identity;
+using FirmTracker_Server.Models;
+using System.Data.SqlClient;
 
 namespace FirmTracker_Server
 {
     public class TestClass
     {
+        public static Product CreateProduct(string name, string description, decimal price, int type, int availability)
+        {
+            return new Product
+            {
+                Name = name,
+                Description = description,
+                Price = price,
+                Type = type,
+                Availability = availability
+            };
+        }
         public void AddTestProduct()
         {
             // SessionFactory.Init(ConnectionString);
 
-            var product = new nHibernate.Products.Product
+
-            {
-                Name = "Produkt 1",
-                Description = "testowy produkt",
-                Price = 11.50m,
-                Type = 1, 
-                Availability = 5
-            };
             var product2 = new nHibernate.Products.Product
             {
-                Name = "Usluga 1",
+                Name = "Dostawa",
-                Description = "testowa usluga",
+                Description = "usługa dostawy",
-                Price = 1120.00m,
+                Price = 7.50m,
                 Type = 0,
                 Availability = 0
             };
-            var product3 = new nHibernate.Products.Product
+         
+            var products = new List<Product>
             {
-                Name = "Produkt 2",
+                CreateProduct("Tarta_truskawka", "produkt", 31.99m, 1, 10),
-                Description = "produkt",
+                CreateProduct("Tarta_czekolada", "produkt", 30.99m, 1, 10),
-                Price = 16.50m,
+                CreateProduct("Tarta_agrest", "produkt", 32.90m, 1, 8),
-                Type = 1,
+                CreateProduct("Tarta_pistacja", "produkt", 35.99m, 1, 12),
-                Availability = 20
+                CreateProduct("Tarta_karmel", "produkt", 32.00m, 1, 12),
-            };
+                CreateProduct("Rolada_beza", "produkt", 21.00m, 1, 5),
-            var product4 = new nHibernate.Products.Product
+                CreateProduct("Rolada_róża", "produkt", 21.90m, 1, 10),
-            {
+                CreateProduct("Kostka_truskawka", "produkt", 12.00m, 1, 11),
-                Name = "Produkt 3",
+                CreateProduct("Kostka_lemonCurd", "produkt", 13.99m, 1, 13),
-                Description = "produkt",
+                CreateProduct("Kostka_hiszpańska", "produkt", 11.99m, 1, 8),
-                Price = 25.00m,
+                CreateProduct("Kostka_wiosenna", "produkt", 11.99m, 1, 5),
-                Type = 1,
+                CreateProduct("Kostka_jabłka", "produkt", 12.00m, 1, 5),
-                Availability = 10
+                CreateProduct("Kostka_porzeczka", "produkt", 12.99m, 1, 5),
-            };
+                CreateProduct("Kostka_królewska", "produkt", 13.50m, 1, 5),
-            var product5 = new nHibernate.Products.Product
+                CreateProduct("Kostka_czekolada", "produkt", 14.50m, 1, 10),
-            {
+                CreateProduct("Kostka_wiśnia", "produkt", 12.50m, 1, 5),
-                Name = "Usługa 2",
+                CreateProduct("Kostka_beza", "produkt", 13.50m, 1, 20),
-                Description = "usługa",
+                CreateProduct("Kostka_leśna", "produkt", 12.00m, 1, 20),
-                Price = 700.00m,
+                CreateProduct("Kostka_kawowa", "produkt", 12.00m, 1, 10),
-                Type = 0,
+                CreateProduct("Kostka_galaretka", "produkt", 12.50m, 1, 25),
-                Availability = 0
+                CreateProduct("Kostka_firmowa", "produkt", 12.50m, 1, 5),
+                CreateProduct("Sernik_wiśnia", "produkt", 33.00m, 1, 6),
+                CreateProduct("Sernik_truskawka", "produkt", 31.00m, 1, 5),
+                CreateProduct("Sernik_pistacja", "produkt", 38.90m, 1, 5),
+                CreateProduct("Sernik_fantazja", "produkt", 33.00m, 1, 7),
+                CreateProduct("Sernik_rafaello", "produkt", 33.00m, 1, 5),
+                CreateProduct("Sernik_nutella", "produkt", 35.50m, 1, 6),
+                CreateProduct("Sernik_mango", "produkt", 33.00m, 1, 5),
+                CreateProduct("Sernik_rabarbar", "produkt", 37.99m, 1, 5),
+                CreateProduct("Sernik_biszkopt", "produkt", 39.00m, 1, 11),
+                CreateProduct("Tartaletka", "produkt", 13.20m, 1, 30),
+                CreateProduct("Strudel_jabłko", "produkt", 29.00m, 1, 20),
+                CreateProduct("Placek_rabarbar", "produkt", 24.00m, 1, 18),
+                CreateProduct("Placek_jogurt", "produkt", 23.00m, 1, 13),
+                CreateProduct("Placek_śliwka", "produkt", 22.00m, 1, 14),
+                CreateProduct("Placek_maślany", "produkt", 18.00m, 1,11),
+                CreateProduct("Keks", "produkt", 22.00m, 1,11),
+                CreateProduct("Babka_drożdżowa", "produkt", 16.00m, 1,11),
+                CreateProduct("Pączek_pistacja", "produkt", 8.00m, 1,11),
+                CreateProduct("Pączek_marmolada", "produkt", 3.00m, 1,11),
+                CreateProduct("Pączek_nutella", "produkt", 4.50m, 1,11),
+                CreateProduct("Pączek_rafaello", "produkt", 4.50m, 1,11),
+                CreateProduct("Pączek_róża", "produkt", 4.00m, 1,11),
+                CreateProduct("Ekler", "produkt", 3.00m, 1,11),
+                CreateProduct("Ekler_słony_karmel", "produkt", 5.00m, 1,11),
+                CreateProduct("Ptyś", "produkt", 4.00m, 1,11),
+                CreateProduct("Drożdżówka_ser", "produkt", 4.00m, 1,11),
+                CreateProduct("Drożdżówka_rabarbar", "produkt", 5.00m, 1,11),
+                CreateProduct("Drożdżówka_żurawina", "produkt", 5.00m, 1,11),
+                CreateProduct("Drożdżówka_kruszonka", "produkt", 4.00m, 1,11),
+                CreateProduct("Drożdżówka_budyń", "produkt", 5.00m, 1,11),
+                CreateProduct("Jagodzianka", "produkt", 6.00m, 1,11),
+
+
               };
+
             var transaction1 = new Transaction
             {
                 Date = DateTime.Now.AddDays(-2),
-                Description = "testowa transakcja",
+                Description = "zamówienie telefon",
-                Discount = 10,
+                Discount = 5,
                 EmployeeId = 1,
                 PaymentType = "Karta kredytowa",
             };
             var transaction2 = new Transaction
             {
                 Date = DateTime.Now.AddDays(-3),
-                Description = "testowa transakcja",
+                Description = "sprzedaż - kasa",
                 Discount = 30,
                 EmployeeId = 2,
                 PaymentType = "Gotówka",
@@ -72,7 +135,15 @@ namespace FirmTracker_Server
             var transaction3 = new Transaction
             {
                 Date = DateTime.Now,
-                Description = "testowa transakcja",
+                Description = "sprzedaż - kasa",
+                Discount = 15,
+                EmployeeId = 1,
+                PaymentType = "BLIK",
+            };
+            var transaction4 = new Transaction
+            {
+                Date = DateTime.Now,
+                Description = "zamówienie",
                 Discount = 15,
                 EmployeeId = 1,
                 PaymentType = "BLIK",
@@ -81,30 +152,96 @@ namespace FirmTracker_Server
             var expense1 = new Expense
             {
                 Date = DateTime.Now,
-                Value = 1003.9m,
+                Value = 7999.9m,
-                Description = "testowy rozchód"
+                Description = "zakup maszyny do lodów FZ/2/6/2024"
             };
+            var expense2 = new Expense
+            {
+                Date = DateTime.Now,
+                Value = 990.99m,
+                Description = "naprawa pieca - 25.05.2024"
+            };
+            var expense3 = new Expense
+            {
+                Date = DateTime.Now,
+                Value = 1800.00m,
+                Description = "zakup składników "
+
+            };
+
+            try
+            {
+                string appDirectory = Directory.GetCurrentDirectory();
+                string configFilePath = Path.Combine(appDirectory, "appsettings.json");
+                string connectionString = "";
+                if (File.Exists(configFilePath))
+                {
+                    var config = new ConfigurationBuilder()
+                      .AddJsonFile(configFilePath)
+                      .Build();
+
+                    var connectionstringsection = config.GetSection("AppSettings:ConnectionString");
+
+                    connectionString = connectionstringsection.Value;
+
+                    //SessionFactory.Init(connectionString);
+
+                    string queryUser = "insert into Users(Email,PassHash,Role) select '123@wp.pl', 'GOsGemJarMJu8btZKF6Rung27JLZkdO7Wfd4CwLhL1k=','User'";
+                    string queryAdmin = "insert into Users(Email,PassHash,Role) select '321@wp.pl', 'GOsGemJarMJu8btZKF6Rung27JLZkdO7Wfd4CwLhL1k=','Admin'";
+
+                   
+                    SqlConnection connection = new SqlConnection(connectionString);
+                    connection.Open();
+
+                    SqlCommand command = new SqlCommand(queryUser, connection);
+                    command.CommandTimeout = 200;
+                    command.ExecuteNonQuery();
+                    connection.Close();
+
+                 
+                    SqlConnection connection2 = new SqlConnection(connectionString);
+                    connection.Open();
+
+                    SqlCommand command2 = new SqlCommand(queryAdmin, connection);
+                    command2.CommandTimeout = 200;
+                    command2.ExecuteNonQuery();
+                    connection2.Close();
+
+                }
+
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Nie udało się dodać kont użytkowników " + e.Message);
+            }
+
+
 
             try
             {
                 FirmTracker_Server.nHibernate.Products.ProductCRUD productCrud = new ProductCRUD();
                 FirmTracker_Server.nHibernate.Transactions.TransactionCRUD transactionCrud = new nHibernate.Transactions.TransactionCRUD();
+               
                 ExpenseCRUD expenseCrud = new ExpenseCRUD();
-                productCrud.AddProduct(product);
+               // productCrud.AddProduct(product);
                 productCrud.AddProduct(product2);
-                productCrud.AddProduct(product3);
+               // productCrud.AddProduct(product3);
-                productCrud.AddProduct(product4);
+                foreach(var clientProduct in products)
-                productCrud.AddProduct(product5);
+                {
+                    productCrud.AddProduct(clientProduct);
+                }
                 transactionCrud.AddTransaction(transaction1);
                 transactionCrud.AddTransaction(transaction2);
                 transactionCrud.AddTransaction(transaction3);
+                transactionCrud.AddTransaction(transaction4);
                 expenseCrud.AddExpense(expense1);
-                
+                expenseCrud.AddExpense(expense2);
+                expenseCrud.AddExpense(expense3);
 
                 List<TransactionProduct> testTransactionProducts = new List<TransactionProduct>  {
-         new TransactionProduct { ProductID = 1, Quantity = 2 },
+                    new TransactionProduct { ProductID =17, Quantity = 10 },
-         new TransactionProduct { ProductID = 2, Quantity = 1 },
+                    new TransactionProduct { ProductID = 14, Quantity = 1 },
-         new TransactionProduct { ProductID = 3, Quantity = 10 }
+                    new TransactionProduct { ProductID = 1, Quantity = 0 },
                 };
                 foreach (var transactionProduct in testTransactionProducts)
                 {
@@ -114,8 +251,8 @@ namespace FirmTracker_Server
 
                 List<TransactionProduct> testTransactionProducts2 = new List<TransactionProduct>
                 {
-                    new TransactionProduct { ProductID = 4, Quantity=5},
+                    new TransactionProduct { ProductID = 28, Quantity=5},
-                    new TransactionProduct { ProductID = 5, Quantity=1}
+                    new TransactionProduct { ProductID = 22, Quantity=5}
                 };
                 foreach (var transactionProduct in testTransactionProducts2)
                 {
@@ -125,7 +262,7 @@ namespace FirmTracker_Server
 
                 List<TransactionProduct> testTransactionProducts3 = new List<TransactionProduct>
                 {
-                    new TransactionProduct { ProductID = 3, Quantity=12},
+                    new TransactionProduct { ProductID = 3, Quantity=9},
                     new TransactionProduct { ProductID = 2, Quantity=1}
                 };
                 foreach (var transactionProduct in testTransactionProducts3)
@@ -133,7 +270,16 @@ namespace FirmTracker_Server
                     transactionCrud.AddTransactionProductToTransaction(transaction3.Id, transactionProduct);
 
                 }
+                List<TransactionProduct> testTransactionProducts4 = new List<TransactionProduct>
+                {
+                    new TransactionProduct { ProductID = 33, Quantity=12},
+                    new TransactionProduct { ProductID = 12, Quantity=1}
+                };
+                foreach (var transactionProduct in testTransactionProducts4)
+                {
+                    transactionCrud.AddTransactionProductToTransaction(transaction4.Id, transactionProduct);
 
+                }
 
             }
             catch(Exception ex)

Utilities/Converters/DateTimeConverter.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace FirmTracker_Server.Utilities.Converters
+{
+    public class DateTimeConverter : JsonConverter<DateTime>
+    {
+        private const string DateFormat = "yyyy-MM-ddTHH:mm";
+
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.String)
+            {
+                if (DateTime.TryParseExact(reader.GetString(), DateFormat, null, System.Globalization.DateTimeStyles.None, out var date))
+                {
+                    return date;
+                }
+            }
+            throw new JsonException("Invalid date format");
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value.ToString(DateFormat));
+        }
+    }
+}

Utilities/Swagger/SwaggerDateTimeSchemaFilter.cs

@@ -0,0 +1,18 @@
+using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.SwaggerGen;
+
+namespace FirmTracker_Server.Utilities.Swagger
+{
+    public class SwaggerDateTimeSchemaFilter : ISchemaFilter
+    {
+        public void Apply(OpenApiSchema schema, SchemaFilterContext context)
+        {
+            if (context.Type == typeof(DateTime) || context.Type == typeof(DateTime?))
+            {
+                schema.Format = "yyyy-MM-ddTHH:mm";
+                schema.Example = new OpenApiString(DateTime.Now.ToString("yyyy-MM-ddTHH:mm"));
+            }
+        }
+    }
+}

appsettings.json

@@ -1,6 +1,12 @@
 {
   "AppSettings": {
     "ConnectionString": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=master;Integrated Security=True;"
+
+  },
+  "TokenConfig": {
+    "JwtSecKey": "omgi5Rf4tqg351GQwefw1234567890123456",
+    "JwtExpireDays": 30,
+    "JwtIssuer": "http://api.graphcom.pl"
   },
   "profiles": {
     "http": {

nHIbernate/Expenses/Expense.cs

@@ -1,8 +1,29 @@
-namespace FirmTracker_Server.nHibernate.Expenses
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate.Reports;
+using System.ComponentModel.DataAnnotations;
+
+namespace FirmTracker_Server.nHibernate.Expenses
 {
     public class Expense
     {
         public virtual int Id { get; set; }
+        [DataType(DataType.DateTime)]
         public virtual DateTime Date { get; set; }
         public virtual decimal Value { get; set; }
         public virtual string Description { get; set; }

nHIbernate/Expenses/ExpenseCRUD.cs

@@ -1,5 +1,24 @@
-using FirmTracker_Server.nHibernate;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate;
 using FirmTracker_Server.nHibernate.Products;
+using FirmTracker_Server.nHibernate.Reports;
+using NHibernate.Criterion;
 
 namespace FirmTracker_Server.nHibernate.Expenses
 {
@@ -85,6 +104,16 @@ namespace FirmTracker_Server.nHibernate.Expenses
                 var expense = session.Get<Expense>(expenseId);
                 if (expense != null)
                     {
+                        var criteria = session.CreateCriteria<ReportExpense>();
+                        criteria.Add(Restrictions.Eq("Expense.Id", expenseId));
+                        var reportExpenses = criteria.List<ReportExpense>();
+
+                        if (reportExpenses.Any())
+                        {
+                            throw new InvalidOperationException("Nie można usunąć wydatku. Wydatek jest ujęty w co najmniej jednym z raportów.");
+                        }
+
+
                         session.Delete(expense);
                         transaction.Commit();
                     }

nHIbernate/Expenses/ExpenseMapping.cs

@@ -1,4 +1,21 @@
-using FluentNHibernate.Mapping;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FluentNHibernate.Mapping;
 
 namespace FirmTracker_Server.nHibernate.Expenses
 {

nHIbernate/LogsMapping.cs

@@ -0,0 +1,30 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using System.Text.Json.Serialization;
+
+namespace FirmTracker_Server.nHibernate
+{
+    public class LogsMapping
+    {
+        public virtual int Id { get; set; }
+        public virtual DateTime Date { get; set; }
+        public virtual string Level { get; set; }
+        public virtual string Message { get; set; }
+        public virtual string  Exception { get; set; } 
+    }
+}

nHIbernate/Products/Product.cs

@@ -1,4 +1,21 @@
-using System.Text.Json.Serialization;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using System.Text.Json.Serialization;
 
 namespace FirmTracker_Server.nHibernate.Products
 {

nHIbernate/Products/ProductCRUD.cs

@@ -1,10 +1,30 @@
-using FirmTracker_Server.nHibernate;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate;
 using FirmTracker_Server.nHibernate.Products;
 using NHibernate;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.OpenApi;
 using Microsoft.AspNetCore.Http.HttpResults;
 using System.Security.Cryptography.X509Certificates;
+using FirmTracker_Server.nHibernate.Reports;
+using NHibernate.Criterion;
+using FirmTracker_Server.nHibernate.Transactions;
 
 namespace FirmTracker_Server.nHibernate.Products
 {
@@ -74,6 +94,16 @@ 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())
@@ -102,6 +132,16 @@ namespace FirmTracker_Server.nHibernate.Products
                     var product = session.Get<Product>(productId);
                     if (product != null)
                     {
+
+                        var criteria = session.CreateCriteria<TransactionProduct>();
+                        criteria.Add(Restrictions.Eq("ProductID", productId));
+                        var transactionProducts = criteria.List<TransactionProduct>();
+
+                        if (transactionProducts.Any())
+                        {
+                            throw new InvalidOperationException("Nie można usunąć produktu. Produkt jest ujęty w co najmniej jednej transakcji.");
+                        }
+
                         session.Delete(product);
                         transaction.Commit();
                     }

nHIbernate/Products/ProductMapping.cs

@@ -1,4 +1,21 @@
-using FluentNHibernate.Mapping;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FluentNHibernate.Mapping;
 namespace FirmTracker_Server.nHibernate.Products
 {
     public class ProductMapping : ClassMap<Product>

nHIbernate/Reports/Report.cs

@@ -0,0 +1,54 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate.Expenses;
+using FirmTracker_Server.nHibernate.Transactions;
+using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
+
+namespace FirmTracker_Server.nHibernate.Reports
+{
+    public class Report
+    {
+        public virtual int Id { get; set; }
+        [DataType(DataType.DateTime)]
+        public virtual DateTime FromDate { get; set; }
+        [DataType(DataType.DateTime)]
+        public virtual DateTime ToDate { get; set; }
+        public virtual decimal TotalIncome { get; set; }
+        public virtual decimal TotalExpenses { get; set; }
+        public virtual decimal TotalBalance { get; set; }
+
+        /*public virtual IList<ReportTransaction> ReportTransactions { get; set; } = new List<ReportTransaction>();
+        public virtual IList<ReportExpense> ReportExpenses { get; set; } = new List<ReportExpense>();
+
+       
+        public Report()
+        {
+            ReportTransactions = new List<ReportTransaction>();
+            ReportExpenses = new List<ReportExpense>();
+        }*/
+
+
+        public class DateRangeDto
+        {
+            public DateTime FromDate { get; set; }
+            public DateTime ToDate { get; set; }
+
+        }   
+    }
+}

nHIbernate/Reports/ReportMapping.cs

@@ -0,0 +1,46 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FluentNHibernate.Mapping;
+namespace FirmTracker_Server.nHibernate.Reports
+{
+    public class ReportMapping : ClassMap<Report>
+    {
+        public ReportMapping()
+        {
+            Table("Reports");
+            Id(x => x.Id).GeneratedBy.Identity();
+            Map(x => x.FromDate);
+            Map(x => x.ToDate);
+            Map(x => x.TotalIncome);
+            Map(x => x.TotalExpenses);
+            Map(x => x.TotalBalance);
+
+            /*HasMany(x => x.ReportTransactions)
+            .KeyColumn("ReportId")
+                .Cascade.AllDeleteOrphan()
+                .Inverse();
+
+            HasMany(x => x.ReportExpenses)
+            .KeyColumn("ReportId")
+                .Cascade.AllDeleteOrphan()
+                .Inverse();*/
+
+        }
+
+    }
+}

nHIbernate/SessionFactory.cs

@@ -1,4 +1,21 @@
-using FluentNHibernate.Cfg;
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FluentNHibernate.Cfg;
 using FluentNHibernate.Cfg.Db;
 using NHibernate;
 using NHibernate.Tool.hbm2ddl;
@@ -33,7 +50,13 @@ namespace FirmTracker_Server.nHibernate
                     .AddFromAssemblyOf<Transactions.TransactionProductMapping>()
                     .AddFromAssemblyOf<Transactions.Transaction2Mapping>()
                     .AddFromAssemblyOf<Transactions.TransactionWithProductsMapping>()
-                    .AddFromAssemblyOf<Expenses.ExpenseMapping>();
+                    .AddFromAssemblyOf<Expenses.ExpenseMapping>()
+                    .AddFromAssemblyOf<Reports.ReportMapping>()
+                    .AddFromAssemblyOf<Reports.ReportTransactionMapping>()
+                    .AddFromAssemblyOf<Reports.ReportExpenseMapping>()
+                    .AddFromAssemblyOf<LogsMapping>()
+                    .AddFromAssemblyOf<UserMapping>();
+                    
                 })
                 .ExposeConfiguration(cfg => new SchemaExport(cfg).Create(true, true))  //SchemaUpdate . Execute  dla only update
                 .BuildSessionFactory();

nHIbernate/UserMapping.cs

@@ -0,0 +1,16 @@
+using FluentNHibernate.Mapping;
+using FirmTracker_Server.Entities;
+
+public class UserMapping : ClassMap<User>
+{
+    public UserMapping()
+    {
+        Table("Users"); // The name of your table in the database
+
+        Id(x => x.Id); // Mapping the Id property
+        Map(x => x.Email); // Mapping other properties
+        Map(x => x.PassHash);
+        Map(x => x.Role);
+        // Add other mappings as needed
+    }
+}

nHibernate/Reports/ReportCRUD.cs

@@ -0,0 +1,222 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate.Expenses;
+using FirmTracker_Server.nHibernate.Transactions;
+using NHibernate;
+using NHibernate.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Transactions;
+namespace FirmTracker_Server.nHibernate.Reports
+{
+    public class ReportCRUD
+    {
+        public Report AddReport(Report report, IList<nHibernate.Transactions.Transaction> transactions, IList<Expense> expenses /*DateTime fromDate, DateTime toDate*/)
+        {
+            using (var session = SessionFactory.OpenSession())
+            using (var sessionTransaction = session.BeginTransaction())
+            {
+                try
+                {
+                    /*var transactions = session.Query<nHibernate.Transactions.Transaction>()
+                        .Where(t => t.Date >= fromDate && t.Date <= toDate)
+                        .ToList();
+
+                    var expenses = session.Query<Expense>()
+                        .Where(e => e.Date >= fromDate && e.Date <= toDate)
+                        .ToList();
+
+                    var totalIncome = transactions.Sum(t => t.TotalPrice);
+                    var totalExpenses = expenses.Sum(e => e.Value);
+                    var totalBalance = totalIncome - totalExpenses;
+
+                    var report = new Report
+                    {
+                        FromDate = fromDate,
+                        ToDate = toDate,
+                        TotalIncome = totalIncome,
+                        TotalExpenses = totalExpenses,
+                        TotalBalance = totalBalance
+
+                    };*/
+
+                    session.Save(report);
+
+                    foreach (var transactionItem in transactions)
+                    {
+                        //var trans = session.Load<nHibernate.Transactions.Transaction>(transactionItem);
+                        var reportTransaction = new ReportTransaction
+                        {
+                            Report = report,
+                            Transaction = transactionItem
+                        };
+                        session.Save(reportTransaction);
+                        //report.ReportTransactions.Add(reportTransaction);
+                        //report.TotalIncome += trans.TotalPrice;
+                    }
+
+                    foreach (var expenseItem in expenses)
+                    {
+                        //var expense = session.Load<Expense>(expenseItem);
+                        var reportExpense = new ReportExpense
+                        {
+                            Report = report,
+                            Expense = expenseItem
+                        };
+                        session.Save(reportExpense);
+                        //report.TotalExpenses += expense.Value;
+                        //report.ReportExpenses.Add(reportExpense);
+                    }
+
+
+                    //session.Save(report);
+                    sessionTransaction.Commit();
+                    return report;
+                }
+                catch
+                {
+                    sessionTransaction.Rollback();
+                    throw;
+                }
+            }
+        }
+
+        public Report GetReport(int reportId)
+        {
+            using (var session = SessionFactory.OpenSession())
+            {
+                return session.Get<Report>(reportId);
+            }
+        }
+
+        public IList<Report> GetAllReports()
+        {
+            using (var session = SessionFactory.OpenSession())
+            {
+                var reports = session.Query<Report>()
+                    .ToList();
+
+                return reports;
+            }
+        }
+
+
+        public IList<nHibernate.Transactions.Transaction> GetReportTransactions(int reportId)
+        {
+            using (var session = SessionFactory.OpenSession())
+            {
+                return session.Query<ReportTransaction>()
+                              .Where(rt => rt.Report.Id == reportId)
+                              .Select(rt => rt.Transaction)
+                              .Fetch(t => t.TransactionProducts)
+                              .ToList();
+            }
+        }
+
+        public IList<Expense> GetReportExpenses(int reportId)
+        {
+            using (var session = SessionFactory.OpenSession())
+            {
+                return session.Query<ReportExpense>()
+                              .Where(re => re.Report.Id == reportId)
+                              .Select(re => re.Expense)
+                              .ToList();
+            }
+        }
+
+        public Report UpdateReport(Report report, IList<nHibernate.Transactions.Transaction> transactions, IList<Expense> expenses)
+        {
+            using (var session = SessionFactory.OpenSession())
+            using (var transaction = session.BeginTransaction())
+            {
+                try
+                {
+                    session.Update(report);
+
+
+                    session.CreateQuery("delete from ReportTransaction where Report.Id = :reportId")
+                           .SetParameter("reportId", report.Id)
+                           .ExecuteUpdate();
+                    session.CreateQuery("delete from ReportExpense where Report.Id = :reportId")
+                           .SetParameter("reportId", report.Id)
+                           .ExecuteUpdate();
+
+                    foreach (var transactionItem in transactions)
+                    {
+                        var reportTransaction = new ReportTransaction
+                        {
+                            Report = report,
+                            Transaction = transactionItem
+                        };
+                        session.Save(reportTransaction);
+                    }
+
+                    foreach (var expenseItem in expenses)
+                    {
+                        var reportExpense = new ReportExpense
+                        {
+                            Report = report,
+                            Expense = expenseItem
+                        };
+                        session.Save(reportExpense);
+                    }
+
+                    transaction.Commit();
+                    return report;
+                }
+                catch
+                {
+                    transaction.Rollback();
+                    throw;
+                }
+            }
+        }
+
+        public void DeleteReport(int reportId)
+        {
+            using (var session = SessionFactory.OpenSession())
+            using (var transaction = session.BeginTransaction())
+            {
+                try
+                {
+                    session.CreateQuery("delete from ReportTransaction where Report.Id = :reportId")
+                           .SetParameter("reportId", reportId)
+                           .ExecuteUpdate();
+                    session.CreateQuery("delete from ReportExpense where Report.Id = :reportId")
+                           .SetParameter("reportId", reportId)
+                           .ExecuteUpdate();
+
+                    var report = session.Get<Report>(reportId);
+                    if (report != null)
+                    {
+                        session.Delete(report);
+                    }
+
+                    transaction.Commit();
+                }
+                catch
+                {
+                    transaction.Rollback();
+                    throw;
+                }
+            }
+        }
+
+    }
+}

nHibernate/Reports/ReportExpense.cs

@@ -0,0 +1,53 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate.Expenses;
+
+namespace FirmTracker_Server.nHibernate.Reports
+{
+    public class ReportExpense
+    {
+        //public virtual int Id { get; set; }
+        public virtual Report Report { get; set; }
+        public virtual Expense Expense { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null || GetType() != obj.GetType())
+            {
+                return false;
+            }
+
+            var other = (ReportExpense)obj;
+            return Report != null && Expense != null &&
+                   Report.Id == other.Report.Id &&
+                   Expense.Id == other.Expense.Id;
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked 
+            {
+                int hash = 17;
+                hash = hash * 23 + (Report?.Id.GetHashCode() ?? 0);
+                hash = hash * 23 + (Expense?.Id.GetHashCode() ?? 0);
+                return hash;
+            }
+        }
+    }
+
+}

nHibernate/Reports/ReportExpenseMapping.cs

@@ -0,0 +1,32 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FluentNHibernate.Mapping;
+
+namespace FirmTracker_Server.nHibernate.Reports
+{
+    public class ReportExpenseMapping : ClassMap<ReportExpense>
+    {
+        public ReportExpenseMapping()
+        {
+            Table("ReportExpenses");
+            CompositeId()
+                .KeyReference(x => x.Report, "ReportId")
+                .KeyReference(x => x.Expense, "ExpenseId");
+        }
+    }
+}

nHibernate/Reports/ReportTransaction.cs

@@ -0,0 +1,53 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.nHibernate.Transactions;
+
+namespace FirmTracker_Server.nHibernate.Reports
+{
+    public class ReportTransaction
+    {
+        //public virtual int Id { get; set; }
+        public virtual Report Report { get; set; }
+        public virtual Transaction Transaction { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null || GetType() != obj.GetType())
+            {
+                return false;
+            }
+
+            var other = (ReportTransaction)obj;
+            return Report != null && Transaction != null &&
+                   Report.Id == other.Report.Id &&
+                   Transaction.Id == other.Transaction.Id;
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked 
+            {
+                int hash = 17;
+                hash = hash * 23 + (Report?.Id.GetHashCode() ?? 0);
+                hash = hash * 23 + (Transaction?.Id.GetHashCode() ?? 0);
+                return hash;
+            }
+        }
+    }
+
+}

nHibernate/Reports/ReportTransactionMapping.cs

@@ -0,0 +1,32 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FluentNHibernate.Mapping;
+
+namespace FirmTracker_Server.nHibernate.Reports
+{
+    public class ReportTransactionMapping : ClassMap<ReportTransaction>
+    {
+        public ReportTransactionMapping()
+        {
+            Table("ReportTransactions");
+            CompositeId()
+                .KeyReference(x => x.Report, "ReportId")
+                .KeyReference(x => x.Transaction, "TransactionId");
+        }
+    }
+}

nHibernate/Transactions/Transaction.cs

@@ -1,6 +1,8 @@
 using FirmTracker_Server.nHibernate.Products;
+using FirmTracker_Server.nHibernate.Reports;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
 namespace FirmTracker_Server.nHibernate.Transactions
@@ -8,6 +10,7 @@ namespace FirmTracker_Server.nHibernate.Transactions
     public class Transaction
     {
         public virtual int Id { get; set; }
+        [DataType(DataType.DateTime)]
         public virtual DateTime Date { get; set; }
         public virtual int EmployeeId { get; set; }
         public virtual IList<TransactionProduct> TransactionProducts { get; set; } = new List<TransactionProduct>();

nHibernate/Transactions/Transaction2.cs

@@ -1,6 +1,8 @@
 using FirmTracker_Server.nHibernate.Products;
+using FirmTracker_Server.nHibernate.Reports;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
 namespace FirmTracker_Server.nHibernate.Transactions
@@ -8,6 +10,7 @@ namespace FirmTracker_Server.nHibernate.Transactions
     public class Transaction2
     {
         public virtual int Id { get; set; }
+        [DataType(DataType.DateTime)]
         public virtual DateTime Date { get; set; }
         public virtual int EmployeeId { get; set; }
         public virtual IList<TransactionWithProducts> TransactionProducts { get; set; } = new List<TransactionWithProducts>();

nHibernate/Transactions/Transaction2Mapping.cs

@@ -13,11 +13,13 @@ namespace FirmTracker_Server.nHibernate.Transactions
             Map(x => x.PaymentType);
             Map(x => x.Discount);
             Map(x => x.Description);
+            Map(x => x.TotalPrice).Precision(18).Scale(2);
 
             HasMany(x => x.TransactionProducts)
                 .KeyColumn("TransactionId")
                 .Cascade.AllDeleteOrphan()
-                .Inverse(); // Ustawienie Inverse() wskazuje, że to `TransactionProduct` jest właścicielem relacji
+                .Inverse();
+
         }
     }
 }

nHibernate/Transactions/TransactionCRUD.cs

@@ -1,5 +1,7 @@
 using FirmTracker_Server.nHibernate.Products;
+using FirmTracker_Server.nHibernate.Reports;
 using NHibernate;
+using NHibernate.Criterion;
 using NHibernate.Linq;
 using System;
 using System.Collections.Generic;
@@ -19,10 +21,20 @@ namespace FirmTracker_Server.nHibernate.Transactions
                 {
                     foreach (var transactionProduct in transaction.TransactionProducts)
                     {
-                        
+                        var product = session.Get<Product>(transactionProduct.ProductID);
+                        if (product.Type != 0)
+                        {
+                            transaction.TotalPrice += ((transactionProduct.Quantity * product.Price) * ((1 - (transaction.Discount / 100))));
+                        }
+                        else
+                        {
+                            transaction.TotalPrice += (product.Price) * ((1 - (transaction.Discount / 100)));
+                        }
                         transactionProduct.TransactionId = transaction.Id;
+
                         session.Save(transactionProduct);
                     }
+                    transaction.TotalPrice = Math.Round(transaction.TotalPrice, 2, MidpointRounding.AwayFromZero);
                     session.Save(transaction);
 
                     // Decrease product quantities based on transaction
@@ -76,12 +88,39 @@ namespace FirmTracker_Server.nHibernate.Transactions
             {
                 try
                 {
+
+                    var oldTransaction = session.Get<Transaction>(transaction.Id);
+                    foreach (var tp in oldTransaction.TransactionProducts)
+                    {
+                        var product = session.Get<Product>(tp.ProductID);
+                        
+                        if (product.Type != 0)
+                        {
+                            product.Availability += tp.Quantity;
+                        }
+                        session.Update(product);
+                    }
+                    session.Flush();
+                    session.Clear();
+
+                    transaction.TotalPrice = 0;
+
                     foreach (var transactionProduct in transaction.TransactionProducts)
                     {
+                        var product = session.Get<Product>(transactionProduct.ProductID);
+                        if (product.Type != 0)
+                        {
+                            transaction.TotalPrice += ((transactionProduct.Quantity * product.Price) * ((1 - (transaction.Discount / 100))));
+                        }
+                        else
+                        {
+                            transaction.TotalPrice += (product.Price) * ((1 - (transaction.Discount / 100)));
+                        }
 
                         transactionProduct.TransactionId = transaction.Id;
-                        session.Update(transactionProduct);
+                        session.SaveOrUpdate(transactionProduct);
                     }
+                    transaction.TotalPrice = Math.Round(transaction.TotalPrice, 2, MidpointRounding.AwayFromZero);
                     session.Update(transaction);
 
                     // Decrease product quantities based on transaction
@@ -90,12 +129,19 @@ namespace FirmTracker_Server.nHibernate.Transactions
 
                         var product = session.Get<Product>(transactionProduct.ProductID);
                         if (product.Type != 0)
+                        {
+                            if (transactionProduct.Quantity > product.Availability)
+                            {
+                                throw new InvalidOperationException($"Nie można dodać {product.Name} do transakcji. Dostępność: {product.Availability}, Zażądano: {transactionProduct.Quantity}");
+                            }
+                            else
                             {
                                 product.Availability -= transactionProduct.Quantity;
                                 session.Update(product);
                             }
-                    }
 
+                        }
+                    }
                     sessionTransaction.Commit();
                 }
                 catch
@@ -133,6 +179,24 @@ namespace FirmTracker_Server.nHibernate.Transactions
                     var transaction = session.Get<Transaction>(transactionId);
                     if (transaction != null)
                     {
+                        var criteria = session.CreateCriteria<ReportTransaction>();
+                        criteria.Add(Restrictions.Eq("Transaction.Id", transactionId));
+                        var reportTransactions = criteria.List<ReportTransaction>();
+
+                        if (reportTransactions.Any())
+                        {
+                            throw new InvalidOperationException("Nie można usunąć transakcji. Transakcja jest ujęta w co najmniej jednym z raportów.");
+                        }
+
+                        foreach (var transactionProduct in transaction.TransactionProducts)
+                        {
+                            var product = session.Get<Product>(transactionProduct.ProductID);
+                            if (product.Type != 0)
+                            {
+                                product.Availability += transactionProduct.Quantity;
+                                session.Update(product);
+                            }
+                        }
                         session.Delete(transaction);
                         t.Commit();
                     }
@@ -154,17 +218,28 @@ namespace FirmTracker_Server.nHibernate.Transactions
                     var transactionToUpdate = session.Get<Transaction>(transactionId);
                     if (transactionToUpdate != null)
                     {
+                        var product = session.Get<Product>(transactionProduct.ProductID);
+                        if (product.Type != 0)
+                        {
+                            transactionToUpdate.TotalPrice += ((transactionProduct.Quantity * product.Price) * ((1 - (transactionToUpdate.Discount / 100))));
+                        }
+                        else
+                        {
+                            transactionToUpdate.TotalPrice += (product.Price) * ((1 - (transactionToUpdate.Discount / 100)));
+                        }
+
                         transactionProduct.TransactionId= transactionToUpdate.Id;
                         session.Save(transactionProduct);
-                        transaction.Commit();
 
-                        var product = session.Get<Product>(transactionProduct.ProductID);
+                        transactionToUpdate.TotalPrice = Math.Round(transactionToUpdate.TotalPrice, 2, MidpointRounding.AwayFromZero);
+                        session.Update(transactionToUpdate);
+                        //var product = session.Get<Product>(transactionProduct.ProductID);
                         if (product.Type != 0)
                         {
                             product.Availability -= transactionProduct.Quantity;
                             session.Update(product);
                         }
-                        
+                        transaction.Commit();
                     }
                     else
                     {

nHibernate/Transactions/TransactionMapping.cs

@@ -13,11 +13,13 @@ namespace FirmTracker_Server.nHibernate.Transactions
             Map(x => x.PaymentType);
             Map(x => x.Discount);
             Map(x => x.Description);
+            Map(x => x.TotalPrice).Precision(18).Scale(2);
 
             HasMany(x => x.TransactionProducts)
                 .KeyColumn("TransactionId")
                 .Cascade.AllDeleteOrphan()
-                .Inverse(); // Ustawienie Inverse() wskazuje, że to `TransactionProduct` jest właścicielem relacji
+                .Inverse();
+
         }
     }
 }

nHibernate/Transactions/TransactionProduct.cs

@@ -9,6 +9,7 @@ namespace FirmTracker_Server.nHibernate.Transactions
         public virtual int Id { get; set; }
         public virtual int TransactionId { get;  set; }
         public virtual int ProductID { get; set; }
+        public virtual string ProductName { get; set; }
         public virtual int Quantity { get; set; }
     }
 }