Compare commits
No commits in common. "master" and "PI2024-23" have entirely different histories.
@ -1,9 +0,0 @@
|
||||
namespace FirmTracker_Server.Authentication
|
||||
{
|
||||
public class AuthenticationSettings
|
||||
{
|
||||
public string JwtSecKey { get; set; }
|
||||
public int JwtExpireDays { get; set; }
|
||||
public string JwtIssuer { get; set; }
|
||||
}
|
||||
}
|
||||
@ -17,13 +17,11 @@
|
||||
|
||||
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;
|
||||
@ -36,7 +34,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpPost]
|
||||
[ProducesResponseType(201)] // Created
|
||||
[ProducesResponseType(400)] // Bad Request
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult CreateExpense([FromBody] Expense expense) {
|
||||
try
|
||||
{
|
||||
@ -62,7 +59,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpGet("{id}")]
|
||||
[ProducesResponseType(200)] // Created
|
||||
[ProducesResponseType(404)] // Bad Request
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult GetExpense(int id)
|
||||
{
|
||||
var expense = _expenseCrud.GetExpense(id);
|
||||
@ -77,7 +73,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpPut("{id}")]
|
||||
[ProducesResponseType(204)]
|
||||
[ProducesResponseType(400)]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult UpdateExpense(int id, [FromBody] Expense expense)
|
||||
{
|
||||
try
|
||||
@ -108,7 +103,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpDelete("{id}")]
|
||||
[ProducesResponseType(204)]
|
||||
[ProducesResponseType(404)]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult DeleteExpense(int id)
|
||||
{
|
||||
try
|
||||
@ -129,7 +123,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpGet]
|
||||
[ProducesResponseType(200)]
|
||||
[ProducesResponseType(400)]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult GetAllExpenses()
|
||||
{
|
||||
try
|
||||
|
||||
@ -1,253 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using FirmTracker_Server.nHibernate;
|
||||
using FirmTracker_Server.nHibernate.Expenses;
|
||||
using FirmTracker_Server.nHibernate.Transactions;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using QuestPDF.Fluent;
|
||||
using QuestPDF.Helpers;
|
||||
using QuestPDF.Infrastructure;
|
||||
|
||||
namespace FirmTracker_Server.Controllers
|
||||
{
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
[Authorize]
|
||||
public class PdfController : ControllerBase
|
||||
{
|
||||
private readonly IExpenseRepository _expenseRepository;
|
||||
private readonly ITransactionRepository _transactionRepository;
|
||||
|
||||
public PdfController(IExpenseRepository expenseRepository, ITransactionRepository transactionRepository)
|
||||
{
|
||||
_expenseRepository = expenseRepository;
|
||||
_transactionRepository = transactionRepository;
|
||||
}
|
||||
|
||||
[HttpGet("download")]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult DownloadReport(
|
||||
[FromQuery] string reportType, // "expenses" or "transactions"
|
||||
[FromQuery] DateTime? startDate,
|
||||
[FromQuery] DateTime? endDate)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Validate date inputs and set default values
|
||||
DateTime start = startDate ?? DateTime.MinValue;
|
||||
DateTime end = endDate ?? DateTime.MaxValue;
|
||||
|
||||
// Validate report type
|
||||
if (string.IsNullOrEmpty(reportType) ||
|
||||
(reportType.ToLower() != "expenses" && reportType.ToLower() != "transactions"))
|
||||
{
|
||||
return BadRequest("Invalid report type. Please specify 'expenses' or 'transactions'.");
|
||||
}
|
||||
|
||||
if (reportType.ToLower() == "expenses")
|
||||
{
|
||||
return GenerateExpenseReport(start, end);
|
||||
}
|
||||
else
|
||||
{
|
||||
return GenerateTransactionReport(start, end);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, $"Internal server error: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
private IActionResult GenerateExpenseReport(DateTime start, DateTime end)
|
||||
{
|
||||
var expenses = _expenseRepository.GetAllExpenses()
|
||||
.Where(e => e.Date >= start && e.Date <= end)
|
||||
.ToList();
|
||||
|
||||
if (!expenses.Any())
|
||||
{
|
||||
return BadRequest($"No expenses found between {start:yyyy-MM-dd} and {end:yyyy-MM-dd}.");
|
||||
}
|
||||
|
||||
var pdfBytes = GenerateExpensePdf(expenses, start, end);
|
||||
string fileName = $"ExpenseReport_{start:yyyy-MM-dd}_to_{end:yyyy-MM-dd}.pdf";
|
||||
return File(pdfBytes, "application/pdf", fileName);
|
||||
}
|
||||
|
||||
private IActionResult GenerateTransactionReport(DateTime start, DateTime end)
|
||||
{
|
||||
var transactions = _transactionRepository.GetTransactionsByDateRange(start, end);
|
||||
|
||||
if (!transactions.Any())
|
||||
{
|
||||
return BadRequest($"No transactions found between {start:yyyy-MM-dd} and {end:yyyy-MM-dd}.");
|
||||
}
|
||||
|
||||
// Fetch transaction products for all transactions in one query
|
||||
var transactionIds = transactions.Select(t => t.Id).ToList();
|
||||
var transactionProducts = _transactionRepository.GetTransactionProductsForTransactions(transactionIds);
|
||||
|
||||
var pdfBytes = GenerateTransactionPdf(transactions, transactionProducts, start, end);
|
||||
string fileName = $"TransactionReport_{start:yyyy-MM-dd}_to_{end:yyyy-MM-dd}.pdf";
|
||||
return File(pdfBytes, "application/pdf", fileName);
|
||||
}
|
||||
|
||||
private byte[] GenerateTransactionPdf(List<Transaction> transactions, List<TransactionProduct> transactionProducts, DateTime startDate, DateTime endDate)
|
||||
{
|
||||
using (var ms = new MemoryStream())
|
||||
{
|
||||
Document.Create(container =>
|
||||
{
|
||||
container.Page(page =>
|
||||
{
|
||||
page.Size(PageSizes.A4);
|
||||
page.Margin(2, Unit.Centimetre);
|
||||
page.PageColor(Colors.White);
|
||||
page.DefaultTextStyle(x => x.FontSize(12));
|
||||
|
||||
// Main header
|
||||
page.Header()
|
||||
.Text("Raport transakcji")
|
||||
.FontSize(20)
|
||||
.SemiBold()
|
||||
.AlignCenter();
|
||||
|
||||
// Summary section
|
||||
page.Content().PaddingVertical(1, Unit.Centimetre).Column(column =>
|
||||
{
|
||||
column.Spacing(10);
|
||||
|
||||
column.Item().Text($"Transakcje od ({startDate:yyyy-MM-dd} do {endDate:yyyy-MM-dd})")
|
||||
.FontSize(16).Underline();
|
||||
|
||||
// Add table header
|
||||
column.Item().Row(row =>
|
||||
{
|
||||
row.RelativeItem().Text("Data").SemiBold();
|
||||
row.RelativeItem().Text("Typ płatności").SemiBold();
|
||||
row.RelativeItem().Text("Kwota razem").SemiBold();
|
||||
row.RelativeItem().Text("Rabat").SemiBold();
|
||||
row.RelativeItem().Text("Opis").SemiBold();
|
||||
});
|
||||
|
||||
// Populate table rows with transaction data
|
||||
foreach (var transaction in transactions)
|
||||
{
|
||||
column.Item().Row(row =>
|
||||
{
|
||||
row.RelativeItem().Text(transaction.Date.ToString("yyyy-MM-dd"));
|
||||
row.RelativeItem().Text(transaction.PaymentType);
|
||||
row.RelativeItem().Text(transaction.TotalPrice.ToString("C"));
|
||||
row.RelativeItem().Text(transaction.Discount.ToString("C"));
|
||||
row.RelativeItem().Text(transaction.Description);
|
||||
});
|
||||
|
||||
// Fetch and display transaction products for this transaction
|
||||
var products = transactionProducts
|
||||
.Where(tp => tp.TransactionId == transaction.Id)
|
||||
.ToList();
|
||||
|
||||
if (products.Any())
|
||||
{
|
||||
column.Item().Text("Produkty:").SemiBold();
|
||||
foreach (var product in products)
|
||||
{
|
||||
column.Item().Row(productRow =>
|
||||
{
|
||||
productRow.RelativeItem().Text($"Nazwa produktu: {product.ProductName}");
|
||||
productRow.RelativeItem().Text($"Ilość: {product.Quantity}");
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Footer with generation date
|
||||
page.Footer()
|
||||
.AlignCenter()
|
||||
.Text(text =>
|
||||
{
|
||||
text.Span("Wygenerowano przez automat FT: ");
|
||||
text.Span(DateTime.Now.ToString("yyyy-MM-dd")).SemiBold();
|
||||
});
|
||||
});
|
||||
}).GeneratePdf(ms);
|
||||
|
||||
return ms.ToArray();
|
||||
}
|
||||
}
|
||||
|
||||
private byte[] GenerateExpensePdf(List<Expense> expenses, DateTime startDate, DateTime endDate)
|
||||
{
|
||||
using (var ms = new MemoryStream())
|
||||
{
|
||||
decimal totalExpenses = expenses.Sum(e => e.Value);
|
||||
decimal averageExpense = expenses.Any() ? totalExpenses / expenses.Count : 0;
|
||||
|
||||
Document.Create(container =>
|
||||
{
|
||||
container.Page(page =>
|
||||
{
|
||||
page.Size(PageSizes.A4);
|
||||
page.Margin(2, Unit.Centimetre);
|
||||
page.PageColor(Colors.White);
|
||||
page.DefaultTextStyle(x => x.FontSize(12));
|
||||
|
||||
// Main header
|
||||
page.Header()
|
||||
.Text("Raport wydatków")
|
||||
.FontSize(20)
|
||||
.SemiBold()
|
||||
.AlignCenter();
|
||||
|
||||
// Summary section
|
||||
page.Content().PaddingVertical(1, Unit.Centimetre).Column(column =>
|
||||
{
|
||||
column.Spacing(10);
|
||||
|
||||
column.Item().Row(row =>
|
||||
{
|
||||
row.RelativeItem().Text($"Łączne wydatki: {totalExpenses:C}").FontSize(14).Bold();
|
||||
row.RelativeItem().Text($"Średnie wydatki dzienne: {averageExpense:C}").FontSize(14).Bold();
|
||||
});
|
||||
|
||||
column.Item().Text($"Szczegóły wydatków od ({startDate:yyyy-MM-dd} do {endDate:yyyy-MM-dd})")
|
||||
.FontSize(16).Underline();
|
||||
|
||||
column.Item().Row(row =>
|
||||
{
|
||||
row.RelativeItem().Text("Data").SemiBold();
|
||||
row.RelativeItem().Text("Kwota").SemiBold();
|
||||
row.RelativeItem().Text("Opis").SemiBold();
|
||||
});
|
||||
|
||||
foreach (var expense in expenses)
|
||||
{
|
||||
column.Item().Row(row =>
|
||||
{
|
||||
row.RelativeItem().Text(expense.Date.ToString("yyyy-MM-dd"));
|
||||
row.RelativeItem().Text(expense.Value.ToString("C"));
|
||||
row.RelativeItem().Text(expense.Description);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
page.Footer()
|
||||
.AlignCenter()
|
||||
.Text(text =>
|
||||
{
|
||||
text.Span("Wygenerowano przez automat FT: ");
|
||||
text.Span(DateTime.Now.ToString("yyyy-MM-dd")).SemiBold();
|
||||
});
|
||||
});
|
||||
}).GeneratePdf(ms);
|
||||
|
||||
return ms.ToArray();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -16,8 +16,6 @@
|
||||
*/
|
||||
|
||||
using FirmTracker_Server.nHibernate.Products;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Authorization.Infrastructure;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using System;
|
||||
|
||||
@ -25,7 +23,6 @@ namespace FirmTracker_Server.Controllers
|
||||
{
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
[Authorize]
|
||||
public class ProductsController : ControllerBase
|
||||
{
|
||||
private readonly ProductCRUD _productCrud;
|
||||
@ -42,7 +39,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpPost]
|
||||
[ProducesResponseType(200)] // Created
|
||||
[ProducesResponseType(400)] // Bad Request
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult CreateProduct([FromBody] Product product)
|
||||
{
|
||||
try
|
||||
@ -81,7 +77,6 @@ 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);
|
||||
@ -93,7 +88,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpGet("name/{name}")]
|
||||
[ProducesResponseType(200)]
|
||||
[ProducesResponseType(404)]
|
||||
[Authorize(Roles = Roles.Admin + "," + Roles.User)]
|
||||
public IActionResult GetProductByName(string name)
|
||||
{
|
||||
var product = _productCrud.GetProductByName(name);
|
||||
@ -106,7 +100,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpPut("{id}")]
|
||||
[ProducesResponseType(200)] // Created
|
||||
[ProducesResponseType(400)] // Bad Request
|
||||
[Authorize(Roles = Roles.Admin + "," + Roles.User)]
|
||||
public IActionResult UpdateProduct(int id, [FromBody] Product product)
|
||||
{
|
||||
try
|
||||
@ -148,7 +141,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpDelete("{id}")]
|
||||
[ProducesResponseType(200)] // Created
|
||||
[ProducesResponseType(400)] // Bad Request
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult DeleteProduct(int id)
|
||||
{
|
||||
try
|
||||
@ -170,7 +162,6 @@ 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();
|
||||
|
||||
@ -24,14 +24,12 @@ 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;
|
||||
@ -45,7 +43,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpPost]
|
||||
[ProducesResponseType(201)] //Created
|
||||
[ProducesResponseType(400)] //Bad request
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult CreateReport([FromBody] Report.DateRangeDto dateRange)
|
||||
{
|
||||
try
|
||||
@ -121,7 +118,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpGet("{id}")]
|
||||
[ProducesResponseType(200)]
|
||||
[ProducesResponseType(404)]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult GetReport(int id)
|
||||
{
|
||||
var report = _reportCRUD.GetReport(id);
|
||||
@ -140,7 +136,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpGet("{id}/transactions")]
|
||||
[ProducesResponseType(200)]
|
||||
[ProducesResponseType(404)]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult GetReportTransactions(int id)
|
||||
{
|
||||
var transactions = _reportCRUD.GetReportTransactions(id);
|
||||
@ -154,7 +149,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpGet("{id}/expenses")]
|
||||
[ProducesResponseType(200)]
|
||||
[ProducesResponseType(404)]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult GetReportExpenses(int id)
|
||||
{
|
||||
var expenses = _reportCRUD.GetReportExpenses(id);
|
||||
@ -169,7 +163,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpGet]
|
||||
[ProducesResponseType(200)]
|
||||
[ProducesResponseType(404)]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult GetAllReports()
|
||||
{
|
||||
var reports = _reportCRUD.GetAllReports();
|
||||
@ -183,7 +176,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[ProducesResponseType(204)]
|
||||
[ProducesResponseType(400)]
|
||||
[ProducesResponseType(404)]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult UpdateReport(int id, [FromBody] Report.DateRangeDto dateRange)
|
||||
{
|
||||
try
|
||||
@ -252,7 +244,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpDelete("{id}")]
|
||||
[ProducesResponseType(204)]
|
||||
[ProducesResponseType(404)]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public IActionResult DeleteReport(int id)
|
||||
{
|
||||
try
|
||||
|
||||
@ -24,13 +24,11 @@ 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;
|
||||
@ -50,26 +48,18 @@ 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
|
||||
{
|
||||
|
||||
|
||||
foreach (var product in transaction.TransactionProducts)
|
||||
{
|
||||
// Validate if the product quantity is positive
|
||||
if (product.Quantity <= 0)
|
||||
{
|
||||
return BadRequest($"Ilość na produktu {product.ProductName} musi być dodatnia.");
|
||||
}
|
||||
var productByName = _productCRUD.GetProductByName(product.ProductName);
|
||||
if (productByName == null)
|
||||
{
|
||||
throw new InvalidOperationException($"Produkt o nazwie {product.ProductName} nie istnieje.");
|
||||
}
|
||||
|
||||
|
||||
product.ProductID = productByName.Id;
|
||||
product.TransactionId = transaction.Id;
|
||||
|
||||
@ -116,7 +106,6 @@ 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);
|
||||
@ -129,7 +118,6 @@ 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)
|
||||
@ -139,11 +127,6 @@ namespace FirmTracker_Server.Controllers
|
||||
{
|
||||
foreach (var product in transaction.TransactionProducts)
|
||||
{
|
||||
// Validate if the product quantity is positive
|
||||
if (product.Quantity <= 0)
|
||||
{
|
||||
return BadRequest($"Sprzedawana ilość produktu {product.ProductName} musi być ilością dodatnią.");
|
||||
}
|
||||
var productByName = _productCRUD.GetProductByName(product.ProductName);
|
||||
if (productByName == null)
|
||||
{
|
||||
@ -177,7 +160,6 @@ namespace FirmTracker_Server.Controllers
|
||||
[HttpDelete("{id}")]
|
||||
[ProducesResponseType(StatusCodes.Status204NoContent)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
[Authorize(Roles = Roles.Admin + "," + Roles.User)]
|
||||
public IActionResult DeleteTransaction(int id)
|
||||
{
|
||||
try
|
||||
@ -200,7 +182,6 @@ 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();
|
||||
@ -219,27 +200,5 @@ namespace FirmTracker_Server.Controllers
|
||||
return Ok(transactions);
|
||||
}
|
||||
|
||||
// DELETE: api/Transaction/5/product/10
|
||||
[HttpDelete("{transactionId}/product/{productId}")]
|
||||
[ProducesResponseType(StatusCodes.Status204NoContent)]
|
||||
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
[Authorize(Roles = Roles.Admin + "," + Roles.User)]
|
||||
public IActionResult DeleteTransactionProduct(int transactionId, int productId)
|
||||
{
|
||||
try
|
||||
{
|
||||
_transactionCRUD.DeleteTransactionProduct(transactionId, productId);
|
||||
return NoContent(); // Successfully removed the product
|
||||
}
|
||||
catch (InvalidOperationException ioe)
|
||||
{
|
||||
return BadRequest(ioe.Message); // If the transaction or product isn't found
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return NotFound(ex.Message); // Other general errors
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
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);
|
||||
}
|
||||
[HttpGet("emails")]
|
||||
[Authorize(Roles = Roles.Admin)]
|
||||
public ActionResult<IEnumerable<string>> GetAllUserEmails()
|
||||
{
|
||||
var emails = UserService.GetAllUserEmails();
|
||||
if (emails == null || !emails.Any())
|
||||
{
|
||||
return NotFound("No users found or unable to retrieve emails.");
|
||||
}
|
||||
|
||||
return Ok(emails);
|
||||
}
|
||||
// New method to get all users
|
||||
/* [HttpGet("all")]
|
||||
[AllowAnonymous]
|
||||
public ActionResult<IList<User>> GetAllUsers()
|
||||
{
|
||||
var users = UserService.GetAllUsers();
|
||||
return Ok(users);
|
||||
}*/
|
||||
}
|
||||
}
|
||||
@ -1,132 +0,0 @@
|
||||
/*
|
||||
* 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.Entities;
|
||||
using FirmTracker_Server.Models;
|
||||
using FirmTracker_Server.nHibernate;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using System;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace FirmTracker_Server.Controllers
|
||||
{
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
[Authorize]
|
||||
public class WorkdayController : ControllerBase
|
||||
{
|
||||
private readonly WorkdayRepository _workdayCRUD;
|
||||
|
||||
public WorkdayController()
|
||||
{
|
||||
_workdayCRUD = new WorkdayRepository();
|
||||
}
|
||||
|
||||
// Endpoint to start a workday
|
||||
[HttpPost("start")]
|
||||
[Authorize(Roles = Roles.Admin + "," + Roles.User)]
|
||||
public IActionResult StartWorkday()
|
||||
{
|
||||
try
|
||||
{
|
||||
var userIdString = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value;
|
||||
int userId = int.Parse(userIdString);
|
||||
|
||||
// Attempt to start a new workday
|
||||
_workdayCRUD.StartWorkday(userId);
|
||||
return Ok(new { status = "started", userId });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// If there's an error (like previous workday not stopped), handle it
|
||||
return BadRequest(new { message = "An error occurred while starting the workday.", error = ex.Message });
|
||||
}
|
||||
}
|
||||
// Endpoint to stop a workday
|
||||
[HttpPost("stop")]
|
||||
[Authorize(Roles = Roles.Admin + "," + Roles.User)]
|
||||
public IActionResult StopWorkday()
|
||||
{
|
||||
try
|
||||
{
|
||||
var userIdString = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value;
|
||||
int userId = int.Parse(userIdString);
|
||||
|
||||
var result = _workdayCRUD.StopWorkday(userId);
|
||||
return Ok(new { status = result ? "stopped" : "already stopped", userId });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new { message = "An error occurred while stopping the workday.", error = ex.Message });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Endpoint to get all workdays for a user
|
||||
[HttpGet("user/{userMail}/workdays")]
|
||||
[Authorize(Roles = Roles.Admin + "," + Roles.User)]
|
||||
public IActionResult GetWorkdays(string userMail)
|
||||
{
|
||||
try
|
||||
{
|
||||
var workdays = _workdayCRUD.GetWorkdaysByUser(userMail);
|
||||
return Ok(workdays);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new { message = "An error occurred while fetching workdays.", error = ex.Message });
|
||||
}
|
||||
}
|
||||
[HttpPost("absence/add")]
|
||||
[Authorize(Roles = Roles.Admin + "," + Roles.User)]
|
||||
public IActionResult AddAbsence([FromBody] AddAbsenceDto dto)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrEmpty(dto.userEmail))
|
||||
{
|
||||
return BadRequest(new { message = "User email must be provided." });
|
||||
}
|
||||
|
||||
// Fetch the userId based on the provided email
|
||||
int userId;
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
var user = session.Query<User>().FirstOrDefault(u => u.Email == dto.userEmail);
|
||||
if (user == null)
|
||||
{
|
||||
return NotFound(new { message = "User with the given email not found." });
|
||||
}
|
||||
userId = user.UserId;
|
||||
}
|
||||
|
||||
// Add the absence for the retrieved userId
|
||||
_workdayCRUD.AddAbsence(userId, dto.AbsenceType, dto.StartTime, dto.EndTime);
|
||||
|
||||
return Ok(new { status = "added", userId, dto.userEmail, absenceType = dto.AbsenceType });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new { message = "An error occurred while adding the absence.", error = ex.Message });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
37
Dockerfile
37
Dockerfile
@ -1,37 +0,0 @@
|
||||
# Step 1: Use the official .NET SDK image to build the app
|
||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
||||
WORKDIR /src
|
||||
|
||||
# Copy the project file and restore dependencies
|
||||
COPY ["FirmTracker-Server.csproj", "FirmTracker-Server/"]
|
||||
RUN dotnet restore "FirmTracker-Server/FirmTracker-Server.csproj"
|
||||
|
||||
# Copy the rest of the application code
|
||||
WORKDIR "/src/FirmTracker-Server"
|
||||
COPY . .
|
||||
|
||||
|
||||
# Copy the szyfrowanie.dll into the build directory (to ensure it's available during the build)
|
||||
COPY ["szyfrowanie.dll", "./"]
|
||||
|
||||
# Build the app
|
||||
RUN dotnet build "FirmTracker-Server.csproj" -c Release -o /app/build
|
||||
|
||||
# Step 2: Publish the app
|
||||
FROM build AS publish
|
||||
RUN dotnet publish "FirmTracker-Server.csproj" -c Release -o /app/publish
|
||||
|
||||
# Step 3: Create the final image using a runtime-only image
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
|
||||
WORKDIR /app
|
||||
EXPOSE 80
|
||||
EXPOSE 443
|
||||
|
||||
# Copy the published app from the previous stage
|
||||
COPY --from=publish /app/publish .
|
||||
|
||||
# Copy the szyfrowanie.dll to the final image (if needed at runtime)
|
||||
COPY ["szyfrowanie.dll", "./"]
|
||||
|
||||
# Set the entry point for the container
|
||||
ENTRYPOINT ["dotnet", "FirmTracker-Server.dll"]
|
||||
@ -1,12 +0,0 @@
|
||||
namespace FirmTracker_Server.Entities
|
||||
{
|
||||
public class User
|
||||
{
|
||||
public virtual int UserId { 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; }
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
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) { }
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
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) { }
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
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) { }
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>FirmTracker_Server</RootNamespace>
|
||||
@ -17,28 +17,13 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<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="FluentNHibernate" Version="3.3.0" />
|
||||
<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.2" />
|
||||
<PackageReference Include="NLog" Version="5.3.4" />
|
||||
<PackageReference Include="NLog.Database" Version="5.3.4" />
|
||||
<PackageReference Include="NHibernate" Version="5.5.1" />
|
||||
<PackageReference Include="NSwag.Annotations" Version="14.0.7" />
|
||||
<PackageReference Include="QuestPDF" Version="2024.10.3" />
|
||||
<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>./szyfrowanie.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
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";
|
||||
}
|
||||
}
|
||||
27
JenkinsFile
27
JenkinsFile
@ -1,27 +0,0 @@
|
||||
pipeline {
|
||||
agent any
|
||||
environment {
|
||||
IMG_NAME = 'firmtracker-server'
|
||||
DOCKER_REPO = 'maciejm0101/firmtracker'
|
||||
}
|
||||
stages {
|
||||
stage('build') {
|
||||
steps {
|
||||
script {
|
||||
sh 'docker build -t ${IMG_NAME} .'
|
||||
sh 'docker tag ${IMG_NAME} ${DOCKER_REPO}:${IMG_NAME}'
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('push') {
|
||||
steps {
|
||||
withCredentials([usernamePassword(credentialsId: 'DockerHub-LG', passwordVariable: 'PSWD', usernameVariable: 'LOGIN')]) {
|
||||
script {
|
||||
sh 'echo ${PSWD} | docker login -u ${LOGIN} --password-stdin'
|
||||
sh 'docker push ${DOCKER_REPO}:${IMG_NAME}'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
75
Logger.cs
75
Logger.cs
@ -1,75 +0,0 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
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());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
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.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
namespace FirmTracker_Server.Models
|
||||
{
|
||||
public class AddAbsenceDto
|
||||
{
|
||||
public string userEmail { get; set; }
|
||||
public string AbsenceType { get; set; } // e.g., "Sick", "Vacation", etc.
|
||||
public DateTime StartTime { get; set; }
|
||||
public DateTime EndTime { get; set; }
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
using FirmTracker_Server.Controllers;
|
||||
|
||||
namespace FirmTracker_Server.Models
|
||||
{
|
||||
public class EmployeeDto
|
||||
{
|
||||
public virtual int Id { get; set; }
|
||||
public virtual string email { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
namespace FirmTracker_Server.Models
|
||||
{
|
||||
public class LoginDto
|
||||
{
|
||||
public string Email { get; set; }
|
||||
public string Password { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
namespace FirmTracker_Server.Models
|
||||
{
|
||||
public class UpdateAbsenceDto
|
||||
{
|
||||
public string NewAbsenceType { get; set; } // e.g., "Sick", "Vacation", etc.
|
||||
public DateTime NewStartTime { get; set; }
|
||||
public DateTime NewEndTime { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
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; }
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
using FirmTracker_Server.Entities;
|
||||
using System;
|
||||
|
||||
namespace YourNamespace.Models
|
||||
{
|
||||
public class Workday
|
||||
{
|
||||
public virtual int Id { get; set; }
|
||||
public virtual DateTime? StartTime { get; set; }
|
||||
public virtual DateTime? EndTime { get; set; }
|
||||
public TimeSpan WorkedHours { get; set; }
|
||||
// Many-to-One relationship to the User entity
|
||||
public virtual User User { get; set; }
|
||||
}
|
||||
}
|
||||
90
Program.cs
90
Program.cs
@ -24,32 +24,16 @@ 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;
|
||||
using NuGet.Packaging;
|
||||
|
||||
|
||||
|
||||
namespace FirmTracker_Server
|
||||
{
|
||||
internal static class Program
|
||||
public class Program
|
||||
{
|
||||
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
string appDirectory = Directory.GetCurrentDirectory();
|
||||
string appDirectory = Directory.GetCurrentDirectory();
|
||||
string configFilePath = Path.Combine(appDirectory, "appsettings.json");
|
||||
string connectionString = "";
|
||||
if (File.Exists(configFilePath))
|
||||
@ -61,7 +45,7 @@ namespace FirmTracker_Server
|
||||
var connectionstringsection = config.GetSection("AppSettings:ConnectionString");
|
||||
|
||||
connectionString = connectionstringsection.Value;
|
||||
//Console.WriteLine(connectionString);
|
||||
|
||||
SessionFactory.Init(connectionString);
|
||||
}
|
||||
else
|
||||
@ -71,8 +55,6 @@ namespace FirmTracker_Server
|
||||
|
||||
TestClass test = new TestClass();
|
||||
test.AddTestProduct();
|
||||
QuestPDF.Settings.License = QuestPDF.Infrastructure.LicenseType.Community;
|
||||
|
||||
builder.Services.AddCors(options =>
|
||||
{
|
||||
options.AddPolicy("AllowSpecificOrigin",
|
||||
@ -80,42 +62,37 @@ namespace FirmTracker_Server
|
||||
.AllowAnyHeader()
|
||||
.AllowAnyMethod());
|
||||
});
|
||||
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(c =>
|
||||
{
|
||||
c.SchemaFilter<SwaggerDateTimeSchemaFilter>();
|
||||
});
|
||||
|
||||
|
||||
|
||||
var app = builder.Build();
|
||||
var configSwagger = new ConfigurationBuilder()
|
||||
.SetBasePath(Directory.GetCurrentDirectory())
|
||||
.AddJsonFile("appsettings.json")
|
||||
.Build();
|
||||
|
||||
|
||||
var port = configSwagger.GetValue<int>("Port", 5075);
|
||||
|
||||
var port = configSwagger.GetValue<int>("Port", 5075);
|
||||
var port2 = configSwagger.GetValue<int>("Port", 7039);
|
||||
app.Urls.Add($"http://*:{port}");
|
||||
app.Urls.Add($"https://*:{port2}");
|
||||
|
||||
app.Urls.Add($"http://*:{port}");
|
||||
app.Urls.Add($"https://*:{port2}");
|
||||
|
||||
try
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI(c =>
|
||||
{
|
||||
c.SwaggerEndpoint($"/swagger/v1/swagger.json", "FirmTracker - TEST");
|
||||
c.SwaggerEndpoint($"/swagger/v1/swagger.json", "FirmTracker - TEST");
|
||||
c.RoutePrefix = "swagger";
|
||||
});
|
||||
Console.WriteLine("uruchomiono swaggera");
|
||||
@ -125,16 +102,14 @@ namespace FirmTracker_Server
|
||||
{
|
||||
Console.WriteLine("Nie uda³o siê uruchomiæ swaggera");
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
app.UseCors("AllowSpecificOrigin");
|
||||
|
||||
|
||||
app.UseAuthentication();
|
||||
app.UseAuthorization();
|
||||
|
||||
|
||||
|
||||
app.MapControllers();
|
||||
|
||||
var configuration = new Configuration();
|
||||
@ -142,46 +117,5 @@ 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.AddScoped<IExpenseRepository, ExpenseRepository>();
|
||||
services.AddScoped<ITransactionRepository, TransactionRepository>();
|
||||
// services.AddScoped<IWorkdayRepository, WorkdayRepository>();
|
||||
services.AddMvc();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,152 +0,0 @@
|
||||
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);
|
||||
IEnumerable<string> GetAllUserEmails();
|
||||
}
|
||||
|
||||
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 IEnumerable<string> GetAllUserEmails()
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
// Query the users and return a list of emails
|
||||
var users = session.Query<User>().Select(u => u.Email).ToList();
|
||||
return users;
|
||||
}
|
||||
}
|
||||
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.UserId;
|
||||
}
|
||||
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.UserId.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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
62
TestClass.cs
62
TestClass.cs
@ -21,13 +21,6 @@ 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
|
||||
{
|
||||
@ -157,7 +150,7 @@ namespace FirmTracker_Server
|
||||
};
|
||||
var expense2 = new Expense
|
||||
{
|
||||
Date = DateTime.Parse("2024-09-10 16:11:17.6232408"),
|
||||
Date = DateTime.Now,
|
||||
Value = 990.99m,
|
||||
Description = "naprawa pieca - 25.05.2024"
|
||||
};
|
||||
@ -169,59 +162,10 @@ namespace FirmTracker_Server
|
||||
|
||||
};
|
||||
|
||||
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(product2);
|
||||
@ -239,9 +183,9 @@ namespace FirmTracker_Server
|
||||
expenseCrud.AddExpense(expense3);
|
||||
|
||||
List<TransactionProduct> testTransactionProducts = new List<TransactionProduct> {
|
||||
new TransactionProduct { ProductID =17, Quantity = 3 },
|
||||
new TransactionProduct { ProductID =17, Quantity = 10 },
|
||||
new TransactionProduct { ProductID = 14, Quantity = 1 },
|
||||
new TransactionProduct { ProductID = 1, Quantity = 1 },
|
||||
new TransactionProduct { ProductID = 1, Quantity = 0 },
|
||||
};
|
||||
foreach (var transactionProduct in testTransactionProducts)
|
||||
{
|
||||
|
||||
@ -1,28 +1,29 @@
|
||||
{
|
||||
"AppSettings": {
|
||||
"ConnectionString": "Server=localhost,1433;Initial Catalog=master;User Id=sa;Password=Rap45tro2;"
|
||||
|
||||
"ConnectionString": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=master;Integrated Security=True;"
|
||||
},
|
||||
"TokenConfig": {
|
||||
"JwtSecKey": "omgi5Rf4tqg351GQwefw1234567890123456",
|
||||
"JwtExpireDays": 30,
|
||||
"JwtIssuer": "http://api.graphcom.pl"
|
||||
},
|
||||
"profiles": {
|
||||
"http": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger",
|
||||
"applicationUrl": "http://localhost:5045"
|
||||
|
||||
},
|
||||
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger"
|
||||
|
||||
"profiles": {
|
||||
"http": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger",
|
||||
"applicationUrl": "http://localhost:5045"
|
||||
|
||||
},
|
||||
"https": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger",
|
||||
"applicationUrl": "https://localhost:7039"
|
||||
|
||||
},
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger"
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
/*
|
||||
* 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; }
|
||||
}
|
||||
}
|
||||
@ -1,220 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using FirmTracker_Server.nHibernate.Expenses;
|
||||
using FirmTracker_Server.nHibernate.Transactions;
|
||||
using NHibernate;
|
||||
|
||||
namespace FirmTracker_Server.nHibernate
|
||||
{
|
||||
public interface IExpenseRepository
|
||||
{
|
||||
List<Expense> GetAllExpenses();
|
||||
Expense GetExpense(int expenseId);
|
||||
void AddExpense(Expense expense);
|
||||
void UpdateExpense(Expense expense);
|
||||
void DeleteExpense(int expenseId);
|
||||
}
|
||||
public interface ITransactionRepository
|
||||
{
|
||||
List<Transaction> GetAllTransactions();
|
||||
Transaction GetTransaction(int transactionId);
|
||||
List<Transaction> GetTransactionsByDateRange(DateTime startDate, DateTime endDate);
|
||||
List<TransactionProduct> GetTransactionProducts(int transactionId);
|
||||
void AddTransaction(Transaction transaction);
|
||||
void UpdateTransaction(Transaction transaction);
|
||||
void DeleteTransaction(int transactionId);
|
||||
List<TransactionProduct> GetTransactionProductsForTransactions(List<int> transactionIds);
|
||||
}
|
||||
public class TransactionRepository : ITransactionRepository
|
||||
{
|
||||
// Retrieve all transactions
|
||||
public List<Transaction> GetAllTransactions()
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
return session.Query<Transaction>().ToList();
|
||||
}
|
||||
}
|
||||
public List<TransactionProduct> GetTransactionProductsForTransactions(List<int> transactionIds)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
return session.Query<TransactionProduct>()
|
||||
.Where(tp => transactionIds.Contains(tp.TransactionId))
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
public Transaction GetTransaction(int transactionId)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
return session.Get<Transaction>(transactionId);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public List<Transaction> GetTransactionsByDateRange(DateTime startDate, DateTime endDate)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
return session.Query<Transaction>()
|
||||
.Where(t => t.Date >= startDate && t.Date <= endDate)
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public List<TransactionProduct> GetTransactionProducts(int transactionId)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
return session.Query<TransactionProduct>()
|
||||
.Where(tp => tp.TransactionId == transactionId)
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void AddTransaction(Transaction transaction)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var transactionScope = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
session.Save(transaction);
|
||||
transactionScope.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
transactionScope.Rollback();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Update an existing transaction
|
||||
public void UpdateTransaction(Transaction transaction)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var transactionScope = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
session.Update(transaction);
|
||||
transactionScope.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
transactionScope.Rollback();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void DeleteTransaction(int transactionId)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var transactionScope = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
var transaction = session.Get<Transaction>(transactionId);
|
||||
if (transaction != null)
|
||||
{
|
||||
session.Delete(transaction);
|
||||
}
|
||||
transactionScope.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
transactionScope.Rollback();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public class ExpenseRepository : IExpenseRepository
|
||||
{
|
||||
// Retrieve all expenses
|
||||
public List<Expense> GetAllExpenses()
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
return session.Query<Expense>().ToList();
|
||||
}
|
||||
}
|
||||
|
||||
// Retrieve a specific expense by ID
|
||||
public Expense GetExpense(int expenseId)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
return session.Get<Expense>(expenseId);
|
||||
}
|
||||
}
|
||||
|
||||
// Add a new expense
|
||||
public void AddExpense(Expense expense)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var transaction = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
session.Save(expense);
|
||||
transaction.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
transaction.Rollback();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Update an existing expense
|
||||
public void UpdateExpense(Expense expense)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var transaction = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
session.Update(expense);
|
||||
transaction.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
transaction.Rollback();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Delete an expense by ID
|
||||
public void DeleteExpense(int expenseId)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var transaction = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
var expense = session.Get<Expense>(expenseId);
|
||||
if (expense != null)
|
||||
{
|
||||
session.Delete(expense);
|
||||
}
|
||||
transaction.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
transaction.Rollback();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -53,11 +53,7 @@ namespace FirmTracker_Server.nHibernate
|
||||
.AddFromAssemblyOf<Expenses.ExpenseMapping>()
|
||||
.AddFromAssemblyOf<Reports.ReportMapping>()
|
||||
.AddFromAssemblyOf<Reports.ReportTransactionMapping>()
|
||||
.AddFromAssemblyOf<Reports.ReportExpenseMapping>()
|
||||
.AddFromAssemblyOf<LogsMapping>()
|
||||
.AddFromAssemblyOf<UserMapping>()
|
||||
.AddFromAssemblyOf<WorkdayMapping>();
|
||||
|
||||
.AddFromAssemblyOf<Reports.ReportExpenseMapping>();
|
||||
})
|
||||
.ExposeConfiguration(cfg => new SchemaExport(cfg).Create(true, true)) //SchemaUpdate . Execute dla only update
|
||||
.BuildSessionFactory();
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
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.UserId); // Mapping the Id property
|
||||
Map(x => x.Email); // Mapping other properties
|
||||
Map(x => x.PassHash);
|
||||
Map(x => x.Role);
|
||||
// Add other mappings as needed
|
||||
}
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
using FirmTracker_Server.Entities;
|
||||
|
||||
namespace FirmTracker_Server.nHibernate
|
||||
{
|
||||
public class Workday
|
||||
{
|
||||
public virtual int Id { get; set; }
|
||||
public virtual DateTime StartTime { get; set; }
|
||||
public virtual DateTime? EndTime { get; set; } // Nullable EndTime, if not finished
|
||||
public virtual TimeSpan WorkedHours
|
||||
{
|
||||
get
|
||||
{
|
||||
// Calculate the worked hours, using 5 PM as the fallback for the EndTime
|
||||
return (EndTime ?? DateTime.Today.AddHours(24)) - StartTime;
|
||||
}
|
||||
set
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
public virtual User User { get; set; }
|
||||
public virtual string Absence { get; set; }
|
||||
}
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
using FluentNHibernate.Mapping;
|
||||
namespace FirmTracker_Server.nHibernate
|
||||
{
|
||||
public class WorkdayMapping : ClassMap<Workday>
|
||||
{
|
||||
public WorkdayMapping()
|
||||
{
|
||||
Table("Workdays"); // Make sure the table name matches the one in the database
|
||||
Id(x => x.Id).GeneratedBy.Identity();
|
||||
Map(x => x.StartTime);
|
||||
Map(x => x.EndTime);
|
||||
References(x => x.User).Column("UserId"); // Assuming Workday is related to a User
|
||||
Map(x => x.Absence);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,136 +0,0 @@
|
||||
using FirmTracker_Server.Entities;
|
||||
using FirmTracker_Server.nHibernate;
|
||||
|
||||
public class WorkdayRepository
|
||||
{
|
||||
public void StartWorkday(int userId)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var transaction = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
// Check if there is an existing workday that hasn't been stopped yet
|
||||
var ongoingWorkday = session.Query<Workday>()
|
||||
.Where(w => w.User.UserId == userId && w.EndTime == null)
|
||||
.OrderByDescending(w => w.StartTime)
|
||||
.FirstOrDefault();
|
||||
|
||||
if (ongoingWorkday != null)
|
||||
{
|
||||
// If there is an ongoing workday, throw an exception or return a specific message
|
||||
throw new Exception("Previous workday wasn't stopped yet.");
|
||||
}
|
||||
|
||||
// Fetch the user entity
|
||||
var user = session.Get<User>(userId);
|
||||
if (user == null) throw new Exception("User not found");
|
||||
|
||||
// Create a new workday if there is no ongoing one
|
||||
var workday = new Workday
|
||||
{
|
||||
StartTime = DateTime.Now,
|
||||
User = user,
|
||||
Absence = ""
|
||||
};
|
||||
|
||||
session.Save(workday);
|
||||
transaction.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
transaction.Rollback();
|
||||
throw new Exception("An error occurred while starting the workday", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void AddAbsence(int userId, string absenceType, DateTime startTime, DateTime endTime)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var transaction = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
var user = session.Get<User>(userId);
|
||||
if (user == null) throw new Exception("User not found");
|
||||
|
||||
// Create a new workday entry for the absence
|
||||
var workday = new Workday
|
||||
{
|
||||
User = user,
|
||||
StartTime = startTime,
|
||||
EndTime = endTime,
|
||||
Absence = absenceType // Store the absence type as a string
|
||||
};
|
||||
|
||||
session.Save(workday);
|
||||
transaction.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
transaction.Rollback();
|
||||
throw new Exception("An error occurred while adding the absence", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public bool StopWorkday(int userId)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var transaction = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
var workday = session.Query<Workday>()
|
||||
.Where(w => w.User.UserId == userId && w.EndTime == null)
|
||||
.OrderByDescending(w => w.StartTime)
|
||||
.FirstOrDefault();
|
||||
|
||||
if (workday == null)
|
||||
{
|
||||
return false; // No ongoing workday found
|
||||
}
|
||||
|
||||
workday.EndTime = DateTime.Now;
|
||||
|
||||
session.Update(workday);
|
||||
transaction.Commit();
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
transaction.Rollback();
|
||||
throw new Exception("An error occurred while stopping the workday", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<Workday> GetWorkdaysByUser(string email)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
{
|
||||
try
|
||||
{
|
||||
var workdays = session.Query<Workday>()
|
||||
.Where(w => w.User.Email == email)
|
||||
.Select(w => new Workday
|
||||
{
|
||||
Id = w.Id,
|
||||
StartTime = w.StartTime,
|
||||
EndTime = w.EndTime ?? DateTime.Today.AddHours(17),
|
||||
WorkedHours = (w.EndTime ?? DateTime.Today.AddHours(17)) - w.StartTime,
|
||||
Absence = w.Absence,
|
||||
})
|
||||
.ToList();
|
||||
|
||||
return workdays;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new Exception("An error occurred while fetching workdays", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -94,10 +94,6 @@ namespace FirmTracker_Server.nHibernate.Transactions
|
||||
{
|
||||
var product = session.Get<Product>(tp.ProductID);
|
||||
|
||||
if(tp.Quantity < 0)
|
||||
{
|
||||
|
||||
}
|
||||
if (product.Type != 0)
|
||||
{
|
||||
product.Availability += tp.Quantity;
|
||||
@ -257,63 +253,6 @@ namespace FirmTracker_Server.nHibernate.Transactions
|
||||
}
|
||||
}
|
||||
}
|
||||
public void DeleteTransactionProduct(int transactionId, int productId)
|
||||
{
|
||||
using (var session = SessionFactory.OpenSession())
|
||||
using (var t = session.BeginTransaction())
|
||||
{
|
||||
try
|
||||
{
|
||||
// Get the transaction to update
|
||||
var transaction = session.Get<Transaction>(transactionId);
|
||||
if (transaction == null)
|
||||
{
|
||||
throw new InvalidOperationException($"Transaction with ID {transactionId} not found.");
|
||||
}
|
||||
|
||||
// Find the transaction product to remove
|
||||
var transactionProduct = transaction.TransactionProducts.FirstOrDefault(tp => tp.ProductID == productId);
|
||||
if (transactionProduct == null)
|
||||
{
|
||||
throw new InvalidOperationException($"Product with ID {productId} not found in the transaction.");
|
||||
}
|
||||
|
||||
// Get the product to update availability
|
||||
var product = session.Get<Product>(productId);
|
||||
if (product == null)
|
||||
{
|
||||
throw new InvalidOperationException($"Product with ID {productId} not found.");
|
||||
}
|
||||
|
||||
// Revert the product availability
|
||||
if (product.Type != 0)
|
||||
{
|
||||
product.Availability += transactionProduct.Quantity;
|
||||
session.Update(product);
|
||||
}
|
||||
|
||||
// Remove the product from the transaction
|
||||
transaction.TotalPrice = (transaction.TotalPrice * (1 + (transaction.Discount / 100))) - (transactionProduct.Quantity * product.Price );
|
||||
transaction.TotalPrice = Math.Round(transaction.TotalPrice, 2, MidpointRounding.AwayFromZero);
|
||||
|
||||
// Remove the product from the Transaction's Product list
|
||||
transaction.TransactionProducts.Remove(transactionProduct);
|
||||
|
||||
// Now delete the transaction product
|
||||
session.Delete(transactionProduct);
|
||||
|
||||
// Update the transaction total price
|
||||
session.Update(transaction);
|
||||
|
||||
t.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
t.Rollback();
|
||||
throw new InvalidOperationException($"Error while deleting product from transaction: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public IList<Transaction2> GetAllTransactions()
|
||||
|
||||
BIN
szyfrowanie.dll
BIN
szyfrowanie.dll
Binary file not shown.
Loading…
Reference in New Issue
Block a user