From 100885c3c49323da42c7d37b97d610d0a5e60cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Fri, 7 Jun 2024 23:53:09 +0200 Subject: [PATCH 01/21] dodanie encji raportu wraz z mappingiem --- nHIbernate/Reports/Report.cs | 23 ++++++++++++++++++++++ nHIbernate/Reports/ReportMapping.cs | 30 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 nHIbernate/Reports/Report.cs create mode 100644 nHIbernate/Reports/ReportMapping.cs diff --git a/nHIbernate/Reports/Report.cs b/nHIbernate/Reports/Report.cs new file mode 100644 index 0000000..2597d0b --- /dev/null +++ b/nHIbernate/Reports/Report.cs @@ -0,0 +1,23 @@ +using FirmTracker_Server.nHibernate.Expenses; +using FirmTracker_Server.nHibernate.Transactions; + +namespace FirmTracker_Server.nHIbernate.Reports +{ + public class Report + { + public virtual int Id { get; set; } + public virtual DateTime FromDate { get; set; } + public virtual DateTime ToDate { get; set; } + public virtual IList Transactions { get; set;} = new List(); + public virtual IList Expenses { get; set; } = new List(); + public virtual decimal TotalIncome { get; set; } + public virtual decimal TotalExpenses { get; set; } + public virtual decimal TotalBalance { get; set; } + public Report() { + Transactions = new List(); + Expenses = new List(); + } + + + } +} diff --git a/nHIbernate/Reports/ReportMapping.cs b/nHIbernate/Reports/ReportMapping.cs new file mode 100644 index 0000000..5035cc4 --- /dev/null +++ b/nHIbernate/Reports/ReportMapping.cs @@ -0,0 +1,30 @@ +using FluentNHibernate.Mapping; +namespace FirmTracker_Server.nHIbernate.Reports +{ + public class ReportMapping : ClassMap + { + 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); + + HasManyToMany(x => x.Transactions) + .Cascade.All() + .Table("ReportTransactions") + .ParentKeyColumn("ReportId") + .ChildKeyColumn("TransactionId"); + + HasManyToMany(x => x.Expenses) + .Cascade.All() + .Table("ReportExpenses") + .ParentKeyColumn("ReportId") + .ChildKeyColumn("ExpenseId"); + } + + } +} From 812ee1b8ebd2ed2afd7aa147aaf72f83b78dad59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Sat, 8 Jun 2024 00:24:12 +0200 Subject: [PATCH 02/21] =?UTF-8?q?mapowanie=20relacji=20mi=C4=99dzy=20rapor?= =?UTF-8?q?tem=20a=20transakcj=C4=85/wydatkiem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nHIbernate/Expenses/Expense.cs | 5 ++++- nHIbernate/Expenses/ExpenseMapping.cs | 6 ++++++ nHIbernate/Reports/Report.cs | 2 +- nHIbernate/Reports/ReportMapping.cs | 2 +- nHIbernate/SessionFactory.cs | 3 ++- nHibernate/Transactions/Transaction.cs | 2 ++ nHibernate/Transactions/Transaction2.cs | 2 ++ nHibernate/Transactions/Transaction2Mapping.cs | 6 ++++++ nHibernate/Transactions/TransactionMapping.cs | 6 ++++++ 9 files changed, 30 insertions(+), 4 deletions(-) diff --git a/nHIbernate/Expenses/Expense.cs b/nHIbernate/Expenses/Expense.cs index f99cc0a..788655b 100644 --- a/nHIbernate/Expenses/Expense.cs +++ b/nHIbernate/Expenses/Expense.cs @@ -1,4 +1,6 @@ -namespace FirmTracker_Server.nHibernate.Expenses +using FirmTracker_Server.nHibernate.Reports; + +namespace FirmTracker_Server.nHibernate.Expenses { public class Expense { @@ -6,5 +8,6 @@ public virtual DateTime Date { get; set; } public virtual decimal Value { get; set; } public virtual string Description { get; set; } + public virtual IList Reports { get; set; } = new List(); } } diff --git a/nHIbernate/Expenses/ExpenseMapping.cs b/nHIbernate/Expenses/ExpenseMapping.cs index ad2468d..039a58b 100644 --- a/nHIbernate/Expenses/ExpenseMapping.cs +++ b/nHIbernate/Expenses/ExpenseMapping.cs @@ -12,6 +12,12 @@ namespace FirmTracker_Server.nHibernate.Expenses Map(x => x.Value); Map(x => x.Description); + HasManyToMany(x => x.Reports) + .Cascade.All() + .Table("ReportExpenses") + .ParentKeyColumn("ExpenseId") + .ChildKeyColumn("ReportId"); + } } } diff --git a/nHIbernate/Reports/Report.cs b/nHIbernate/Reports/Report.cs index 2597d0b..a763a61 100644 --- a/nHIbernate/Reports/Report.cs +++ b/nHIbernate/Reports/Report.cs @@ -1,7 +1,7 @@ using FirmTracker_Server.nHibernate.Expenses; using FirmTracker_Server.nHibernate.Transactions; -namespace FirmTracker_Server.nHIbernate.Reports +namespace FirmTracker_Server.nHibernate.Reports { public class Report { diff --git a/nHIbernate/Reports/ReportMapping.cs b/nHIbernate/Reports/ReportMapping.cs index 5035cc4..e0c0fa2 100644 --- a/nHIbernate/Reports/ReportMapping.cs +++ b/nHIbernate/Reports/ReportMapping.cs @@ -1,5 +1,5 @@ using FluentNHibernate.Mapping; -namespace FirmTracker_Server.nHIbernate.Reports +namespace FirmTracker_Server.nHibernate.Reports { public class ReportMapping : ClassMap { diff --git a/nHIbernate/SessionFactory.cs b/nHIbernate/SessionFactory.cs index 6562a29..71f7ad9 100644 --- a/nHIbernate/SessionFactory.cs +++ b/nHIbernate/SessionFactory.cs @@ -33,7 +33,8 @@ namespace FirmTracker_Server.nHibernate .AddFromAssemblyOf() .AddFromAssemblyOf() .AddFromAssemblyOf() - .AddFromAssemblyOf(); + .AddFromAssemblyOf() + .AddFromAssemblyOf(); }) .ExposeConfiguration(cfg => new SchemaExport(cfg).Create(true, true)) //SchemaUpdate . Execute dla only update .BuildSessionFactory(); diff --git a/nHibernate/Transactions/Transaction.cs b/nHibernate/Transactions/Transaction.cs index 879c033..f860a5d 100644 --- a/nHibernate/Transactions/Transaction.cs +++ b/nHibernate/Transactions/Transaction.cs @@ -1,4 +1,5 @@ using FirmTracker_Server.nHibernate.Products; +using FirmTracker_Server.nHibernate.Reports; using System; using System.Collections.Generic; using System.Linq; @@ -15,6 +16,7 @@ namespace FirmTracker_Server.nHibernate.Transactions public virtual decimal Discount { get; set; } public virtual string Description { get; set; } public virtual decimal TotalPrice { get; set; }//=> TransactionProducts.Sum(tp => ((tp.Quantity * tp.UnitPrice)* ((1 - (Discount / 100)))));// (1 - (Discount / 100))); + public virtual IList Reports { get; set; } = new List(); public Transaction() { diff --git a/nHibernate/Transactions/Transaction2.cs b/nHibernate/Transactions/Transaction2.cs index f6ef4a0..5400ee9 100644 --- a/nHibernate/Transactions/Transaction2.cs +++ b/nHibernate/Transactions/Transaction2.cs @@ -1,4 +1,5 @@ using FirmTracker_Server.nHibernate.Products; +using FirmTracker_Server.nHibernate.Reports; using System; using System.Collections.Generic; using System.Linq; @@ -15,6 +16,7 @@ namespace FirmTracker_Server.nHibernate.Transactions public virtual decimal Discount { get; set; } public virtual string Description { get; set; } public virtual decimal TotalPrice { get; set; }//=> TransactionProducts.Sum(tp => ((tp.Quantity * tp.UnitPrice)* ((1 - (Discount / 100)))));// (1 - (Discount / 100))); + public virtual IList Reports { get; set; } = new List(); public Transaction2() { diff --git a/nHibernate/Transactions/Transaction2Mapping.cs b/nHibernate/Transactions/Transaction2Mapping.cs index 931456d..9265f00 100644 --- a/nHibernate/Transactions/Transaction2Mapping.cs +++ b/nHibernate/Transactions/Transaction2Mapping.cs @@ -18,6 +18,12 @@ namespace FirmTracker_Server.nHibernate.Transactions .KeyColumn("TransactionId") .Cascade.AllDeleteOrphan() .Inverse(); // Ustawienie Inverse() wskazuje, że to `TransactionProduct` jest właścicielem relacji + + HasManyToMany(x => x.Reports) + .Cascade.All() + .Table("ReportTransactions") + .ParentKeyColumn("TransactionId") + .ChildKeyColumn("ReportId"); } } } diff --git a/nHibernate/Transactions/TransactionMapping.cs b/nHibernate/Transactions/TransactionMapping.cs index 3a24b5b..5aa2966 100644 --- a/nHibernate/Transactions/TransactionMapping.cs +++ b/nHibernate/Transactions/TransactionMapping.cs @@ -18,6 +18,12 @@ namespace FirmTracker_Server.nHibernate.Transactions .KeyColumn("TransactionId") .Cascade.AllDeleteOrphan() .Inverse(); // Ustawienie Inverse() wskazuje, że to `TransactionProduct` jest właścicielem relacji + + HasManyToMany(x => x.Reports) + .Cascade.All() + .Table("ReportTransactions") + .ParentKeyColumn("TransactionId") + .ChildKeyColumn("ReportId"); } } } From 5b13f70572a7760190c9779436b9aa7fac5075f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Sat, 8 Jun 2024 03:34:24 +0200 Subject: [PATCH 03/21] zmiana mapowania --- nHIbernate/Expenses/Expense.cs | 1 - nHIbernate/Expenses/ExpenseMapping.cs | 6 ------ nHibernate/Transactions/Transaction.cs | 1 - nHibernate/Transactions/Transaction2.cs | 1 - nHibernate/Transactions/Transaction2Mapping.cs | 5 ----- nHibernate/Transactions/TransactionMapping.cs | 5 ----- 6 files changed, 19 deletions(-) diff --git a/nHIbernate/Expenses/Expense.cs b/nHIbernate/Expenses/Expense.cs index 788655b..938ec29 100644 --- a/nHIbernate/Expenses/Expense.cs +++ b/nHIbernate/Expenses/Expense.cs @@ -8,6 +8,5 @@ namespace FirmTracker_Server.nHibernate.Expenses public virtual DateTime Date { get; set; } public virtual decimal Value { get; set; } public virtual string Description { get; set; } - public virtual IList Reports { get; set; } = new List(); } } diff --git a/nHIbernate/Expenses/ExpenseMapping.cs b/nHIbernate/Expenses/ExpenseMapping.cs index 039a58b..ad2468d 100644 --- a/nHIbernate/Expenses/ExpenseMapping.cs +++ b/nHIbernate/Expenses/ExpenseMapping.cs @@ -12,12 +12,6 @@ namespace FirmTracker_Server.nHibernate.Expenses Map(x => x.Value); Map(x => x.Description); - HasManyToMany(x => x.Reports) - .Cascade.All() - .Table("ReportExpenses") - .ParentKeyColumn("ExpenseId") - .ChildKeyColumn("ReportId"); - } } } diff --git a/nHibernate/Transactions/Transaction.cs b/nHibernate/Transactions/Transaction.cs index f860a5d..6068319 100644 --- a/nHibernate/Transactions/Transaction.cs +++ b/nHibernate/Transactions/Transaction.cs @@ -16,7 +16,6 @@ namespace FirmTracker_Server.nHibernate.Transactions public virtual decimal Discount { get; set; } public virtual string Description { get; set; } public virtual decimal TotalPrice { get; set; }//=> TransactionProducts.Sum(tp => ((tp.Quantity * tp.UnitPrice)* ((1 - (Discount / 100)))));// (1 - (Discount / 100))); - public virtual IList Reports { get; set; } = new List(); public Transaction() { diff --git a/nHibernate/Transactions/Transaction2.cs b/nHibernate/Transactions/Transaction2.cs index 5400ee9..45d3c58 100644 --- a/nHibernate/Transactions/Transaction2.cs +++ b/nHibernate/Transactions/Transaction2.cs @@ -16,7 +16,6 @@ namespace FirmTracker_Server.nHibernate.Transactions public virtual decimal Discount { get; set; } public virtual string Description { get; set; } public virtual decimal TotalPrice { get; set; }//=> TransactionProducts.Sum(tp => ((tp.Quantity * tp.UnitPrice)* ((1 - (Discount / 100)))));// (1 - (Discount / 100))); - public virtual IList Reports { get; set; } = new List(); public Transaction2() { diff --git a/nHibernate/Transactions/Transaction2Mapping.cs b/nHibernate/Transactions/Transaction2Mapping.cs index 9265f00..0eb7b1b 100644 --- a/nHibernate/Transactions/Transaction2Mapping.cs +++ b/nHibernate/Transactions/Transaction2Mapping.cs @@ -19,11 +19,6 @@ namespace FirmTracker_Server.nHibernate.Transactions .Cascade.AllDeleteOrphan() .Inverse(); // Ustawienie Inverse() wskazuje, że to `TransactionProduct` jest właścicielem relacji - HasManyToMany(x => x.Reports) - .Cascade.All() - .Table("ReportTransactions") - .ParentKeyColumn("TransactionId") - .ChildKeyColumn("ReportId"); } } } diff --git a/nHibernate/Transactions/TransactionMapping.cs b/nHibernate/Transactions/TransactionMapping.cs index 5aa2966..11aa421 100644 --- a/nHibernate/Transactions/TransactionMapping.cs +++ b/nHibernate/Transactions/TransactionMapping.cs @@ -19,11 +19,6 @@ namespace FirmTracker_Server.nHibernate.Transactions .Cascade.AllDeleteOrphan() .Inverse(); // Ustawienie Inverse() wskazuje, że to `TransactionProduct` jest właścicielem relacji - HasManyToMany(x => x.Reports) - .Cascade.All() - .Table("ReportTransactions") - .ParentKeyColumn("TransactionId") - .ChildKeyColumn("ReportId"); } } } From 80f5f30a01f7b9939ed992637b73b37ef408a771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Sat, 8 Jun 2024 03:39:54 +0200 Subject: [PATCH 04/21] =?UTF-8?q?dodanie=20tabel=20=C5=82=C4=85cz=C4=85cyc?= =?UTF-8?q?h=20raporty=20z=20transakcj=C4=85/wydatkiem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nHIbernate/Reports/Report.cs | 18 ++-- nHIbernate/Reports/ReportMapping.cs | 15 ++- nHIbernate/SessionFactory.cs | 4 +- nHibernate/Reports/ReportCRUD.cs | 93 +++++++++++++++++++ nHibernate/Reports/ReportExpense.cs | 26 ++++++ nHibernate/Reports/ReportExpenseMapping.cs | 15 +++ nHibernate/Reports/ReportTransaction.cs | 26 ++++++ .../Reports/ReportTransactionMapping.cs | 15 +++ 8 files changed, 196 insertions(+), 16 deletions(-) create mode 100644 nHibernate/Reports/ReportCRUD.cs create mode 100644 nHibernate/Reports/ReportExpense.cs create mode 100644 nHibernate/Reports/ReportExpenseMapping.cs create mode 100644 nHibernate/Reports/ReportTransaction.cs create mode 100644 nHibernate/Reports/ReportTransactionMapping.cs diff --git a/nHIbernate/Reports/Report.cs b/nHIbernate/Reports/Report.cs index a763a61..5a64618 100644 --- a/nHIbernate/Reports/Report.cs +++ b/nHIbernate/Reports/Report.cs @@ -1,5 +1,6 @@ using FirmTracker_Server.nHibernate.Expenses; using FirmTracker_Server.nHibernate.Transactions; +using Newtonsoft.Json; namespace FirmTracker_Server.nHibernate.Reports { @@ -8,16 +9,21 @@ namespace FirmTracker_Server.nHibernate.Reports public virtual int Id { get; set; } public virtual DateTime FromDate { get; set; } public virtual DateTime ToDate { get; set; } - public virtual IList Transactions { get; set;} = new List(); - public virtual IList Expenses { get; set; } = new List(); public virtual decimal TotalIncome { get; set; } public virtual decimal TotalExpenses { get; set; } public virtual decimal TotalBalance { get; set; } - public Report() { - Transactions = new List(); - Expenses = new List(); - } + + public virtual IList ReportTransactions { get; set; } = new List(); + public virtual IList ReportExpenses { get; set; } = new List(); + + + public class DateRangeDto + { + public DateTime FromDate { get; set; } + public DateTime ToDate { get; set; } + + } } } diff --git a/nHIbernate/Reports/ReportMapping.cs b/nHIbernate/Reports/ReportMapping.cs index e0c0fa2..2f01038 100644 --- a/nHIbernate/Reports/ReportMapping.cs +++ b/nHIbernate/Reports/ReportMapping.cs @@ -13,17 +13,14 @@ namespace FirmTracker_Server.nHibernate.Reports Map(x => x.TotalExpenses); Map(x => x.TotalBalance); - HasManyToMany(x => x.Transactions) - .Cascade.All() - .Table("ReportTransactions") - .ParentKeyColumn("ReportId") - .ChildKeyColumn("TransactionId"); + HasMany(x => x.ReportTransactions) + .Cascade.All() + .Inverse(); - HasManyToMany(x => x.Expenses) + HasMany(x => x.ReportExpenses) .Cascade.All() - .Table("ReportExpenses") - .ParentKeyColumn("ReportId") - .ChildKeyColumn("ExpenseId"); + .Inverse(); + } } diff --git a/nHIbernate/SessionFactory.cs b/nHIbernate/SessionFactory.cs index 71f7ad9..cc7ebbe 100644 --- a/nHIbernate/SessionFactory.cs +++ b/nHIbernate/SessionFactory.cs @@ -34,7 +34,9 @@ namespace FirmTracker_Server.nHibernate .AddFromAssemblyOf() .AddFromAssemblyOf() .AddFromAssemblyOf() - .AddFromAssemblyOf(); + .AddFromAssemblyOf() + .AddFromAssemblyOf() + .AddFromAssemblyOf(); }) .ExposeConfiguration(cfg => new SchemaExport(cfg).Create(true, true)) //SchemaUpdate . Execute dla only update .BuildSessionFactory(); diff --git a/nHibernate/Reports/ReportCRUD.cs b/nHibernate/Reports/ReportCRUD.cs new file mode 100644 index 0000000..276b2c6 --- /dev/null +++ b/nHibernate/Reports/ReportCRUD.cs @@ -0,0 +1,93 @@ +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(DateTime fromDate, DateTime toDate) + { + using (var session = SessionFactory.OpenSession()) + using (var sessionTransaction = session.BeginTransaction()) + { + try + { + var transactions = session.Query() + .Where(t => t.Date >= fromDate && t.Date <= toDate) + .ToList(); + + var expenses = session.Query() + .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 + + }; + + foreach (var transactionItem in transactions) + { + var reportTransaction = new ReportTransaction + { + ReportId = report.Id, + TransactionId = transactionItem.Id + }; + report.ReportTransactions.Add(reportTransaction); + } + + foreach (var expenseItem in expenses) + { + var reportExpense = new ReportExpense + { + ReportId = report.Id, + ExpenseId = expenseItem.Id + }; + 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(reportId); + } + } + + public IList GetAllReports() + { + using (var session = SessionFactory.OpenSession()) + { + var reports = session.Query() + .ToList(); + + return reports; + } + } + } +} diff --git a/nHibernate/Reports/ReportExpense.cs b/nHibernate/Reports/ReportExpense.cs new file mode 100644 index 0000000..39e0f5a --- /dev/null +++ b/nHibernate/Reports/ReportExpense.cs @@ -0,0 +1,26 @@ +using FirmTracker_Server.nHibernate.Expenses; + +namespace FirmTracker_Server.nHibernate.Reports +{ + public class ReportExpense + { + public virtual int Id { get; set; } + public virtual int ReportId { get; set; } + public virtual int ExpenseId { get; set; } + + public override bool Equals(object obj) + { + if (obj == null || GetType() != obj.GetType()) + return false; + + var other = (ReportExpense)obj; + return ReportId == other.ReportId && ExpenseId == other.ExpenseId; + } + + public override int GetHashCode() + { + return HashCode.Combine(ReportId, ExpenseId); + } + } + +} diff --git a/nHibernate/Reports/ReportExpenseMapping.cs b/nHibernate/Reports/ReportExpenseMapping.cs new file mode 100644 index 0000000..052064a --- /dev/null +++ b/nHibernate/Reports/ReportExpenseMapping.cs @@ -0,0 +1,15 @@ +using FluentNHibernate.Mapping; + +namespace FirmTracker_Server.nHibernate.Reports +{ + public class ReportExpenseMapping : ClassMap + { + public ReportExpenseMapping() + { + Table("ReportExpenses"); + Id(x => x.Id); + References(x => x.ReportId, "ReportId"); + References(x => x.ExpenseId, "ExpenseId"); + } + } +} diff --git a/nHibernate/Reports/ReportTransaction.cs b/nHibernate/Reports/ReportTransaction.cs new file mode 100644 index 0000000..51d2d6c --- /dev/null +++ b/nHibernate/Reports/ReportTransaction.cs @@ -0,0 +1,26 @@ +using FirmTracker_Server.nHibernate.Transactions; + +namespace FirmTracker_Server.nHibernate.Reports +{ + public class ReportTransaction + { + public virtual int Id { get; set; } + public virtual int ReportId { get; set; } + public virtual int TransactionId { get; set; } + + public override bool Equals(object obj) + { + if (obj == null || GetType() != obj.GetType()) + return false; + + var other = (ReportTransaction)obj; + return ReportId == other.ReportId && TransactionId == other.TransactionId; + } + + public override int GetHashCode() + { + return HashCode.Combine(ReportId, TransactionId); + } + } + +} diff --git a/nHibernate/Reports/ReportTransactionMapping.cs b/nHibernate/Reports/ReportTransactionMapping.cs new file mode 100644 index 0000000..e872b4c --- /dev/null +++ b/nHibernate/Reports/ReportTransactionMapping.cs @@ -0,0 +1,15 @@ +using FluentNHibernate.Mapping; + +namespace FirmTracker_Server.nHibernate.Reports +{ + public class ReportTransactionMapping : ClassMap + { + public ReportTransactionMapping() + { + Table("ReportTransactions"); + Id(x => x.Id); + References(x => x.ReportId, "ReportId"); + References(x => x.TransactionId, "TransactionId"); + } + } +} From 0cd3f18295bbffa0f4212a33086d13944ce3b907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Sat, 8 Jun 2024 03:40:13 +0200 Subject: [PATCH 05/21] podstawowe endpointy dla raportu --- Controllers/ReportController.cs | 75 +++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 Controllers/ReportController.cs diff --git a/Controllers/ReportController.cs b/Controllers/ReportController.cs new file mode 100644 index 0000000..28505e2 --- /dev/null +++ b/Controllers/ReportController.cs @@ -0,0 +1,75 @@ +using FirmTracker_Server.nHibernate.Reports; +using Microsoft.AspNetCore.Mvc; +using System.Text.Json.Serialization; +using System.Text.Json; +using NuGet.Protocol; + +namespace FirmTracker_Server.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class ReportController : ControllerBase + { + private readonly ReportCRUD _reportCRUD; + + public ReportController() + { + _reportCRUD = new ReportCRUD(); + } + [HttpPost] + [ProducesResponseType(201)] //Created + [ProducesResponseType(400)] //Bad request + public IActionResult CreateReport([FromBody] Report.DateRangeDto dateRange) + { + try + { + + 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)] + public IActionResult GetReport(int id) + { + var report = _reportCRUD.GetReport(id); + if (report == null) + return NotFound(); + + var options = new JsonSerializerOptions + { + ReferenceHandler = ReferenceHandler.Preserve // Obsługa cykli obiektów + }; + + var json = JsonSerializer.Serialize(report, options); + return Ok(json); + } + + [HttpGet] + [ProducesResponseType(200)] + [ProducesResponseType(404)] + public IActionResult GetAllReports() + { + var reports = _reportCRUD.GetAllReports(); + if (reports == null) + return NotFound(); + + return Ok(reports); + } + } +} From cdc924243b91104883a0d9bc5ca81bbacb9cd62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Sat, 8 Jun 2024 15:04:52 +0200 Subject: [PATCH 06/21] poprawki mapowania association tables --- nHIbernate/Reports/Report.cs | 7 ++++++- nHIbernate/Reports/ReportMapping.cs | 12 ++++++----- nHibernate/Reports/ReportExpense.cs | 20 ++++++++++++++----- nHibernate/Reports/ReportExpenseMapping.cs | 6 +++--- nHibernate/Reports/ReportTransaction.cs | 20 ++++++++++++++----- .../Reports/ReportTransactionMapping.cs | 8 ++++---- 6 files changed, 50 insertions(+), 23 deletions(-) diff --git a/nHIbernate/Reports/Report.cs b/nHIbernate/Reports/Report.cs index 5a64618..b13149e 100644 --- a/nHIbernate/Reports/Report.cs +++ b/nHIbernate/Reports/Report.cs @@ -13,10 +13,15 @@ namespace FirmTracker_Server.nHibernate.Reports public virtual decimal TotalExpenses { get; set; } public virtual decimal TotalBalance { get; set; } - public virtual IList ReportTransactions { get; set; } = new List(); + /*public virtual IList ReportTransactions { get; set; } = new List(); public virtual IList ReportExpenses { get; set; } = new List(); + public Report() + { + ReportTransactions = new List(); + ReportExpenses = new List(); + }*/ public class DateRangeDto diff --git a/nHIbernate/Reports/ReportMapping.cs b/nHIbernate/Reports/ReportMapping.cs index 2f01038..00c6e54 100644 --- a/nHIbernate/Reports/ReportMapping.cs +++ b/nHIbernate/Reports/ReportMapping.cs @@ -13,13 +13,15 @@ namespace FirmTracker_Server.nHibernate.Reports Map(x => x.TotalExpenses); Map(x => x.TotalBalance); - HasMany(x => x.ReportTransactions) - .Cascade.All() - .Inverse(); + /*HasMany(x => x.ReportTransactions) + .KeyColumn("ReportId") + .Cascade.AllDeleteOrphan() + .Inverse(); HasMany(x => x.ReportExpenses) - .Cascade.All() - .Inverse(); + .KeyColumn("ReportId") + .Cascade.AllDeleteOrphan() + .Inverse();*/ } diff --git a/nHibernate/Reports/ReportExpense.cs b/nHibernate/Reports/ReportExpense.cs index 39e0f5a..6913b38 100644 --- a/nHibernate/Reports/ReportExpense.cs +++ b/nHibernate/Reports/ReportExpense.cs @@ -4,22 +4,32 @@ namespace FirmTracker_Server.nHibernate.Reports { public class ReportExpense { - public virtual int Id { get; set; } - public virtual int ReportId { get; set; } - public virtual int ExpenseId { get; set; } + //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 ReportId == other.ReportId && ExpenseId == other.ExpenseId; + return Report != null && Expense != null && + Report.Id == other.Report.Id && + Expense.Id == other.Expense.Id; } public override int GetHashCode() { - return HashCode.Combine(ReportId, ExpenseId); + unchecked // Overflow is fine, just wrap + { + int hash = 17; + hash = hash * 23 + (Report?.Id.GetHashCode() ?? 0); + hash = hash * 23 + (Expense?.Id.GetHashCode() ?? 0); + return hash; + } } } diff --git a/nHibernate/Reports/ReportExpenseMapping.cs b/nHibernate/Reports/ReportExpenseMapping.cs index 052064a..0eae317 100644 --- a/nHibernate/Reports/ReportExpenseMapping.cs +++ b/nHibernate/Reports/ReportExpenseMapping.cs @@ -7,9 +7,9 @@ namespace FirmTracker_Server.nHibernate.Reports public ReportExpenseMapping() { Table("ReportExpenses"); - Id(x => x.Id); - References(x => x.ReportId, "ReportId"); - References(x => x.ExpenseId, "ExpenseId"); + CompositeId() + .KeyReference(x => x.Report, "ReportId") + .KeyReference(x => x.Expense, "ExpenseId"); } } } diff --git a/nHibernate/Reports/ReportTransaction.cs b/nHibernate/Reports/ReportTransaction.cs index 51d2d6c..5fc5efd 100644 --- a/nHibernate/Reports/ReportTransaction.cs +++ b/nHibernate/Reports/ReportTransaction.cs @@ -4,22 +4,32 @@ namespace FirmTracker_Server.nHibernate.Reports { public class ReportTransaction { - public virtual int Id { get; set; } - public virtual int ReportId { get; set; } - public virtual int TransactionId { get; set; } + //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 ReportId == other.ReportId && TransactionId == other.TransactionId; + return Report != null && Transaction != null && + Report.Id == other.Report.Id && + Transaction.Id == other.Transaction.Id; } public override int GetHashCode() { - return HashCode.Combine(ReportId, TransactionId); + unchecked // Overflow is fine, just wrap + { + int hash = 17; + hash = hash * 23 + (Report?.Id.GetHashCode() ?? 0); + hash = hash * 23 + (Transaction?.Id.GetHashCode() ?? 0); + return hash; + } } } diff --git a/nHibernate/Reports/ReportTransactionMapping.cs b/nHibernate/Reports/ReportTransactionMapping.cs index e872b4c..6ed68e0 100644 --- a/nHibernate/Reports/ReportTransactionMapping.cs +++ b/nHibernate/Reports/ReportTransactionMapping.cs @@ -4,12 +4,12 @@ namespace FirmTracker_Server.nHibernate.Reports { public class ReportTransactionMapping : ClassMap { - public ReportTransactionMapping() + public ReportTransactionMapping() { Table("ReportTransactions"); - Id(x => x.Id); - References(x => x.ReportId, "ReportId"); - References(x => x.TransactionId, "TransactionId"); + CompositeId() + .KeyReference(x => x.Report, "ReportId") + .KeyReference(x => x.Transaction, "TransactionId"); } } } From ffbcb447a6f0be6db3e932a3919c788fb3674ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Sat, 8 Jun 2024 15:06:29 +0200 Subject: [PATCH 07/21] =?UTF-8?q?przeniesienie=20oblicze=C5=84=20z=20CRUDa?= =?UTF-8?q?=20do=20controllera?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/ReportController.cs | 68 ++++++++++++++++++++++++++++---- nHibernate/Reports/ReportCRUD.cs | 29 +++++++++----- 2 files changed, 80 insertions(+), 17 deletions(-) diff --git a/Controllers/ReportController.cs b/Controllers/ReportController.cs index 28505e2..7f4eae8 100644 --- a/Controllers/ReportController.cs +++ b/Controllers/ReportController.cs @@ -3,6 +3,10 @@ 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; namespace FirmTracker_Server.Controllers { @@ -11,10 +15,12 @@ namespace FirmTracker_Server.Controllers public class ReportController : ControllerBase { private readonly ReportCRUD _reportCRUD; + private readonly ProductCRUD _productCRUD; public ReportController() { _reportCRUD = new ReportCRUD(); + _productCRUD = new ProductCRUD(); } [HttpPost] [ProducesResponseType(201)] //Created @@ -23,14 +29,62 @@ namespace FirmTracker_Server.Controllers { try { - - if (dateRange == null || dateRange.FromDate >= dateRange.ToDate) - { - return BadRequest("Invalid date range."); - } + var fromDate = dateRange.FromDate; + var toDate = dateRange.ToDate; + using (var session = SessionFactory.OpenSession()) + { + var transactions = session.Query() + .Where(t => t.Date >= fromDate && t.Date <= toDate) + .FetchMany(t => t.TransactionProducts) + .ToList(); - var report = _reportCRUD.AddReport(dateRange.FromDate, dateRange.ToDate); - return CreatedAtAction(nameof(GetReport), new { id = report.Id }, report); // to change? + var expenses = session.Query() + .Where(e => e.Date >= fromDate && e.Date <= toDate) + .ToList(); + + // Calculate total income from transactions + 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) { diff --git a/nHibernate/Reports/ReportCRUD.cs b/nHibernate/Reports/ReportCRUD.cs index 276b2c6..77466f3 100644 --- a/nHibernate/Reports/ReportCRUD.cs +++ b/nHibernate/Reports/ReportCRUD.cs @@ -10,14 +10,14 @@ namespace FirmTracker_Server.nHibernate.Reports { public class ReportCRUD { - public Report AddReport(DateTime fromDate, DateTime toDate) + public Report AddReport(Report report, IList transactions, IList expenses /*DateTime fromDate, DateTime toDate*/) { using (var session = SessionFactory.OpenSession()) using (var sessionTransaction = session.BeginTransaction()) { try { - var transactions = session.Query() + /*var transactions = session.Query() .Where(t => t.Date >= fromDate && t.Date <= toDate) .ToList(); @@ -37,29 +37,38 @@ namespace FirmTracker_Server.nHibernate.Reports TotalExpenses = totalExpenses, TotalBalance = totalBalance - }; + };*/ + + session.Save(report); foreach (var transactionItem in transactions) { + //var trans = session.Load(transactionItem); var reportTransaction = new ReportTransaction { - ReportId = report.Id, - TransactionId = transactionItem.Id + Report = report, + Transaction = transactionItem }; - report.ReportTransactions.Add(reportTransaction); + session.Save(reportTransaction); + //report.ReportTransactions.Add(reportTransaction); + //report.TotalIncome += trans.TotalPrice; } foreach (var expenseItem in expenses) { + //var expense = session.Load(expenseItem); var reportExpense = new ReportExpense { - ReportId = report.Id, - ExpenseId = expenseItem.Id + Report = report, + Expense = expenseItem }; - report.ReportExpenses.Add(reportExpense); + session.Save(reportExpense); + //report.TotalExpenses += expense.Value; + //report.ReportExpenses.Add(reportExpense); } - session.Save(report); + + //session.Save(report); sessionTransaction.Commit(); return report; } From 207ee083306343fc8b97701faad3bfb3675df447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Sun, 9 Jun 2024 23:35:15 +0200 Subject: [PATCH 08/21] update/delete dla raportu + drobne poprawki --- Controllers/ExpenseController.cs | 10 ++-- Controllers/ReportController.cs | 90 ++++++++++++++++++++++++++++++++ nHibernate/Reports/ReportCRUD.cs | 79 ++++++++++++++++++++++++++++ 3 files changed, 174 insertions(+), 5 deletions(-) diff --git a/Controllers/ExpenseController.cs b/Controllers/ExpenseController.cs index cb6b8e6..7ee2eee 100644 --- a/Controllers/ExpenseController.cs +++ b/Controllers/ExpenseController.cs @@ -30,7 +30,7 @@ namespace FirmTracker_Server.Controllers // GET: api/Expenses [HttpGet("{id}")] [ProducesResponseType(200)] // Created - [ProducesResponseType(400)] // Bad Request + [ProducesResponseType(404)] // Bad Request public IActionResult GetExpense(int id) { var expense = _expenseCrud.GetExpense(id); @@ -43,8 +43,8 @@ namespace FirmTracker_Server.Controllers //PUT: api/Expenses [HttpPut("{id}")] - [ProducesResponseType(200)] - [ProducesResponseType(200)] + [ProducesResponseType(204)] + [ProducesResponseType(400)] public IActionResult UpdateExpense(int id, [FromBody] Expense expense) { if (id != expense.Id) @@ -63,8 +63,8 @@ namespace FirmTracker_Server.Controllers } [HttpDelete("{id}")] - [ProducesResponseType(200)] - [ProducesResponseType(400)] + [ProducesResponseType(204)] + [ProducesResponseType(404)] public IActionResult DeleteExpense(int id) { try diff --git a/Controllers/ReportController.cs b/Controllers/ReportController.cs index 7f4eae8..2879b59 100644 --- a/Controllers/ReportController.cs +++ b/Controllers/ReportController.cs @@ -8,6 +8,7 @@ using FirmTracker_Server.nHibernate.Products; using FirmTracker_Server.nHibernate; using NHibernate.Linq; + namespace FirmTracker_Server.Controllers { [Route("api/[controller]")] @@ -31,6 +32,10 @@ namespace FirmTracker_Server.Controllers { var fromDate = dateRange.FromDate; var toDate = dateRange.ToDate; + if (fromDate >= toDate) + { + return BadRequest(); + } using (var session = SessionFactory.OpenSession()) { var transactions = session.Query() @@ -125,5 +130,90 @@ namespace FirmTracker_Server.Controllers return Ok(reports); } + + [HttpPut("{id}")] + [ProducesResponseType(204)] + [ProducesResponseType(400)] + [ProducesResponseType(404)] + public IActionResult UpdateReport(int reportId, [FromBody] Report.DateRangeDto dateRange) + { + try + { + var report = _reportCRUD.GetReport(reportId); + if (report == null) + { + return NotFound(); + } + using (var session = SessionFactory.OpenSession()) + { + var fromDate = dateRange.FromDate; + var toDate = dateRange.ToDate; + if (fromDate >= toDate) + { + return BadRequest(); + } + var transactions = session.Query() + .Where(t => t.Date >= fromDate && t.Date <= toDate) + .FetchMany(t => t.TransactionProducts) + .ToList(); + + var expenses = session.Query() + .Where(e => e.Date >= fromDate && e.Date <= toDate) + .ToList(); + + // Calculate total income from transactions + 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] + [ProducesResponseType(204)] + [ProducesResponseType(404)] + public IActionResult DeleteReport(int reportId) + { + try + { + _reportCRUD.DeleteReport(reportId); + return NoContent(); + } + catch (Exception ex) + { + return NotFound(ex.Message); + } + } } } diff --git a/nHibernate/Reports/ReportCRUD.cs b/nHibernate/Reports/ReportCRUD.cs index 77466f3..89109b6 100644 --- a/nHibernate/Reports/ReportCRUD.cs +++ b/nHibernate/Reports/ReportCRUD.cs @@ -98,5 +98,84 @@ namespace FirmTracker_Server.nHibernate.Reports return reports; } } + + public Report UpdateReport(Report report, IList transactions, IList 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(reportId); + if (report != null) + { + session.Delete(report); + } + + transaction.Commit(); + } + catch + { + transaction.Rollback(); + throw; + } + } + } + } } From a25a1a3d232f3eedb5b76009cf2314694cadc54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Mon, 10 Jun 2024 00:09:40 +0200 Subject: [PATCH 09/21] =?UTF-8?q?endpointy=20zwracaj=C4=85ce=20wykaz=20tra?= =?UTF-8?q?nsakcji/wydatk=C3=B3w=20zawartych=20w=20raporcie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/ReportController.cs | 30 +++++++++++++++++++++++++++--- nHibernate/Reports/ReportCRUD.cs | 24 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/Controllers/ReportController.cs b/Controllers/ReportController.cs index 2879b59..e9d7be2 100644 --- a/Controllers/ReportController.cs +++ b/Controllers/ReportController.cs @@ -96,9 +96,6 @@ namespace FirmTracker_Server.Controllers return BadRequest(ex.Message); } - - - } [HttpGet("{id}")] @@ -119,6 +116,33 @@ namespace FirmTracker_Server.Controllers return Ok(json); } + [HttpGet("{id}/transactions")] + [ProducesResponseType(200)] + [ProducesResponseType(404)] + public IActionResult GetReportTransactions(int reportId) + { + var transactions = _reportCRUD.GetReportTransactions(reportId); + if (transactions == null) + { + return NotFound(); + } + return Ok(transactions); + } + + [HttpGet("{id}/expenses")] + [ProducesResponseType(200)] + [ProducesResponseType(404)] + public IActionResult GetReportExpenses(int reportId) + { + var expenses = _reportCRUD.GetReportExpenses(reportId); + if (expenses == null) + { + return NotFound(); + } + return Ok(expenses); + } + + [HttpGet] [ProducesResponseType(200)] [ProducesResponseType(404)] diff --git a/nHibernate/Reports/ReportCRUD.cs b/nHibernate/Reports/ReportCRUD.cs index 89109b6..970818e 100644 --- a/nHibernate/Reports/ReportCRUD.cs +++ b/nHibernate/Reports/ReportCRUD.cs @@ -99,6 +99,30 @@ namespace FirmTracker_Server.nHibernate.Reports } } + + public IList GetReportTransactions(int reportId) + { + using (var session = SessionFactory.OpenSession()) + { + return session.Query() + .Where(rt => rt.Report.Id == reportId) + .Select(rt => rt.Transaction) + .Fetch(t => t.TransactionProducts) + .ToList(); + } + } + + public IList GetReportExpenses(int reportId) + { + using (var session = SessionFactory.OpenSession()) + { + return session.Query() + .Where(re => re.Report.Id == reportId) + .Select(re => re.Expense) + .ToList(); + } + } + public Report UpdateReport(Report report, IList transactions, IList expenses) { using (var session = SessionFactory.OpenSession()) From eeffab52fc110dda5f952fb38c25261a3c2a12c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Fri, 7 Jun 2024 22:25:44 +0200 Subject: [PATCH 10/21] =?UTF-8?q?Obs=C5=82uga=20sytuacji=20wydania=20towar?= =?UTF-8?q?u=20ponad=20stan=20dla=20metody=20POST?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/TransactionController.cs | 15 +++++++++++++-- nHIbernate/Products/ProductCRUD.cs | 13 +++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Controllers/TransactionController.cs b/Controllers/TransactionController.cs index b4f80d5..135b92e 100644 --- a/Controllers/TransactionController.cs +++ b/Controllers/TransactionController.cs @@ -5,6 +5,7 @@ using System.Text.Json.Serialization; using System.Text.Json; using System.Transactions; using FirmTracker_Server.nHibernate.Products; +using FirmTracker_Server.nHibernate; namespace FirmTracker_Server.Controllers { @@ -41,7 +42,17 @@ namespace FirmTracker_Server.Controllers int type = _productCRUD.GetProductType(product.ProductID); if (type == 1) { - transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100)))); + int availability = _productCRUD.GetProductAvailability(product.ProductID); + + if (product.Quantity > availability) + { + return BadRequest($"Can't add product {product.ProductID} to transaction. Available: {availability}, Desired: {product.Quantity}"); + } + else + { + transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100)))); + } + } else { @@ -99,7 +110,7 @@ namespace FirmTracker_Server.Controllers product.TransactionId = transaction.Id; // This might be 0 at this point if transaction isn't saved yet decimal price = _productCRUD.GetProductPrice(product.ProductID); transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100)))); - } + } _transactionCRUD.UpdateTransaction(transaction); // Now that the transaction is saved, update each product with the correct TransactionId diff --git a/nHIbernate/Products/ProductCRUD.cs b/nHIbernate/Products/ProductCRUD.cs index ef05fd5..e14b12b 100644 --- a/nHIbernate/Products/ProductCRUD.cs +++ b/nHIbernate/Products/ProductCRUD.cs @@ -53,6 +53,19 @@ namespace FirmTracker_Server.nHibernate.Products return product; } } + + public int GetProductAvailability(int productId) + { + using(var session = SessionFactory.OpenSession()) + { + var product = session.Query() + .Where(p => p.Id == productId) + .Select(p => p.Availability) + .FirstOrDefault(); + return product; + } + } + public Product GetProduct(int productId) { using (var session = SessionFactory.OpenSession()) From abac84ccf26ee4bc7b3450e9f36a43dbea84294b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Fri, 7 Jun 2024 19:53:29 +0200 Subject: [PATCH 11/21] =?UTF-8?q?dodanie=20endpointu=20zwracaj=C4=85cego?= =?UTF-8?q?=20produkt=20po=20nazwie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/ProductController.cs | 11 +++++++++++ nHIbernate/Products/ProductCRUD.cs | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/Controllers/ProductController.cs b/Controllers/ProductController.cs index 1d5546f..5cf7885 100644 --- a/Controllers/ProductController.cs +++ b/Controllers/ProductController.cs @@ -45,6 +45,17 @@ namespace FirmTracker_Server.Controllers return Ok(product); } + [HttpGet("name/{name}")] + [ProducesResponseType(200)] + [ProducesResponseType(404)] + public IActionResult GetProductByName(string name) + { + var product = _productCrud.GetProductByName(name); + if (product ==null) + return NotFound(); + return Ok(product); + } + // PUT: api/Products/5 [HttpPut("{id}")] [ProducesResponseType(200)] // Created diff --git a/nHIbernate/Products/ProductCRUD.cs b/nHIbernate/Products/ProductCRUD.cs index e14b12b..d07df8f 100644 --- a/nHIbernate/Products/ProductCRUD.cs +++ b/nHIbernate/Products/ProductCRUD.cs @@ -74,6 +74,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(); + } + } + public void UpdateProduct(Product product) { using (var session = SessionFactory.OpenSession()) From 8ba1cde307106f823e27fe3a775ae33832720d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Mon, 10 Jun 2024 02:40:40 +0200 Subject: [PATCH 12/21] =?UTF-8?q?drobna=20poprawka=20nazwy=20argumentu=20w?= =?UTF-8?q?=20kontrolerze=20raport=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/ReportController.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Controllers/ReportController.cs b/Controllers/ReportController.cs index e9d7be2..789273f 100644 --- a/Controllers/ReportController.cs +++ b/Controllers/ReportController.cs @@ -119,9 +119,9 @@ namespace FirmTracker_Server.Controllers [HttpGet("{id}/transactions")] [ProducesResponseType(200)] [ProducesResponseType(404)] - public IActionResult GetReportTransactions(int reportId) + public IActionResult GetReportTransactions(int id) { - var transactions = _reportCRUD.GetReportTransactions(reportId); + var transactions = _reportCRUD.GetReportTransactions(id); if (transactions == null) { return NotFound(); @@ -132,9 +132,9 @@ namespace FirmTracker_Server.Controllers [HttpGet("{id}/expenses")] [ProducesResponseType(200)] [ProducesResponseType(404)] - public IActionResult GetReportExpenses(int reportId) + public IActionResult GetReportExpenses(int id) { - var expenses = _reportCRUD.GetReportExpenses(reportId); + var expenses = _reportCRUD.GetReportExpenses(id); if (expenses == null) { return NotFound(); @@ -159,11 +159,11 @@ namespace FirmTracker_Server.Controllers [ProducesResponseType(204)] [ProducesResponseType(400)] [ProducesResponseType(404)] - public IActionResult UpdateReport(int reportId, [FromBody] Report.DateRangeDto dateRange) + public IActionResult UpdateReport(int id, [FromBody] Report.DateRangeDto dateRange) { try { - var report = _reportCRUD.GetReport(reportId); + var report = _reportCRUD.GetReport(id); if (report == null) { return NotFound(); @@ -227,11 +227,11 @@ namespace FirmTracker_Server.Controllers [HttpDelete] [ProducesResponseType(204)] [ProducesResponseType(404)] - public IActionResult DeleteReport(int reportId) + public IActionResult DeleteReport(int id) { try { - _reportCRUD.DeleteReport(reportId); + _reportCRUD.DeleteReport(id); return NoContent(); } catch (Exception ex) From 04334f59c04356776bcf188fba1cb88749478dba Mon Sep 17 00:00:00 2001 From: Maciej Maciejewski Date: Tue, 11 Jun 2024 20:12:24 +0200 Subject: [PATCH 13/21] =?UTF-8?q?dodanie=20licencji=20oraz=20produkt=C3=B3?= =?UTF-8?q?w=20i=20danych=20prezentacyjnych=20klienta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/ExpenseController.cs | 19 +- Controllers/ProductController.cs | 19 +- Controllers/ReportController.cs | 25 +- Controllers/TransactionController.cs | 43 +- LICENSE.txt | 674 ++++++++++++++++++ Program.cs | 17 + TestClass.cs | 161 +++-- nHIbernate/Expenses/Expense.cs | 19 +- nHIbernate/Expenses/ExpenseCRUD.cs | 19 +- nHIbernate/Expenses/ExpenseMapping.cs | 19 +- nHIbernate/Products/Product.cs | 19 +- nHIbernate/Products/ProductCRUD.cs | 19 +- nHIbernate/Products/ProductMapping.cs | 19 +- nHIbernate/Reports/Report.cs | 19 +- nHIbernate/Reports/ReportMapping.cs | 19 +- nHIbernate/SessionFactory.cs | 19 +- nHibernate/Reports/ReportCRUD.cs | 19 +- nHibernate/Reports/ReportExpense.cs | 21 +- nHibernate/Reports/ReportExpenseMapping.cs | 19 +- nHibernate/Reports/ReportTransaction.cs | 21 +- .../Reports/ReportTransactionMapping.cs | 19 +- 21 files changed, 1152 insertions(+), 76 deletions(-) create mode 100644 LICENSE.txt diff --git a/Controllers/ExpenseController.cs b/Controllers/ExpenseController.cs index 7ee2eee..77478be 100644 --- a/Controllers/ExpenseController.cs +++ b/Controllers/ExpenseController.cs @@ -1,4 +1,21 @@ -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 . + */ + +using FirmTracker_Server.nHibernate.Expenses; using Microsoft.AspNetCore.Mvc; namespace FirmTracker_Server.Controllers { diff --git a/Controllers/ProductController.cs b/Controllers/ProductController.cs index 5cf7885..a1e1d44 100644 --- a/Controllers/ProductController.cs +++ b/Controllers/ProductController.cs @@ -1,4 +1,21 @@ -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 . + */ + +using FirmTracker_Server.nHibernate.Products; using Microsoft.AspNetCore.Mvc; namespace FirmTracker_Server.Controllers { diff --git a/Controllers/ReportController.cs b/Controllers/ReportController.cs index 789273f..807356b 100644 --- a/Controllers/ReportController.cs +++ b/Controllers/ReportController.cs @@ -1,4 +1,21 @@ -using FirmTracker_Server.nHibernate.Reports; +/* + * 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 . + */ + +using FirmTracker_Server.nHibernate.Reports; using Microsoft.AspNetCore.Mvc; using System.Text.Json.Serialization; using System.Text.Json; @@ -47,7 +64,7 @@ namespace FirmTracker_Server.Controllers .Where(e => e.Date >= fromDate && e.Date <= toDate) .ToList(); - // Calculate total income from transactions + decimal totalIncome = 0; foreach (var transaction in transactions) { @@ -109,7 +126,7 @@ namespace FirmTracker_Server.Controllers var options = new JsonSerializerOptions { - ReferenceHandler = ReferenceHandler.Preserve // Obsługa cykli obiektów + ReferenceHandler = ReferenceHandler.Preserve }; var json = JsonSerializer.Serialize(report, options); @@ -185,7 +202,7 @@ namespace FirmTracker_Server.Controllers .Where(e => e.Date >= fromDate && e.Date <= toDate) .ToList(); - // Calculate total income from transactions + decimal totalIncome = 0; foreach (var transaction in transactions) { diff --git a/Controllers/TransactionController.cs b/Controllers/TransactionController.cs index 135b92e..a0fcffa 100644 --- a/Controllers/TransactionController.cs +++ b/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 . + */ + +using Microsoft.AspNetCore.Mvc; using FirmTracker_Server.nHibernate.Transactions; using System; using System.Text.Json.Serialization; @@ -34,10 +51,10 @@ namespace FirmTracker_Server.Controllers { 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 + product.TransactionId = transaction.Id; decimal price = _productCRUD.GetProductPrice(product.ProductID); int type = _productCRUD.GetProductType(product.ProductID); if (type == 1) @@ -62,15 +79,15 @@ namespace FirmTracker_Server.Controllers _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); } @@ -104,19 +121,19 @@ namespace FirmTracker_Server.Controllers 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 + product.TransactionId = transaction.Id; decimal price = _productCRUD.GetProductPrice(product.ProductID); transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100)))); } _transactionCRUD.UpdateTransaction(transaction); - // Now that the transaction is saved, update each product with the correct TransactionId + 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(); @@ -155,15 +172,15 @@ namespace FirmTracker_Server.Controllers 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); } diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..ae31e67 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. \ No newline at end of file diff --git a/Program.cs b/Program.cs index 676b6dd..85cdebf 100644 --- a/Program.cs +++ b/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 . + */ + using NHibernate; using NHibernate.Cfg; using NHibernate.Dialect; diff --git a/TestClass.cs b/TestClass.cs index 537cc03..9a73481 100644 --- a/TestClass.cs +++ b/TestClass.cs @@ -1,4 +1,21 @@ -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 . + */ + +using FirmTracker_Server.Controllers; using FirmTracker_Server.nHibernate; using FirmTracker_Server.nHibernate.Products; using FirmTracker_Server.nHibernate.Transactions; @@ -9,13 +26,24 @@ 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", + Name = "Produkt test 1", Description = "testowy produkt", Price = 11.50m, Type = 1, @@ -29,42 +57,61 @@ namespace FirmTracker_Server Type = 0, Availability = 0 }; - var product3 = new nHibernate.Products.Product + + var products = new List { - Name = "Produkt 2", - Description = "produkt", - Price = 16.50m, - Type = 1, - Availability = 20 - }; - var product4 = new nHibernate.Products.Product - { - Name = "Produkt 3", - Description = "produkt", - Price = 25.00m, - Type = 1, - Availability = 10 - }; - var product5 = new nHibernate.Products.Product - { - Name = "Usługa 2", - Description = "usługa", - Price = 700.00m, - Type = 0, - Availability = 0 - }; + CreateProduct("Tarta_truskawka", "produkt", 31.99m, 1, 10), + CreateProduct("Tarta_czekolada", "produkt", 30.99m, 1, 8), + CreateProduct("Tarta_agrest", "produkt", 32.90m, 1, 8), + CreateProduct("Tarta_pistacja", "produkt", 35.99m, 1, 12), + CreateProduct("Tarta_karmel", "produkt", 32.00m, 1, 12), + CreateProduct("Rolada_beza", "produkt", 21.00m, 1, 5), + CreateProduct("Rolada_róża", "produkt", 21.90m, 1, 10), + CreateProduct("Kostka_truskawka", "produkt", 12.00m, 1, 11), + CreateProduct("Kostka_lemonCurd", "produkt", 13.99m, 1, 13), + CreateProduct("Kostka_hiszpańska", "produkt", 11.99m, 1, 8), + CreateProduct("Kostka_wiosenna", "produkt", 11.99m, 1, 5), + CreateProduct("Kostka_jabłka", "produkt", 12.00m, 1, 5), + CreateProduct("Kostka_porzeczka", "produkt", 12.99m, 1, 5), + CreateProduct("Kostka_królewska", "produkt", 13.50m, 1, 5), + CreateProduct("Kostka_czekolada", "produkt", 14.50m, 1, 10), + CreateProduct("Kostka_wiśnia", "produkt", 12.50m, 1, 5), + CreateProduct("Kostka_beza", "produkt", 13.50m, 1, 20), + CreateProduct("Kostka_leśna", "produkt", 12.00m, 1, 20), + CreateProduct("Kostka_kawowa", "produkt", 12.00m, 1, 10), + CreateProduct("Kostka_galaretka", "produkt", 12.50m, 1, 25), + 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), + + + }; + var transaction1 = new Transaction { Date = DateTime.Now.AddDays(-2), - Description = "testowa transakcja", - Discount = 10, + Description = "zamówienie telefon", + 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 +119,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,8 +136,20 @@ namespace FirmTracker_Server var expense1 = new Expense { Date = DateTime.Now, - Value = 1003.9m, - Description = "testowy rozchód" + Value = 7999.9m, + 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 @@ -92,20 +159,23 @@ namespace FirmTracker_Server ExpenseCRUD expenseCrud = new ExpenseCRUD(); productCrud.AddProduct(product); productCrud.AddProduct(product2); - productCrud.AddProduct(product3); - productCrud.AddProduct(product4); - productCrud.AddProduct(product5); + // productCrud.AddProduct(product3); + foreach(var clientProduct in products) + { + productCrud.AddProduct(clientProduct); + } transactionCrud.AddTransaction(transaction1); transactionCrud.AddTransaction(transaction2); transactionCrud.AddTransaction(transaction3); + transactionCrud.AddTransaction(transaction4); expenseCrud.AddExpense(expense1); - + expenseCrud.AddExpense(expense2); List testTransactionProducts = new List { - new TransactionProduct { ProductID = 1, Quantity = 2 }, - new TransactionProduct { ProductID = 2, Quantity = 1 }, - new TransactionProduct { ProductID = 3, Quantity = 10 } - }; + new TransactionProduct { ProductID =17, Quantity = 10 }, + new TransactionProduct { ProductID = 14, Quantity = 1 }, + new TransactionProduct { ProductID = 1, Quantity = 2 }, + }; foreach (var transactionProduct in testTransactionProducts) { transactionCrud.AddTransactionProductToTransaction(transaction1.Id, transactionProduct); @@ -114,8 +184,8 @@ namespace FirmTracker_Server List testTransactionProducts2 = new List { - new TransactionProduct { ProductID = 4, Quantity=5}, - new TransactionProduct { ProductID = 5, Quantity=1} + new TransactionProduct { ProductID = 28, Quantity=5}, + new TransactionProduct { ProductID = 22, Quantity=5} }; foreach (var transactionProduct in testTransactionProducts2) { @@ -133,7 +203,16 @@ namespace FirmTracker_Server transactionCrud.AddTransactionProductToTransaction(transaction3.Id, transactionProduct); } + List testTransactionProducts4 = new List + { + 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) diff --git a/nHIbernate/Expenses/Expense.cs b/nHIbernate/Expenses/Expense.cs index 938ec29..4b18723 100644 --- a/nHIbernate/Expenses/Expense.cs +++ b/nHIbernate/Expenses/Expense.cs @@ -1,4 +1,21 @@ -using FirmTracker_Server.nHibernate.Reports; +/* + * 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 . + */ + +using FirmTracker_Server.nHibernate.Reports; namespace FirmTracker_Server.nHibernate.Expenses { diff --git a/nHIbernate/Expenses/ExpenseCRUD.cs b/nHIbernate/Expenses/ExpenseCRUD.cs index a7ceeab..c19c5e6 100644 --- a/nHIbernate/Expenses/ExpenseCRUD.cs +++ b/nHIbernate/Expenses/ExpenseCRUD.cs @@ -1,4 +1,21 @@ -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 . + */ + +using FirmTracker_Server.nHibernate; using FirmTracker_Server.nHibernate.Products; namespace FirmTracker_Server.nHibernate.Expenses diff --git a/nHIbernate/Expenses/ExpenseMapping.cs b/nHIbernate/Expenses/ExpenseMapping.cs index ad2468d..3acda97 100644 --- a/nHIbernate/Expenses/ExpenseMapping.cs +++ b/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 . + */ + +using FluentNHibernate.Mapping; namespace FirmTracker_Server.nHibernate.Expenses { diff --git a/nHIbernate/Products/Product.cs b/nHIbernate/Products/Product.cs index f0089b4..0d69a06 100644 --- a/nHIbernate/Products/Product.cs +++ b/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 . + */ + +using System.Text.Json.Serialization; namespace FirmTracker_Server.nHibernate.Products { diff --git a/nHIbernate/Products/ProductCRUD.cs b/nHIbernate/Products/ProductCRUD.cs index d07df8f..bb2bdc3 100644 --- a/nHIbernate/Products/ProductCRUD.cs +++ b/nHIbernate/Products/ProductCRUD.cs @@ -1,4 +1,21 @@ -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 . + */ + +using FirmTracker_Server.nHibernate; using FirmTracker_Server.nHibernate.Products; using NHibernate; using System.Collections.Generic; diff --git a/nHIbernate/Products/ProductMapping.cs b/nHIbernate/Products/ProductMapping.cs index 4ebdd14..3c85577 100644 --- a/nHIbernate/Products/ProductMapping.cs +++ b/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 . + */ + +using FluentNHibernate.Mapping; namespace FirmTracker_Server.nHibernate.Products { public class ProductMapping : ClassMap diff --git a/nHIbernate/Reports/Report.cs b/nHIbernate/Reports/Report.cs index b13149e..d0ce32b 100644 --- a/nHIbernate/Reports/Report.cs +++ b/nHIbernate/Reports/Report.cs @@ -1,4 +1,21 @@ -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 . + */ + +using FirmTracker_Server.nHibernate.Expenses; using FirmTracker_Server.nHibernate.Transactions; using Newtonsoft.Json; diff --git a/nHIbernate/Reports/ReportMapping.cs b/nHIbernate/Reports/ReportMapping.cs index 00c6e54..a26df93 100644 --- a/nHIbernate/Reports/ReportMapping.cs +++ b/nHIbernate/Reports/ReportMapping.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 . + */ + +using FluentNHibernate.Mapping; namespace FirmTracker_Server.nHibernate.Reports { public class ReportMapping : ClassMap diff --git a/nHIbernate/SessionFactory.cs b/nHIbernate/SessionFactory.cs index cc7ebbe..f053dc1 100644 --- a/nHIbernate/SessionFactory.cs +++ b/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 . + */ + +using FluentNHibernate.Cfg; using FluentNHibernate.Cfg.Db; using NHibernate; using NHibernate.Tool.hbm2ddl; diff --git a/nHibernate/Reports/ReportCRUD.cs b/nHibernate/Reports/ReportCRUD.cs index 970818e..a2c49ea 100644 --- a/nHibernate/Reports/ReportCRUD.cs +++ b/nHibernate/Reports/ReportCRUD.cs @@ -1,4 +1,21 @@ -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 . + */ + +using FirmTracker_Server.nHibernate.Expenses; using FirmTracker_Server.nHibernate.Transactions; using NHibernate; using NHibernate.Linq; diff --git a/nHibernate/Reports/ReportExpense.cs b/nHibernate/Reports/ReportExpense.cs index 6913b38..39c00f6 100644 --- a/nHibernate/Reports/ReportExpense.cs +++ b/nHibernate/Reports/ReportExpense.cs @@ -1,4 +1,21 @@ -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 . + */ + +using FirmTracker_Server.nHibernate.Expenses; namespace FirmTracker_Server.nHibernate.Reports { @@ -23,7 +40,7 @@ namespace FirmTracker_Server.nHibernate.Reports public override int GetHashCode() { - unchecked // Overflow is fine, just wrap + unchecked { int hash = 17; hash = hash * 23 + (Report?.Id.GetHashCode() ?? 0); diff --git a/nHibernate/Reports/ReportExpenseMapping.cs b/nHibernate/Reports/ReportExpenseMapping.cs index 0eae317..487d94a 100644 --- a/nHibernate/Reports/ReportExpenseMapping.cs +++ b/nHibernate/Reports/ReportExpenseMapping.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 . + */ + +using FluentNHibernate.Mapping; namespace FirmTracker_Server.nHibernate.Reports { diff --git a/nHibernate/Reports/ReportTransaction.cs b/nHibernate/Reports/ReportTransaction.cs index 5fc5efd..565d676 100644 --- a/nHibernate/Reports/ReportTransaction.cs +++ b/nHibernate/Reports/ReportTransaction.cs @@ -1,4 +1,21 @@ -using FirmTracker_Server.nHibernate.Transactions; +/* + * 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 . + */ + +using FirmTracker_Server.nHibernate.Transactions; namespace FirmTracker_Server.nHibernate.Reports { @@ -23,7 +40,7 @@ namespace FirmTracker_Server.nHibernate.Reports public override int GetHashCode() { - unchecked // Overflow is fine, just wrap + unchecked { int hash = 17; hash = hash * 23 + (Report?.Id.GetHashCode() ?? 0); diff --git a/nHibernate/Reports/ReportTransactionMapping.cs b/nHibernate/Reports/ReportTransactionMapping.cs index 6ed68e0..f0226f3 100644 --- a/nHibernate/Reports/ReportTransactionMapping.cs +++ b/nHibernate/Reports/ReportTransactionMapping.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 . + */ + +using FluentNHibernate.Mapping; namespace FirmTracker_Server.nHibernate.Reports { From ca6a02205b0e8abffef518b1eea227b123a00cf1 Mon Sep 17 00:00:00 2001 From: kamil Date: Tue, 11 Jun 2024 23:54:30 +0200 Subject: [PATCH 14/21] =?UTF-8?q?obs=C5=82uga=20dodawania=20produkt=C3=B3w?= =?UTF-8?q?=20o=20nieprawid=C5=82owym=20typie=20i/lub=20dost=C4=99pno?= =?UTF-8?q?=C5=9Bci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/ProductController.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Controllers/ProductController.cs b/Controllers/ProductController.cs index a1e1d44..2567b2c 100644 --- a/Controllers/ProductController.cs +++ b/Controllers/ProductController.cs @@ -39,6 +39,14 @@ namespace FirmTracker_Server.Controllers [ProducesResponseType(400)] // Bad Request public IActionResult CreateProduct([FromBody] Product product) { + if (product.Type != 0 && product.Type != 1) + { + return BadRequest("Product type must be set to 0 or 1"); + } + if (product.Type == 0 && product.Availability != 0) + { + return BadRequest("Services availability must be set to 0"); + } try { _productCrud.AddProduct(product); @@ -81,6 +89,14 @@ namespace FirmTracker_Server.Controllers { if (id != product.Id) return BadRequest("Product ID mismatch"); + if (product.Type != 0 && product.Type != 1) + { + return BadRequest("Product type must be set to 0 or 1"); + } + if (product.Type == 0 && product.Availability != 0) + { + return BadRequest("Services availability must be set to 0"); + } try { From ad1fa6e376d2eb7bbd21b444826602a9c4eef856 Mon Sep 17 00:00:00 2001 From: kamil Date: Tue, 11 Jun 2024 23:54:59 +0200 Subject: [PATCH 15/21] =?UTF-8?q?poprawa=20mapowania=20i=20wylicze=C5=84?= =?UTF-8?q?=20totalPrice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/TransactionController.cs | 16 ++++++--- .../Transactions/Transaction2Mapping.cs | 1 + nHibernate/Transactions/TransactionCRUD.cs | 34 +++++++++++++++++-- nHibernate/Transactions/TransactionMapping.cs | 1 + 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/Controllers/TransactionController.cs b/Controllers/TransactionController.cs index a0fcffa..ba33ae3 100644 --- a/Controllers/TransactionController.cs +++ b/Controllers/TransactionController.cs @@ -23,6 +23,7 @@ using System.Text.Json; using System.Transactions; using FirmTracker_Server.nHibernate.Products; using FirmTracker_Server.nHibernate; +using Microsoft.AspNetCore.Http.HttpResults; namespace FirmTracker_Server.Controllers { @@ -63,17 +64,18 @@ namespace FirmTracker_Server.Controllers if (product.Quantity > availability) { - return BadRequest($"Can't add product {product.ProductID} to transaction. Available: {availability}, Desired: {product.Quantity}"); + throw new InvalidOperationException($"Can't add product {product.ProductID} to transaction. Available: {availability}, Desired: {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)))); + //transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100)))); } } else { - transaction.TotalPrice += (price * ((1 - (transaction.Discount / 100)))); + //transaction.TotalPrice += (price * ((1 - (transaction.Discount / 100)))); } } @@ -91,6 +93,13 @@ namespace FirmTracker_Server.Controllers return CreatedAtAction(nameof(GetTransaction), new { id = transaction.Id }, transaction); } + catch (InvalidOperationException ioe) + { + return BadRequest(new { + Message = ioe.Message, + ErrorCode = "Availability" + }); + } catch (Exception ex) { return BadRequest(ex.Message); @@ -121,7 +130,6 @@ namespace FirmTracker_Server.Controllers try { - foreach (var product in transaction.TransactionProducts) { product.TransactionId = transaction.Id; diff --git a/nHibernate/Transactions/Transaction2Mapping.cs b/nHibernate/Transactions/Transaction2Mapping.cs index 0eb7b1b..0b27f2d 100644 --- a/nHibernate/Transactions/Transaction2Mapping.cs +++ b/nHibernate/Transactions/Transaction2Mapping.cs @@ -13,6 +13,7 @@ namespace FirmTracker_Server.nHibernate.Transactions Map(x => x.PaymentType); Map(x => x.Discount); Map(x => x.Description); + Map(x => x.TotalPrice); HasMany(x => x.TransactionProducts) .KeyColumn("TransactionId") diff --git a/nHibernate/Transactions/TransactionCRUD.cs b/nHibernate/Transactions/TransactionCRUD.cs index c76d904..3ebc8f6 100644 --- a/nHibernate/Transactions/TransactionCRUD.cs +++ b/nHibernate/Transactions/TransactionCRUD.cs @@ -19,7 +19,15 @@ namespace FirmTracker_Server.nHibernate.Transactions { foreach (var transactionProduct in transaction.TransactionProducts) { - + var product = session.Get(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); } @@ -78,6 +86,15 @@ namespace FirmTracker_Server.nHibernate.Transactions { foreach (var transactionProduct in transaction.TransactionProducts) { + /*var product = session.Get(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); @@ -154,11 +171,22 @@ namespace FirmTracker_Server.nHibernate.Transactions var transactionToUpdate = session.Get(transactionId); if (transactionToUpdate != null) { + var product = session.Get(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(transactionProduct.ProductID); + + session.Update(transactionToUpdate); + //var product = session.Get(transactionProduct.ProductID); if (product.Type != 0) { product.Availability -= transactionProduct.Quantity; diff --git a/nHibernate/Transactions/TransactionMapping.cs b/nHibernate/Transactions/TransactionMapping.cs index 11aa421..6f0734f 100644 --- a/nHibernate/Transactions/TransactionMapping.cs +++ b/nHibernate/Transactions/TransactionMapping.cs @@ -13,6 +13,7 @@ namespace FirmTracker_Server.nHibernate.Transactions Map(x => x.PaymentType); Map(x => x.Discount); Map(x => x.Description); + Map(x => x.TotalPrice); HasMany(x => x.TransactionProducts) .KeyColumn("TransactionId") From aa81bfe248516462734b68b4e9de06cab1be4dd5 Mon Sep 17 00:00:00 2001 From: kamil Date: Wed, 12 Jun 2024 14:03:49 +0200 Subject: [PATCH 16/21] =?UTF-8?q?zaokr=C4=85glanie=20i=20precyzja=20TotalP?= =?UTF-8?q?rice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/TransactionController.cs | 4 +++- nHibernate/Transactions/Transaction2Mapping.cs | 2 +- nHibernate/Transactions/TransactionCRUD.cs | 8 +++++--- nHibernate/Transactions/TransactionMapping.cs | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Controllers/TransactionController.cs b/Controllers/TransactionController.cs index ba33ae3..8f26387 100644 --- a/Controllers/TransactionController.cs +++ b/Controllers/TransactionController.cs @@ -135,7 +135,9 @@ namespace FirmTracker_Server.Controllers product.TransactionId = transaction.Id; decimal price = _productCRUD.GetProductPrice(product.ProductID); transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100)))); - } + } + + transaction.TotalPrice = Math.Round(transaction.TotalPrice, 2, MidpointRounding.AwayFromZero); _transactionCRUD.UpdateTransaction(transaction); diff --git a/nHibernate/Transactions/Transaction2Mapping.cs b/nHibernate/Transactions/Transaction2Mapping.cs index 0b27f2d..6fff813 100644 --- a/nHibernate/Transactions/Transaction2Mapping.cs +++ b/nHibernate/Transactions/Transaction2Mapping.cs @@ -13,7 +13,7 @@ namespace FirmTracker_Server.nHibernate.Transactions Map(x => x.PaymentType); Map(x => x.Discount); Map(x => x.Description); - Map(x => x.TotalPrice); + Map(x => x.TotalPrice).Precision(18).Scale(2); HasMany(x => x.TransactionProducts) .KeyColumn("TransactionId") diff --git a/nHibernate/Transactions/TransactionCRUD.cs b/nHibernate/Transactions/TransactionCRUD.cs index 3ebc8f6..fda048e 100644 --- a/nHibernate/Transactions/TransactionCRUD.cs +++ b/nHibernate/Transactions/TransactionCRUD.cs @@ -28,9 +28,11 @@ namespace FirmTracker_Server.nHibernate.Transactions { transaction.TotalPrice += (product.Price) * ((1 - (transaction.Discount / 100))); } - transactionProduct.TransactionId = transaction.Id; + 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 @@ -183,8 +185,8 @@ namespace FirmTracker_Server.nHibernate.Transactions transactionProduct.TransactionId= transactionToUpdate.Id; session.Save(transactionProduct); - transaction.Commit(); + transactionToUpdate.TotalPrice = Math.Round(transactionToUpdate.TotalPrice, 2, MidpointRounding.AwayFromZero); session.Update(transactionToUpdate); //var product = session.Get(transactionProduct.ProductID); if (product.Type != 0) @@ -192,7 +194,7 @@ namespace FirmTracker_Server.nHibernate.Transactions product.Availability -= transactionProduct.Quantity; session.Update(product); } - + transaction.Commit(); } else { diff --git a/nHibernate/Transactions/TransactionMapping.cs b/nHibernate/Transactions/TransactionMapping.cs index 6f0734f..eb39303 100644 --- a/nHibernate/Transactions/TransactionMapping.cs +++ b/nHibernate/Transactions/TransactionMapping.cs @@ -13,7 +13,7 @@ namespace FirmTracker_Server.nHibernate.Transactions Map(x => x.PaymentType); Map(x => x.Discount); Map(x => x.Description); - Map(x => x.TotalPrice); + Map(x => x.TotalPrice).Precision(18).Scale(2); HasMany(x => x.TransactionProducts) .KeyColumn("TransactionId") From 06f22951c93fc1b241fc4a4dfd0ea5872ce2a393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Thu, 13 Jun 2024 15:25:07 +0200 Subject: [PATCH 17/21] =?UTF-8?q?korekta=20dost=C4=99pno=C5=9Bci=20produkt?= =?UTF-8?q?=C3=B3w=20i=20totalprice=20przy=20updacie=20transakcji?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/TransactionController.cs | 2 +- nHibernate/Transactions/TransactionCRUD.cs | 31 +++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/Controllers/TransactionController.cs b/Controllers/TransactionController.cs index 8f26387..8e546c7 100644 --- a/Controllers/TransactionController.cs +++ b/Controllers/TransactionController.cs @@ -134,7 +134,7 @@ namespace FirmTracker_Server.Controllers { product.TransactionId = transaction.Id; decimal price = _productCRUD.GetProductPrice(product.ProductID); - transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100)))); + //transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100)))); } transaction.TotalPrice = Math.Round(transaction.TotalPrice, 2, MidpointRounding.AwayFromZero); diff --git a/nHibernate/Transactions/TransactionCRUD.cs b/nHibernate/Transactions/TransactionCRUD.cs index fda048e..284cfd9 100644 --- a/nHibernate/Transactions/TransactionCRUD.cs +++ b/nHibernate/Transactions/TransactionCRUD.cs @@ -86,9 +86,30 @@ namespace FirmTracker_Server.nHibernate.Transactions { try { + + var oldTransaction = session.Load(transaction.Id); + foreach (var tp in oldTransaction.TransactionProducts) + { + var product = session.Get(tp.ProductID); + Console.WriteLine($"Product {product.Name} before quantity: {tp.Quantity}"); + + if (product.Type != 0) + { + product.Availability += tp.Quantity; + transaction.TotalPrice -= ((tp.Quantity * product.Price) * ((1 - (transaction.Discount / 100)))); + } + else + { + transaction.TotalPrice -= (product.Price) * ((1 - (transaction.Discount / 100))); + } + session.Update(product); + } + session.Flush(); + session.Clear(); + foreach (var transactionProduct in transaction.TransactionProducts) { - /*var product = session.Get(transactionProduct.ProductID); + var product = session.Get(transactionProduct.ProductID); if (product.Type != 0) { transaction.TotalPrice += ((transactionProduct.Quantity * product.Price) * ((1 - (transaction.Discount / 100)))); @@ -96,10 +117,13 @@ namespace FirmTracker_Server.nHibernate.Transactions else { transaction.TotalPrice += (product.Price) * ((1 - (transaction.Discount / 100))); - }*/ + } + + //var product = session.Load(transactionProduct.ProductID); + Console.WriteLine($"Product {product.Name} after quantity: {transactionProduct.Quantity}"); transactionProduct.TransactionId = transaction.Id; - session.Update(transactionProduct); + session.SaveOrUpdate(transactionProduct); } session.Update(transaction); @@ -114,7 +138,6 @@ namespace FirmTracker_Server.nHibernate.Transactions session.Update(product); } } - sessionTransaction.Commit(); } catch From 3b32e30d00b5291a43835a6289b7b8d43668b58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Thu, 13 Jun 2024 16:36:44 +0200 Subject: [PATCH 18/21] =?UTF-8?q?przywracanie=20dost=C4=99pno=C5=9Bci=20po?= =?UTF-8?q?=20delete=20transakcji,=20korekcja=20ceny=20po=20updacie=20i=20?= =?UTF-8?q?obs=C5=82uga=20update=20transakcji=20ponad=20dost=C4=99pno?= =?UTF-8?q?=C5=9B=C4=87=20produktu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/TransactionController.cs | 23 ++++------------ nHibernate/Transactions/TransactionCRUD.cs | 31 ++++++++++++++++------ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Controllers/TransactionController.cs b/Controllers/TransactionController.cs index 8e546c7..72c3655 100644 --- a/Controllers/TransactionController.cs +++ b/Controllers/TransactionController.cs @@ -60,22 +60,13 @@ namespace FirmTracker_Server.Controllers int 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) { - throw new InvalidOperationException($"Can't add product {product.ProductID} to transaction. Available: {availability}, Desired: {product.Quantity}"); + throw new InvalidOperationException($"Can't add product {prod.Name} to transaction. Available: {prod.Availability}, Desired: {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)))); } } @@ -95,10 +86,7 @@ namespace FirmTracker_Server.Controllers } catch (InvalidOperationException ioe) { - return BadRequest(new { - Message = ioe.Message, - ErrorCode = "Availability" - }); + return BadRequest(ioe.Message); } catch (Exception ex) { @@ -134,10 +122,9 @@ namespace FirmTracker_Server.Controllers { product.TransactionId = transaction.Id; decimal price = _productCRUD.GetProductPrice(product.ProductID); - //transaction.TotalPrice += ((product.Quantity * price) * ((1 - (transaction.Discount / 100)))); } - transaction.TotalPrice = Math.Round(transaction.TotalPrice, 2, MidpointRounding.AwayFromZero); + _transactionCRUD.UpdateTransaction(transaction); diff --git a/nHibernate/Transactions/TransactionCRUD.cs b/nHibernate/Transactions/TransactionCRUD.cs index 284cfd9..c069e4c 100644 --- a/nHibernate/Transactions/TransactionCRUD.cs +++ b/nHibernate/Transactions/TransactionCRUD.cs @@ -87,7 +87,7 @@ namespace FirmTracker_Server.nHibernate.Transactions try { - var oldTransaction = session.Load(transaction.Id); + var oldTransaction = session.Get(transaction.Id); foreach (var tp in oldTransaction.TransactionProducts) { var product = session.Get(tp.ProductID); @@ -96,17 +96,14 @@ namespace FirmTracker_Server.nHibernate.Transactions if (product.Type != 0) { product.Availability += tp.Quantity; - transaction.TotalPrice -= ((tp.Quantity * product.Price) * ((1 - (transaction.Discount / 100)))); - } - else - { - transaction.TotalPrice -= (product.Price) * ((1 - (transaction.Discount / 100))); } session.Update(product); } session.Flush(); session.Clear(); + transaction.TotalPrice = 0; + foreach (var transactionProduct in transaction.TransactionProducts) { var product = session.Get(transactionProduct.ProductID); @@ -125,6 +122,7 @@ namespace FirmTracker_Server.nHibernate.Transactions transactionProduct.TransactionId = transaction.Id; session.SaveOrUpdate(transactionProduct); } + transaction.TotalPrice = Math.Round(transaction.TotalPrice, 2, MidpointRounding.AwayFromZero); session.Update(transaction); // Decrease product quantities based on transaction @@ -134,8 +132,16 @@ namespace FirmTracker_Server.nHibernate.Transactions var product = session.Get(transactionProduct.ProductID); if (product.Type != 0) { - product.Availability -= transactionProduct.Quantity; - session.Update(product); + if (transactionProduct.Quantity > product.Availability) + { + throw new InvalidOperationException($"Can't add product {product.Name} to transaction. Available: {product.Availability}, Desired: {transactionProduct.Quantity}"); + } + else + { + product.Availability -= transactionProduct.Quantity; + session.Update(product); + } + } } sessionTransaction.Commit(); @@ -175,6 +181,15 @@ namespace FirmTracker_Server.nHibernate.Transactions var transaction = session.Get(transactionId); if (transaction != null) { + foreach (var transactionProduct in transaction.TransactionProducts) + { + var product = session.Get(transactionProduct.ProductID); + if (product.Type != 0) + { + product.Availability += transactionProduct.Quantity; + session.Update(product); + } + } session.Delete(transaction); t.Commit(); } From 43c4e20908a5f36ebfe58562eeeb2576057016ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Thu, 13 Jun 2024 19:10:25 +0200 Subject: [PATCH 19/21] dodawanie produktu do transakcji po nazwie --- Controllers/TransactionController.cs | 25 +++++++++++++++---- nHibernate/Transactions/TransactionProduct.cs | 3 ++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Controllers/TransactionController.cs b/Controllers/TransactionController.cs index 72c3655..d142ba1 100644 --- a/Controllers/TransactionController.cs +++ b/Controllers/TransactionController.cs @@ -55,9 +55,16 @@ namespace FirmTracker_Server.Controllers foreach (var product in transaction.TransactionProducts) { - product.TransactionId = transaction.Id; - decimal price = _productCRUD.GetProductPrice(product.ProductID); - int type = _productCRUD.GetProductType(product.ProductID); + var productByName = _productCRUD.GetProductByName(product.ProductName); + if (productByName == null) + { + throw new InvalidOperationException($"Product with name {product.ProductName} does not exist."); + } + 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) { var prod = _productCRUD.GetProduct(product.ProductID); @@ -120,8 +127,16 @@ namespace FirmTracker_Server.Controllers { foreach (var product in transaction.TransactionProducts) { - product.TransactionId = transaction.Id; - decimal price = _productCRUD.GetProductPrice(product.ProductID); + var productByName = _productCRUD.GetProductByName(product.ProductName); + if (productByName == null) + { + throw new InvalidOperationException($"Product with name {product.ProductName} does not exist."); + } + product.ProductID = productByName.Id; + product.TransactionId = transaction.Id; + + decimal price = productByName.Price;// _productCRUD.GetProductPrice(product.ProductID); + int type = productByName.Type;//_productCRUD.GetProductType(product.ProductID); } diff --git a/nHibernate/Transactions/TransactionProduct.cs b/nHibernate/Transactions/TransactionProduct.cs index 943e7a2..1d88ad7 100644 --- a/nHibernate/Transactions/TransactionProduct.cs +++ b/nHibernate/Transactions/TransactionProduct.cs @@ -8,7 +8,8 @@ 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 int ProductID { get; set; } + public virtual string ProductName { get; set; } public virtual int Quantity { get; set; } } } From 321ce311defd1f9c331da1ddb37a6b8e688307a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Ry=C5=BCek?= Date: Fri, 14 Jun 2024 13:46:20 +0200 Subject: [PATCH 20/21] =?UTF-8?q?t=C5=82umaczenie=20komunikat=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/ProductController.cs | 12 ++++++------ Controllers/ReportController.cs | 4 ++-- Controllers/TransactionController.cs | 8 ++++---- nHibernate/Transactions/TransactionCRUD.cs | 6 +----- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Controllers/ProductController.cs b/Controllers/ProductController.cs index 2567b2c..1e0814e 100644 --- a/Controllers/ProductController.cs +++ b/Controllers/ProductController.cs @@ -41,11 +41,11 @@ namespace FirmTracker_Server.Controllers { if (product.Type != 0 && product.Type != 1) { - return BadRequest("Product type must be set to 0 or 1"); + return BadRequest("Kategoria produktu musi być ustawiona na 0 lub 1."); } if (product.Type == 0 && product.Availability != 0) { - return BadRequest("Services availability must be set to 0"); + return BadRequest("Dostępność usługi musi być ustawiona na 0."); } try { @@ -88,14 +88,14 @@ namespace FirmTracker_Server.Controllers public IActionResult UpdateProduct(int id, [FromBody] Product product) { if (id != product.Id) - return BadRequest("Product ID mismatch"); + return BadRequest("ID produktu nie zgadza się."); if (product.Type != 0 && product.Type != 1) { - return BadRequest("Product type must be set to 0 or 1"); + return BadRequest("Kategoria produktu musi być ustawiona na 0 lub 1."); } if (product.Type == 0 && product.Availability != 0) { - return BadRequest("Services availability must be set to 0"); + return BadRequest("Dostępność usługi musi być ustawiona na 0."); } try @@ -149,7 +149,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; } diff --git a/Controllers/ReportController.cs b/Controllers/ReportController.cs index 807356b..fe917bb 100644 --- a/Controllers/ReportController.cs +++ b/Controllers/ReportController.cs @@ -51,7 +51,7 @@ namespace FirmTracker_Server.Controllers var toDate = dateRange.ToDate; if (fromDate >= toDate) { - return BadRequest(); + return BadRequest("Nieprawidłowy zakres dat."); } using (var session = SessionFactory.OpenSession()) { @@ -191,7 +191,7 @@ namespace FirmTracker_Server.Controllers var toDate = dateRange.ToDate; if (fromDate >= toDate) { - return BadRequest(); + return BadRequest("Nieprawidłowy zakres dat."); } var transactions = session.Query() .Where(t => t.Date >= fromDate && t.Date <= toDate) diff --git a/Controllers/TransactionController.cs b/Controllers/TransactionController.cs index d142ba1..3f82653 100644 --- a/Controllers/TransactionController.cs +++ b/Controllers/TransactionController.cs @@ -58,7 +58,7 @@ namespace FirmTracker_Server.Controllers var productByName = _productCRUD.GetProductByName(product.ProductName); if (productByName == null) { - throw new InvalidOperationException($"Product with name {product.ProductName} does not exist."); + throw new InvalidOperationException($"Produkt o nazwie {product.ProductName} nie istnieje."); } product.ProductID = productByName.Id; product.TransactionId = transaction.Id; @@ -71,7 +71,7 @@ namespace FirmTracker_Server.Controllers if (product.Quantity > prod.Availability) { - throw new InvalidOperationException($"Can't add product {prod.Name} to transaction. Available: {prod.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}"); } } @@ -121,7 +121,7 @@ namespace FirmTracker_Server.Controllers 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 { @@ -130,7 +130,7 @@ namespace FirmTracker_Server.Controllers var productByName = _productCRUD.GetProductByName(product.ProductName); if (productByName == null) { - throw new InvalidOperationException($"Product with name {product.ProductName} does not exist."); + throw new InvalidOperationException($"Produkt o nazwie {product.ProductName} nie istnieje."); } product.ProductID = productByName.Id; product.TransactionId = transaction.Id; diff --git a/nHibernate/Transactions/TransactionCRUD.cs b/nHibernate/Transactions/TransactionCRUD.cs index c069e4c..57a0221 100644 --- a/nHibernate/Transactions/TransactionCRUD.cs +++ b/nHibernate/Transactions/TransactionCRUD.cs @@ -91,7 +91,6 @@ namespace FirmTracker_Server.nHibernate.Transactions foreach (var tp in oldTransaction.TransactionProducts) { var product = session.Get(tp.ProductID); - Console.WriteLine($"Product {product.Name} before quantity: {tp.Quantity}"); if (product.Type != 0) { @@ -116,9 +115,6 @@ namespace FirmTracker_Server.nHibernate.Transactions transaction.TotalPrice += (product.Price) * ((1 - (transaction.Discount / 100))); } - //var product = session.Load(transactionProduct.ProductID); - Console.WriteLine($"Product {product.Name} after quantity: {transactionProduct.Quantity}"); - transactionProduct.TransactionId = transaction.Id; session.SaveOrUpdate(transactionProduct); } @@ -134,7 +130,7 @@ namespace FirmTracker_Server.nHibernate.Transactions { if (transactionProduct.Quantity > product.Availability) { - throw new InvalidOperationException($"Can't add product {product.Name} to transaction. Available: {product.Availability}, Desired: {transactionProduct.Quantity}"); + throw new InvalidOperationException($"Nie można dodać {product.Name} do transakcji. Dostępność: {product.Availability}, Zażądano: {transactionProduct.Quantity}"); } else { From 43a4cbf81e7a0e3f3e2ae49d77c715fc642e369d Mon Sep 17 00:00:00 2001 From: Maciej Maciejewski Date: Fri, 14 Jun 2024 14:44:14 +0200 Subject: [PATCH 21/21] dodatkowe produkty testowe --- TestClass.cs | 53 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/TestClass.cs b/TestClass.cs index 9a73481..eb3e30d 100644 --- a/TestClass.cs +++ b/TestClass.cs @@ -39,25 +39,18 @@ namespace FirmTracker_Server } public void AddTestProduct() { - // SessionFactory.Init(ConnectionString); + // SessionFactory.Init(ConnectionString); + - var product = new nHibernate.Products.Product - { - Name = "Produkt test 1", - Description = "testowy produkt", - Price = 11.50m, - Type = 1, - Availability = 5 - }; var product2 = new nHibernate.Products.Product { - Name = "Usluga 1", - Description = "testowa usluga", - Price = 1120.00m, + Name = "Dostawa", + Description = "usługa dostawy", + Price = 7.50m, Type = 0, Availability = 0 }; - + var products = new List { CreateProduct("Tarta_truskawka", "produkt", 31.99m, 1, 10), @@ -96,10 +89,26 @@ namespace FirmTracker_Server 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), @@ -146,10 +155,11 @@ namespace FirmTracker_Server Description = "naprawa pieca - 25.05.2024" }; var expense3 = new Expense - { Date = DateTime.Now, - Value = 1800.00m, - Description = "zakup składników " - + { + Date = DateTime.Now, + Value = 1800.00m, + Description = "zakup składników " + }; try @@ -157,7 +167,7 @@ namespace FirmTracker_Server 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); foreach(var clientProduct in products) @@ -170,11 +180,12 @@ namespace FirmTracker_Server transactionCrud.AddTransaction(transaction4); expenseCrud.AddExpense(expense1); expenseCrud.AddExpense(expense2); + expenseCrud.AddExpense(expense3); List testTransactionProducts = new List { new TransactionProduct { ProductID =17, Quantity = 10 }, new TransactionProduct { ProductID = 14, Quantity = 1 }, - new TransactionProduct { ProductID = 1, Quantity = 2 }, + new TransactionProduct { ProductID = 1, Quantity = 0 }, }; foreach (var transactionProduct in testTransactionProducts) { @@ -195,7 +206,7 @@ namespace FirmTracker_Server List testTransactionProducts3 = new List { - new TransactionProduct { ProductID = 3, Quantity=12}, + new TransactionProduct { ProductID = 3, Quantity=9}, new TransactionProduct { ProductID = 2, Quantity=1} }; foreach (var transactionProduct in testTransactionProducts3)