Compare commits

...

3 Commits

15 changed files with 637 additions and 7 deletions

View File

@ -0,0 +1,250 @@
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.Mvc;
using QuestPDF.Fluent;
using QuestPDF.Helpers;
using QuestPDF.Infrastructure;
namespace FirmTracker_Server.Controllers
{
[Route("api/[controller]")]
[ApiController]
public class PdfController : ControllerBase
{
private readonly IExpenseRepository _expenseRepository;
private readonly ITransactionRepository _transactionRepository;
public PdfController(IExpenseRepository expenseRepository, ITransactionRepository transactionRepository)
{
_expenseRepository = expenseRepository;
_transactionRepository = transactionRepository;
}
[HttpGet("download")]
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();
}
}
}
}

View File

@ -0,0 +1,58 @@
/*
* 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 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(); // Instantiate directly (no DI in this example)
}
// 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);
_workdayCRUD.StartWorkday(userId);
return Ok(new { status = "started", userId });
}
catch (Exception ex)
{
return BadRequest(new { message = "An error occurred while starting the workday.", error = ex.Message });
}
}
}
}

View File

@ -2,7 +2,7 @@
{
public class User
{
public virtual int Id { get; set; }
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";

View File

@ -29,6 +29,7 @@
<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="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" />

11
Models/EmployeeDto.cs Normal file
View File

@ -0,0 +1,11 @@
using FirmTracker_Server.Controllers;
namespace FirmTracker_Server.Models
{
public class EmployeeDto
{
public virtual int Id { get; set; }
public virtual string email { get; set; }
}
}

15
Models/Workday.cs Normal file
View File

@ -0,0 +1,15 @@
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; }
// Many-to-One relationship to the User entity
public virtual User User { get; set; }
}
}

View File

@ -37,6 +37,8 @@ using FirmTracker_Server.Middleware;
using FirmTracker_Server.Services;
using System.Reflection;
using FirmTracker_Server.Mappings;
using NuGet.Packaging;
namespace FirmTracker_Server
@ -69,6 +71,7 @@ namespace FirmTracker_Server
TestClass test = new TestClass();
test.AddTestProduct();
QuestPDF.Settings.License = QuestPDF.Infrastructure.LicenseType.Community;
builder.Services.AddCors(options =>
{
@ -173,6 +176,9 @@ namespace FirmTracker_Server
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();
}

View File

@ -69,7 +69,7 @@ namespace FirmTracker_Server.Services
{
session.Save(user);
transaction.Commit();
return user.Id;
return user.UserId;
}
catch
{
@ -128,7 +128,7 @@ namespace FirmTracker_Server.Services
// Generate JWT token
var claims = new List<Claim>() {
new(ClaimTypes.NameIdentifier, user.Id.ToString()),
new(ClaimTypes.NameIdentifier, user.UserId.ToString()),
new(ClaimTypes.Role, user.Role)
};

View File

@ -157,7 +157,7 @@ namespace FirmTracker_Server
};
var expense2 = new Expense
{
Date = DateTime.Now,
Date = DateTime.Parse("2024-09-10 16:11:17.6232408"),
Value = 990.99m,
Description = "naprawa pieca - 25.05.2024"
};

220
nHIbernate/PdfData.cs Normal file
View File

@ -0,0 +1,220 @@
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();
}
}
// Retrieve a specific transaction by ID
public Transaction GetTransaction(int transactionId)
{
using (var session = SessionFactory.OpenSession())
{
return session.Get<Transaction>(transactionId);
}
}
// Retrieve transactions within a specific date range
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();
}
}
// Retrieve all products for a specific transaction
public List<TransactionProduct> GetTransactionProducts(int transactionId)
{
using (var session = SessionFactory.OpenSession())
{
return session.Query<TransactionProduct>()
.Where(tp => tp.TransactionId == transactionId)
.ToList();
}
}
// Add a new transaction
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;
}
}
}
// Delete a transaction by ID
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;
}
}
}
}
}

View File

@ -55,7 +55,8 @@ namespace FirmTracker_Server.nHibernate
.AddFromAssemblyOf<Reports.ReportTransactionMapping>()
.AddFromAssemblyOf<Reports.ReportExpenseMapping>()
.AddFromAssemblyOf<LogsMapping>()
.AddFromAssemblyOf<UserMapping>();
.AddFromAssemblyOf<UserMapping>()
.AddFromAssemblyOf<WorkdayMapping>();
})
.ExposeConfiguration(cfg => new SchemaExport(cfg).Create(true, true)) //SchemaUpdate . Execute dla only update

View File

@ -7,7 +7,7 @@ public class UserMapping : ClassMap<User>
{
Table("Users"); // The name of your table in the database
Id(x => x.Id); // Mapping the Id property
Id(x => x.UserId); // Mapping the Id property
Map(x => x.Email); // Mapping other properties
Map(x => x.PassHash);
Map(x => x.Role);

12
nHIbernate/Workday.cs Normal file
View File

@ -0,0 +1,12 @@
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 User User { get; set; } // Assuming a relationship to a User entity
}
}

View File

@ -0,0 +1,15 @@
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
}
}
}

View File

@ -0,0 +1,41 @@
using FirmTracker_Server.Entities;
using NHibernate;
using System;
namespace FirmTracker_Server.nHibernate
{
public class WorkdayRepository
{
public void StartWorkday(int userId)
{
using (var session = SessionFactory.OpenSession())
using (var transaction = session.BeginTransaction())
{
try
{
// Fetch the user entity by its ID
var user = session.Get<User>(userId); // Assuming User is a mapped entity
if (user == null)
{
throw new Exception("User not found");
}
// Create a new Workday and assign the User reference
var workday = new Workday
{
StartTime = DateTime.Now,
User = user // Set the User reference here
};
session.Save(workday);
transaction.Commit();
}
catch (Exception ex)
{
transaction.Rollback();
throw new Exception("An error occurred while starting the workday", ex);
}
}
}
}
}