dodanie absencji, zmiany w endpointach, mały refactor

Authentication/AuthenticationSettings.cs

@@ -2,8 +2,8 @@
 {
     public class AuthenticationSettings
     {
-        public  string JwtSecKey { get; set; }
+        public string JwtSecKey { get; set; }
         public int JwtExpireDays { get; set; }
-        public  string JwtIssuer { get; set; }
+        public string JwtIssuer { get; set; }
     }
 }

Controllers/PdfController.cs

@@ -1,21 +1,4 @@
-/*
+using System;
- * This file is part of FirmTracker - Server.
- *
- * FirmTracker - Server is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * FirmTracker - Server is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
- */
-
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -37,13 +20,11 @@ namespace FirmTracker_Server.Controllers
     {
         private readonly IExpenseRepository _expenseRepository;
         private readonly ITransactionRepository _transactionRepository;
-        private readonly IProductRepository _productRepository;
 
-        public PdfController(IExpenseRepository expenseRepository, ITransactionRepository transactionRepository, IProductRepository productRepository)
+        public PdfController(IExpenseRepository expenseRepository, ITransactionRepository transactionRepository)
         {
             _expenseRepository = expenseRepository;
             _transactionRepository = transactionRepository;
-            _productRepository = productRepository;
         }
 
         [HttpGet("download")]
@@ -55,9 +36,11 @@ namespace FirmTracker_Server.Controllers
         {
             try
             {
+                // Validate date inputs and set default values
                 DateTime start = startDate ?? DateTime.MinValue;
                 DateTime end = endDate ?? DateTime.MaxValue;
 
+                // Validate report type
                 if (string.IsNullOrEmpty(reportType) ||
                     (reportType.ToLower() != "expenses" && reportType.ToLower() != "transactions"))
                 {
@@ -125,30 +108,33 @@ namespace FirmTracker_Server.Controllers
                         page.Margin(2, Unit.Centimetre);
                         page.PageColor(Colors.White);
                         page.DefaultTextStyle(x => x.FontSize(12));
+
+                        // Main header
                         page.Header()
                             .Text("Raport transakcji")
-                            .FontSize(22)
+                            .FontSize(20)
                             .SemiBold()
-                            .FontColor(Colors.Blue.Medium)
                             .AlignCenter();
 
+                        // Summary section
                         page.Content().PaddingVertical(1, Unit.Centimetre).Column(column =>
                         {
                             column.Spacing(10);
 
                             column.Item().Text($"Transakcje od ({startDate:yyyy-MM-dd} do {endDate:yyyy-MM-dd})")
-                                .FontSize(16)
+                                .FontSize(16).Underline();
-                                .Underline()
-                                .FontColor(Colors.Grey.Medium);
 
+                            // Add table header
                             column.Item().Row(row =>
                             {
-                                row.RelativeItem().Text("Data").SemiBold().FontColor(Colors.Blue.Darken1);
+                                row.RelativeItem().Text("Data").SemiBold();
-                                row.RelativeItem().Text("Typ płatności").SemiBold().FontColor(Colors.Blue.Darken1);
+                                row.RelativeItem().Text("Typ płatności").SemiBold();
-                                row.RelativeItem().Text("Kwota razem").SemiBold().FontColor(Colors.Blue.Darken1);
+                                row.RelativeItem().Text("Kwota razem").SemiBold();
-                                row.RelativeItem().Text("Rabat").SemiBold().FontColor(Colors.Blue.Darken1);
+                                row.RelativeItem().Text("Rabat").SemiBold();
-                                row.RelativeItem().Text("Opis").SemiBold().FontColor(Colors.Blue.Darken1);
+                                row.RelativeItem().Text("Opis").SemiBold();
                             });
+
+                            // Populate table rows with transaction data
                             foreach (var transaction in transactions)
                             {
                                 column.Item().Row(row =>
@@ -159,32 +145,34 @@ namespace FirmTracker_Server.Controllers
                                     row.RelativeItem().Text(transaction.Discount.ToString("C"));
                                     row.RelativeItem().Text(transaction.Description);
                                 });
+
+                                // Fetch and display transaction products for this transaction
                                 var products = transactionProducts
                                     .Where(tp => tp.TransactionId == transaction.Id)
                                     .ToList();
 
                                 if (products.Any())
                                 {
-                                    column.Item().Text("Produkty:").SemiBold().FontColor(Colors.Blue.Medium);
+                                    column.Item().Text("Produkty:").SemiBold();
                                     foreach (var product in products)
                                     {
-                                        var productQuery = _productRepository.GetProduct(product.Id);
                                         column.Item().Row(productRow =>
                                         {
-                                            productRow.RelativeItem().Text($"Nazwa produktu: {productQuery.Name}");
+                                            productRow.RelativeItem().Text($"Nazwa produktu: {product.ProductName}");
                                             productRow.RelativeItem().Text($"Ilość: {product.Quantity}");
-                                            productRow.RelativeItem().Text($"Cena 1 szt. bez rabatu: {productQuery.Price.ToString("F2")}");
                                         });
                                     }
                                 }
                             }
                         });
+
+                        // Footer with generation date
                         page.Footer()
                             .AlignCenter()
                             .Text(text =>
                             {
-                                text.Span("Wygenerowano przez automat FT: ").FontColor(Colors.Grey.Medium);
+                                text.Span("Wygenerowano przez automat FT: ");
-                                text.Span(DateTime.Now.ToString("yyyy-MM-dd")).SemiBold().FontColor(Colors.Grey.Medium);
+                                text.Span(DateTime.Now.ToString("yyyy-MM-dd")).SemiBold();
                             });
                     });
                 }).GeneratePdf(ms);
@@ -208,32 +196,33 @@ namespace FirmTracker_Server.Controllers
                         page.Margin(2, Unit.Centimetre);
                         page.PageColor(Colors.White);
                         page.DefaultTextStyle(x => x.FontSize(12));
+
+                        // Main header
                         page.Header()
                             .Text("Raport wydatków")
-                            .FontSize(22)
+                            .FontSize(20)
                             .SemiBold()
-                            .FontColor(Colors.Green.Medium)
                             .AlignCenter();
+
+                        // Summary section
                         page.Content().PaddingVertical(1, Unit.Centimetre).Column(column =>
                         {
                             column.Spacing(10);
 
                             column.Item().Row(row =>
                             {
-                                row.RelativeItem().Text($"Łączne wydatki: {totalExpenses:C}").FontSize(14).Bold().FontColor(Colors.Green.Darken1);
+                                row.RelativeItem().Text($"Łączne wydatki: {totalExpenses:C}").FontSize(14).Bold();
-                                row.RelativeItem().Text($"Średnie wydatki dzienne: {averageExpense:C}").FontSize(14).Bold().FontColor(Colors.Green.Darken1);
+                                row.RelativeItem().Text($"Średnie wydatki dzienne: {averageExpense:C}").FontSize(14).Bold();
                             });
 
                             column.Item().Text($"Szczegóły wydatków od ({startDate:yyyy-MM-dd} do {endDate:yyyy-MM-dd})")
-                                .FontSize(16)
+                                .FontSize(16).Underline();
-                                .Underline()
-                                .FontColor(Colors.Grey.Medium);
 
                             column.Item().Row(row =>
                             {
-                                row.RelativeItem().Text("Data").SemiBold().FontColor(Colors.Green.Darken1);
+                                row.RelativeItem().Text("Data").SemiBold();
-                                row.RelativeItem().Text("Kwota").SemiBold().FontColor(Colors.Green.Darken1);
+                                row.RelativeItem().Text("Kwota").SemiBold();
-                                row.RelativeItem().Text("Opis").SemiBold().FontColor(Colors.Green.Darken1);
+                                row.RelativeItem().Text("Opis").SemiBold();
                             });
 
                             foreach (var expense in expenses)
@@ -246,12 +235,13 @@ namespace FirmTracker_Server.Controllers
                                 });
                             }
                         });
+
                         page.Footer()
                             .AlignCenter()
                             .Text(text =>
                             {
-                                text.Span("Wygenerowano przez automat FT: ").FontColor(Colors.Grey.Medium);
+                                text.Span("Wygenerowano przez automat FT: ");
-                                text.Span(DateTime.Now.ToString("yyyy-MM-dd")).SemiBold().FontColor(Colors.Grey.Medium);
+                                text.Span(DateTime.Now.ToString("yyyy-MM-dd")).SemiBold();
                             });
                     });
                 }).GeneratePdf(ms);
@@ -259,7 +249,5 @@ namespace FirmTracker_Server.Controllers
                 return ms.ToArray();
             }
         }
-
-
     }
 }

Controllers/ProductController.cs

@@ -42,7 +42,7 @@ namespace FirmTracker_Server.Controllers
         [HttpPost]
         [ProducesResponseType(200)] // Created
         [ProducesResponseType(400)] // Bad Request
-        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
+        [Authorize(Roles = Roles.Admin)]
         public IActionResult CreateProduct([FromBody] Product product)
         {
             try
@@ -63,11 +63,6 @@ namespace FirmTracker_Server.Controllers
                 {
                     throw new InvalidOperationException("Produkt nie może posiadać ujemnej ceny.");
                 }
-                var productByName = _productCrud.GetProductByName(product.Name);
-                if (productByName != null)
-                {
-                    throw new InvalidOperationException("Produkt o podanej nazwie już istnieje.");
-                }
 
                 _productCrud.AddProduct(product);
                 return CreatedAtAction("GetProduct", new { id = product.Id }, product);
@@ -153,7 +148,7 @@ namespace FirmTracker_Server.Controllers
         [HttpDelete("{id}")]
         [ProducesResponseType(200)] // Created
         [ProducesResponseType(400)] // Bad Request
-        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
+        [Authorize(Roles = Roles.Admin)]
         public IActionResult DeleteProduct(int id)
         {
             try

Controllers/TransactionController.cs

@@ -25,8 +25,6 @@ using FirmTracker_Server.nHibernate.Products;
 using FirmTracker_Server.nHibernate;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Authorization;
-using FirmTracker_Server.Services;
-using System.Security.Claims;
 
 namespace FirmTracker_Server.Controllers
 {
@@ -37,11 +35,11 @@ namespace FirmTracker_Server.Controllers
     {
         private readonly TransactionCRUD _transactionCRUD;
         private readonly ProductCRUD _productCRUD;
+
         public TransactionController()
         {
             _transactionCRUD = new TransactionCRUD();
             _productCRUD = new ProductCRUD();
-           
         }
         
 
@@ -57,8 +55,7 @@ namespace FirmTracker_Server.Controllers
         {
             try
             {
-                var userId = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value;
+               
-                transaction.EmployeeId = int.Parse(userId);
                 foreach (var product in transaction.TransactionProducts)
                 {
                     // Validate if the product quantity is positive
@@ -233,15 +230,15 @@ namespace FirmTracker_Server.Controllers
             try
             {
                 _transactionCRUD.DeleteTransactionProduct(transactionId, productId);
-                return NoContent();  
+                return NoContent();  // Successfully removed the product
             }
             catch (InvalidOperationException ioe)
             {
-                return BadRequest(ioe.Message);  
+                return BadRequest(ioe.Message);  // If the transaction or product isn't found
             }
             catch (Exception ex)
             {
-                return NotFound(ex.Message);  
+                return NotFound(ex.Message);  // Other general errors
             }
         }
     }

Controllers/UserController.cs

@@ -1,20 +1,4 @@
-/*
+using FirmTracker_Server.Models;
- * This file is part of FirmTracker - Server.
- *
- * FirmTracker - Server is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * FirmTracker - Server is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
- */
-using FirmTracker_Server.Models;
 using FirmTracker_Server.Services;
 using FirmTracker_Server;
 using Microsoft.AspNetCore.Authorization;
@@ -22,9 +6,6 @@ using Microsoft.AspNetCore.Mvc;
 using FirmTracker_Server.Entities;
 using System.Security.Claims;
 
-using System.Security.Cryptography;
-using System.Text;
-
 namespace FirmTracker_Server.Controllers
 {
     [Route("api/user")]
@@ -47,12 +28,6 @@ namespace FirmTracker_Server.Controllers
             {
                 return BadRequest("Nieprawidłowa wartość pola. /n" + ModelState);
             }
-            if (!IsValidPassword(dto.Password))
-            {
-                return BadRequest("Hasło musi mieć co najmniej 8 znaków i nie może zawierać spacji, ani tabulatorów.");
-            }
-
-
             var id = UserService.AddUser(dto);
             return Created($"/api/user/{id}", "User dodany poprawnie");
         }
@@ -75,13 +50,6 @@ namespace FirmTracker_Server.Controllers
             }
             return Ok(roleClaim);
         }
-        [HttpGet("UsersList")]
-        [Authorize(Roles = Roles.Admin)]
-        public ActionResult<IList<EmployeeDto>> GetAllUsers()
-        {
-            var users = UserService.GetAllUsers();
-            return Ok(users);
-        }
         [HttpGet("emails")]
         [Authorize(Roles = Roles.Admin)]
         public ActionResult<IEnumerable<string>> GetAllUserEmails()
@@ -94,65 +62,6 @@ namespace FirmTracker_Server.Controllers
 
             return Ok(emails);
         }
-        [HttpPost("ChangeUserPassword")]
-        [Authorize(Roles = Roles.Admin)]
-        public ActionResult ChangeUserPassword([FromBody] ChangeUserPasswordDto dto)
-        {
-            try
-            {
-                if (!IsValidPassword(dto.password))
-                {
-                    return BadRequest("Password must be at least 8 characters long and cannot contain spaces or tabs.");
-                }
-
-                var result = UserService.ChangeUserPassword(dto);
-
-                if (result)
-                {
-                    return Ok("Password changed successfully.");
-                }
-                else
-                {
-                    return BadRequest("Failed to change the password.");
-                }
-            }
-            catch (Exception ex)
-            {
-                return BadRequest($"An error occurred: {ex.Message}");
-            }
-        }
-        [HttpPost("changePassword")]
-        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
-        public ActionResult ChangePassword([FromBody] UpdatePasswordDto dto)
-        {
-            try
-            {
-                var result = UserService.UpdatePassword(dto);
-                if (result)
-                {
-                    var loginDto = new LoginDto { Email = dto.email, Password = dto.newPassword };
-                    var token = UserService.CreateTokenJwt(loginDto);
-                    return Ok(new { Token = token });
-                }
-                else
-                {
-                    return BadRequest("Failed to change the password.");
-                }
-            }
-            catch (Exception ex)
-            {
-                return BadRequest($"An error occurred: {ex.Message}");
-            }
-        }
-        private bool IsValidPassword(string password)
-        {
-            if (string.IsNullOrEmpty(password) || password.Length < 8 || password.Contains(" ") || password.Contains("\t"))
-            {
-                return false;
-            }
-            return true;
-        }
-
         // New method to get all users
         /* [HttpGet("all")]
          [AllowAnonymous]

Controllers/WorkDayController.cs

@@ -47,11 +47,13 @@ namespace FirmTracker_Server.Controllers
                 var userIdString = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value;
                 int userId = int.Parse(userIdString);
 
+                // Attempt to start a new workday
                 _workdayCRUD.StartWorkday(userId);
                 return Ok(new { status = "started", userId });
             }
             catch (Exception ex)
             {
+                // If there's an error (like previous workday not stopped), handle it
                 return BadRequest(new { message = "An error occurred while starting the workday.", error = ex.Message });
             }
         }
@@ -74,6 +76,8 @@ namespace FirmTracker_Server.Controllers
             }
         }
 
+
+
         [HttpGet("user/workdays")]
         [Authorize(Roles = Roles.Admin + "," + Roles.User)]
         public IActionResult GetWorkdaysLoggedUser()
@@ -91,7 +95,6 @@ namespace FirmTracker_Server.Controllers
             }
         }
 
-        // Endpoint to get all workdays for a user
         [HttpGet("user/{userMail}/workdays")]
         [Authorize(Roles = Roles.Admin + "," + Roles.User)]
         public IActionResult GetWorkdays(string userMail)
@@ -106,9 +109,41 @@ namespace FirmTracker_Server.Controllers
                 return BadRequest(new { message = "An error occurred while fetching workdays.", error = ex.Message });
             }
         }
+        
+        [HttpGet("absences")]
+        [Authorize(Roles = Roles.Admin)]
+        public IActionResult GetAbsences()
+        {
+            try
+            {
+                var absences = _workdayCRUD.GetAbsences();
+                return Ok(absences);
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(new { message = "An error occurred while fetching absences.", error = ex.Message });
+            }
+        }
         [HttpPost("absence/add")]
-        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
+        [Authorize(Roles = Roles.Admin)]
-        public IActionResult AddAbsence([FromBody] AddAbsenceDto dto)
+        public IActionResult AddAbsence([FromBody] string Absence)
+        {
+            try
+            {
+                          
+                _workdayCRUD.AddAbsence(Absence);
+
+                return Ok(new { status = "added", Absence});
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(new { message = "An error occurred while adding the absence.", error = ex.Message });
+            }
+        }
+
+        [HttpPost("user/absence/add")]
+        [Authorize(Roles = Roles.Admin)]
+        public IActionResult AddUserAbsence([FromBody] AddAbsenceDto dto)
         {
             try
             {
@@ -117,6 +152,7 @@ namespace FirmTracker_Server.Controllers
                     return BadRequest(new { message = "User email must be provided." });
                 }
 
+                // Fetch the userId based on the provided email
                 int userId;
                 using (var session = SessionFactory.OpenSession())
                 {
@@ -128,45 +164,17 @@ namespace FirmTracker_Server.Controllers
                     userId = user.UserId;
                 }
 
-                _workdayCRUD.AddAbsence(userId, dto.AbsenceType, dto.StartTime, dto.EndTime);
+                // Add the absence for the retrieved userId
+                _workdayCRUD.AddAbsenceToUser(userId, dto.AbsenceType, dto.StartTime, dto.EndTime);
 
                 return Ok(new { status = "added", userId, dto.userEmail, absenceType = dto.AbsenceType });
             }
             catch (Exception ex)
             {
-                return BadRequest(new { message = "An error occurred while adding the absence.", error = ex.Message });
+                return BadRequest(new { message = "An error occurred while adding the absence to user.", error = ex.Message });
             }
         }
 
-        [HttpGet("user/{userMail}/day/info/{date}")]
-        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
-        public IActionResult GetUserDayDetailsByMail(string userMail, DateTime date)
-        {
-            try
-            {
-                var dayDetails = _workdayCRUD.GetDayDetails(userMail, date);
-                return Ok(dayDetails);
-            }
-            catch (Exception ex)
-            {
-                return BadRequest(new { message = "An error occurred while fetching the day's details.", error = ex.Message });
-            }
-        }
-        [HttpGet("user/day/info/{date}")]
-        [Authorize(Roles = Roles.Admin + "," + Roles.User)]
-        public IActionResult GetUserDayDetails(DateTime date)
-        {
-            try
-            {
-                var userId = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value;
 
-                var dayDetails = _workdayCRUD.GetDayDetailsForLoggedUser(int.Parse(userId), date);
-                return Ok(dayDetails);
-            }
-            catch (Exception ex)
-            {
-                return BadRequest(new { message = "An error occurred while fetching the day's details.", error = ex.Message });
-            }
-        }
     }
 }

Dockerfile

@@ -12,7 +12,7 @@ COPY . .
 
 
 # Copy the szyfrowanie.dll into the build directory (to ensure it's available during the build)
-#COPY ["szyfrowanie.dll", "./"]
+COPY ["szyfrowanie.dll", "./"]
 
 # Build the app
 RUN dotnet build "FirmTracker-Server.csproj" -c Release -o /app/build
@@ -31,7 +31,7 @@ EXPOSE 443
 COPY --from=publish /app/publish .
 
 # Copy the szyfrowanie.dll to the final image (if needed at runtime)
-#COPY ["szyfrowanie.dll", "./"]
+COPY ["szyfrowanie.dll", "./"]
 
 # Set the entry point for the container
 ENTRYPOINT ["dotnet", "FirmTracker-Server.dll"]

FirmTracker-Server.csproj

@@ -35,6 +35,12 @@
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.1.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="szyfrowanie">
+      <HintPath>./szyfrowanie.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

JenkinsFile

@@ -1,26 +1,23 @@
 pipeline {
     agent any
-    environment {
-        IMG_NAME = 'firmtracker-server'
-        DOCKER_REPO = 'maciejm0101/firmtracker'
-    }
     stages {
-        stage('build') {
+        stage('Restore Dependencies') {
             steps {
-                script {
+                echo 'Restoring dependencies...'
-                        sh 'docker build -t ${IMG_NAME} .'
+                sh 'dotnet restore'
-                        sh 'docker tag ${IMG_NAME} ${DOCKER_REPO}:${IMG_NAME}'
-                }
             }
         }
-        stage('push') {
+        stage('Build') {
             steps {
-                withCredentials([usernamePassword(credentialsId: 'DockerHub-LG', passwordVariable: 'PSWD', usernameVariable: 'LOGIN')]) {
+                echo 'Building the project...'
-                    script {
+                sh 'dotnet build --configuration Release'
-                        sh 'echo ${PSWD} | docker login -u ${LOGIN} --password-stdin'
+            }
-                        sh 'docker push ${DOCKER_REPO}:${IMG_NAME}'
+        }
-                    }
+        
-                }
+        stage('Publish') {
+            steps {
+                echo 'Publishing the project...'
+                sh 'dotnet publish --configuration Release --output ./publish'
             }
         }
     }

Models/AddAbsenceDtocs.cs

@@ -1,25 +1,9 @@
-/*
+namespace FirmTracker_Server.Models
- * This file is part of FirmTracker - Server.
- *
- * FirmTracker - Server is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * FirmTracker - Server is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
- */
-namespace FirmTracker_Server.Models
 {
     public class AddAbsenceDto
     {
         public string userEmail { get; set; }
-        public string AbsenceType { get; set; }
+        public string AbsenceType { get; set; } // e.g., "Sick", "Vacation", etc.
         public DateTime StartTime { get; set; }
         public DateTime EndTime { get; set; }
       

Models/ChangeUserPasswordDto.cs

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

Models/CreateUserDto.cs

@@ -1,27 +1,11 @@
-/*
+namespace FirmTracker_Server.Models
- * This file is part of FirmTracker - Server.
- *
- * FirmTracker - Server is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * FirmTracker - Server is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
- */
-namespace FirmTracker_Server.Models
 {
     public class CreateUserDto
     {
-        public required string Login { get; set; }
+        public string Login { get; set; }
-        public required string Password { get; set; }
+        public string Password { get; set; }
-        public required string Email { get; set; }
+        public string Email { get; set; }
-        public required string Role { get; set; }
+        public string Role { get; set; }
         public bool NewEncryption { get; set; } = true;
     }
 }

Models/DayDetailsDto.cs

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

Models/DayDetailsLoggedUserDto.cs

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

Models/EmployeeDto.cs

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

Models/LoginDtocs.cs

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

Models/UpdateAbsenceDto.cs

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

Models/UpdatePasswordDto.cs

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

Models/UserDto.cs

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

Models/Workday.cs

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

Program.cs

@@ -15,20 +15,29 @@
  * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
  */
 
+using NHibernate;
 using NHibernate.Cfg;
+using NHibernate.Dialect;
+using NHibernate.Driver;
+using FirmTracker_Server.Controllers;
+using FirmTracker_Server.nHibernate.Products;
 using FirmTracker_Server.nHibernate;
 using FirmTracker_Server.Utilities.Converters;
 using FirmTracker_Server.Utilities.Swagger;
+using FluentValidation;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.IdentityModel.Tokens;
 using AutoMapper;
+using Microsoft.AspNetCore.Authentication;
 using System.Text;
 using FirmTracker_Server.Entities;
 using FirmTracker_Server.Middleware;
 using FirmTracker_Server.Services;
 using System.Reflection;
 using FirmTracker_Server.Mappings;
-using Microsoft.AspNetCore.DataProtection;
+using NuGet.Packaging;
 
 
 
@@ -60,18 +69,14 @@ namespace FirmTracker_Server
                 Console.WriteLine($"The configuration file '{configFilePath}' was not found.");
             }
 
-            //TestClass test = new TestClass();
+            TestClass test = new TestClass();
-           // test.AddTestProduct();
+            test.AddTestProduct();
             QuestPDF.Settings.License = QuestPDF.Infrastructure.LicenseType.Community;
-            //builder.Services.AddDataProtection().DisableAutomaticKeyGeneration();
+
             builder.Services.AddCors(options =>
             {
                 options.AddPolicy("AllowSpecificOrigin",
-                    policy => policy.WithOrigins(
+                    policy => policy.WithOrigins("http://localhost:3000")
-                            "http://localhost:3000",
-                            "https://firmtracker-server.onrender.com",
-                            "https://firmtracker.netlify.app" 
-                        )
                         .AllowAnyHeader()
                         .AllowAnyMethod());
             });
@@ -101,9 +106,9 @@ namespace FirmTracker_Server
 
 
             var port = configSwagger.GetValue<int>("Port", 5075);
-           // var port2 = configSwagger.GetValue<int>("Port", 7039);
+            var port2 = configSwagger.GetValue<int>("Port", 7039);
             app.Urls.Add($"http://*:{port}");
-           //  app.Urls.Add($"https://*:{port2}");
+             app.Urls.Add($"https://*:{port2}");
 
             try
             {
@@ -114,14 +119,14 @@ namespace FirmTracker_Server
                     c.RoutePrefix = "swagger";
                 });
                 Console.WriteLine("uruchomiono swaggera");
-              //  app.UseHttpsRedirection();
+                app.UseHttpsRedirection();
             }
-            catch (Exception)
+            catch 
             {
                 Console.WriteLine("Nie uda³o siê uruchomiæ swaggera");
             }
 
-          //  app.UseHttpsRedirection();
+            app.UseHttpsRedirection();
 
             app.UseCors("AllowSpecificOrigin");
 
@@ -174,7 +179,6 @@ namespace FirmTracker_Server
             services.AddScoped<IPasswordHasher<User>, PasswordHasher<User>>();
             services.AddScoped<IExpenseRepository, ExpenseRepository>();
             services.AddScoped<ITransactionRepository, TransactionRepository>();
-            services.AddScoped<IProductRepository, ProductRepository>();
            // services.AddScoped<IWorkdayRepository, WorkdayRepository>();
             services.AddMvc();
         }

Services/UserService.cs

@@ -9,11 +9,9 @@ using System.Globalization;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
+using szyfrowanie;
 using FirmTracker_Server.nHibernate;
-using NHibernate;
+
-using NHibernate.Criterion;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using NHibernate.Type;
 
 namespace FirmTracker_Server.Services
 {
@@ -23,102 +21,31 @@ namespace FirmTracker_Server.Services
         int AddUser(CreateUserDto dto);
         string CreateTokenJwt(LoginDto dto);
         IEnumerable<string> GetAllUserEmails();
-        bool UpdatePassword(UpdatePasswordDto dto);
-        bool ChangeUserPassword(ChangeUserPasswordDto dto);
-        IList<EmployeeDto> GetAllUsers();
-
     }
 
     public class UserService : IUserService
     {
+       // private readonly GeneralDbContext DbContext;
         private readonly IMapper Mapper;
         private readonly IPasswordHasher<User> PasswordHasher;
         private readonly AuthenticationSettings AuthenticationSettings;
+       private readonly SimplerAES SimplerAES;
+        //private readonly SessionFactory sessionFactory;
 
-        public UserService(IMapper mapper, IPasswordHasher<User> passwordHasher, AuthenticationSettings authenticationSettings)
+        public UserService( IMapper mapper, IPasswordHasher<User> passwordHasher, AuthenticationSettings authenticationSettings)
         {
+           // DbContext = dbContext;
             Mapper = mapper;
             PasswordHasher = passwordHasher;
             AuthenticationSettings = authenticationSettings;
-
+            SimplerAES = new SimplerAES();
-        }
+            //SessionFactory = sessionFactory;
-        public IList<EmployeeDto> GetAllUsers()
-        {
-            using (var session = SessionFactory.OpenSession())
-            {
-                var users = session.Query<User>()
-                    .Select(u => new EmployeeDto
-                    {
-                        Id = u.UserId,
-                        email = u.Email
-                    })
-                    .ToList();
-
-                return users;
-            }
-        }
-        public bool ChangeUserPassword(ChangeUserPasswordDto dto)
-        {
-            using (var session = SessionFactory.OpenSession())
-            using (var transaction = session.BeginTransaction())
-            {
-                try
-                {
-                    var user = session.Query<User>().FirstOrDefault(u => u.Email == dto.email);
-                    if (user == null)
-                    {
-                        throw new Exception("User not found.");
-                    }
-
-                    user.PassHash = PasswordHasher.HashPassword(user, dto.password);
-                    session.Update(user);
-                    transaction.Commit();
-
-                    return true;
-                }
-                catch
-                {
-                    transaction.Rollback();
-                    throw;
-                }
-            }
-        }
-        public bool UpdatePassword(UpdatePasswordDto dto)
-        {
-            using (var session = SessionFactory.OpenSession())
-            using (var transaction = session.BeginTransaction())
-            {
-                try
-                {
-                    var user = session.Query<User>().FirstOrDefault(u => u.Email == dto.email);
-                    if (user == null)
-                    {
-                        throw new Exception("User not found.");
-                    }
-
-                    var result = PasswordHasher.VerifyHashedPassword(user, user.PassHash, dto.oldPassword);
-                    if (result != PasswordVerificationResult.Success)
-                    {
-                        throw new Exception("Invalid current password.");
-                    }
-
-                    user.PassHash = PasswordHasher.HashPassword(user, dto.newPassword);
-                    session.Update(user);
-                    transaction.Commit();
-
-                    return true;
-                }
-                catch
-                {
-                    transaction.Rollback();
-                    throw;
-                }
-            }
         }
         public IEnumerable<string> GetAllUserEmails()
         {
             using (var session = SessionFactory.OpenSession())
             {
+                // Query the users and return a list of emails
                 var users = session.Query<User>().Select(u => u.Email).ToList();
                 return users;
             }
@@ -136,7 +63,8 @@ namespace FirmTracker_Server.Services
         {
             var user = Mapper.Map<User>(dto);
 
-            user.PassHash = dto.NewEncryption ? PasswordHasher.HashPassword(user, dto.Password) : PasswordHasher.HashPassword(user, dto.Password);
+            // Encrypt or hash the password based on NewEncryption flag
+            user.PassHash = dto.NewEncryption ? SimplerAES.Encrypt(dto.Password) : PasswordHasher.HashPassword(user, dto.Password);
             user.Role = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(dto.Role.ToLower());
 
             using (var session = SessionFactory.OpenSession())
@@ -176,13 +104,14 @@ namespace FirmTracker_Server.Services
                     throw new WrongUserOrPasswordException("Nieprawidłowy login lub hasło.");
                 }
 
+                // Password verification logic
                 if (user.NewEncryption)
                 {
                     try
                     {
-                        Console.WriteLine(PasswordHasher.HashPassword(user, user.PassHash));
+                        Console.WriteLine(SimplerAES.Decrypt(user.PassHash)+" "+SimplerAES.Decrypt(dto.Password));
-                        var ready = PasswordHasher.VerifyHashedPassword(user, user.PassHash, dto.Password);
+                        var ready = SimplerAES.Decrypt(user.PassHash) == SimplerAES.Decrypt(dto.Password);
-                        if (ready == 0)
+                        if (!ready)
                         {
                             throw new WrongUserOrPasswordException("Nieprawidłowy login lub hasło.");
                         }
@@ -195,14 +124,14 @@ namespace FirmTracker_Server.Services
                 else
                 {
                     var ready = PasswordVerificationResult.Failed;
-                    if (PasswordHasher.VerifyHashedPassword(user, user.PassHash, dto.Password) == PasswordVerificationResult.Success) { ready = PasswordVerificationResult.Success; } //PasswordHasher.VerifyHashedPassword(user, user.PassHash, dto.Password);
+                    if (SimplerAES.Decrypt(user.PassHash) == SimplerAES.Decrypt(dto.Password)) { ready = PasswordVerificationResult.Success; } //PasswordHasher.VerifyHashedPassword(user, user.PassHash, dto.Password);
                     if (ready == PasswordVerificationResult.Failed)
                     {
                         throw new WrongUserOrPasswordException("Nieprawidłowy login lub hasło.");
                     }
                 }
 
- 
+                // Generate JWT token
                 var claims = new List<Claim>() {
                     new(ClaimTypes.NameIdentifier, user.UserId.ToString()),
                     new(ClaimTypes.Role, user.Role)

TestClass.cs

@@ -0,0 +1,310 @@
+/*
+ * This file is part of FirmTracker - Server.
+ *
+ * FirmTracker - Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * FirmTracker - Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+using FirmTracker_Server.Controllers;
+using FirmTracker_Server.nHibernate; 
+using FirmTracker_Server.nHibernate.Products;
+using FirmTracker_Server.nHibernate.Transactions;
+using FirmTracker_Server.nHibernate.Expenses;
+using NHibernate;
+using FirmTracker_Server.Entities;
+using FirmTracker_Server.Services;
+using AutoMapper;
+using FirmTracker_Server.Authentication;
+using Microsoft.AspNetCore.Identity;
+using FirmTracker_Server.Models;
+using System.Data.SqlClient;
+
+namespace FirmTracker_Server
+{
+    public class TestClass
+    {
+        public static Product CreateProduct(string name, string description, decimal price, int type, int availability)
+        {
+            return new Product
+            {
+                Name = name,
+                Description = description,
+                Price = price,
+                Type = type,
+                Availability = availability
+            };
+        }
+        public void AddTestProduct()
+        {
+            // SessionFactory.Init(ConnectionString);
+
+
+            var product2 = new nHibernate.Products.Product
+            {
+                Name = "Dostawa",
+                Description = "usługa dostawy",
+                Price = 7.50m,
+                Type = 0,
+                Availability = 0
+            };
+         
+            var products = new List<Product>
+            {
+                CreateProduct("Tarta_truskawka", "produkt", 31.99m, 1, 10),
+                CreateProduct("Tarta_czekolada", "produkt", 30.99m, 1, 10),
+                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),
+                CreateProduct("Keks", "produkt", 22.00m, 1,11),
+                CreateProduct("Babka_drożdżowa", "produkt", 16.00m, 1,11),
+                CreateProduct("Pączek_pistacja", "produkt", 8.00m, 1,11),
+                CreateProduct("Pączek_marmolada", "produkt", 3.00m, 1,11),
+                CreateProduct("Pączek_nutella", "produkt", 4.50m, 1,11),
+                CreateProduct("Pączek_rafaello", "produkt", 4.50m, 1,11),
+                CreateProduct("Pączek_róża", "produkt", 4.00m, 1,11),
+                CreateProduct("Ekler", "produkt", 3.00m, 1,11),
+                CreateProduct("Ekler_słony_karmel", "produkt", 5.00m, 1,11),
+                CreateProduct("Ptyś", "produkt", 4.00m, 1,11),
+                CreateProduct("Drożdżówka_ser", "produkt", 4.00m, 1,11),
+                CreateProduct("Drożdżówka_rabarbar", "produkt", 5.00m, 1,11),
+                CreateProduct("Drożdżówka_żurawina", "produkt", 5.00m, 1,11),
+                CreateProduct("Drożdżówka_kruszonka", "produkt", 4.00m, 1,11),
+                CreateProduct("Drożdżówka_budyń", "produkt", 5.00m, 1,11),
+                CreateProduct("Jagodzianka", "produkt", 6.00m, 1,11),
+
+
+              };
+
+            var transaction1 = new Transaction
+            {
+                Date = DateTime.Now.AddDays(-2),
+                Description = "zamówienie telefon",
+                Discount = 5,
+                EmployeeId = 1,
+                PaymentType = "Karta kredytowa",
+            };
+            var transaction2 = new Transaction
+            {
+                Date = DateTime.Now.AddDays(-3),
+                Description = "sprzedaż - kasa",
+                Discount = 30,
+                EmployeeId = 2,
+                PaymentType = "Gotówka",
+            };
+            var transaction3 = new Transaction
+            {
+                Date = DateTime.Now,
+                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",
+            };
+
+            var expense1 = new Expense
+            {
+                Date = DateTime.Now,
+                Value = 7999.9m,
+                Description = "zakup maszyny do lodów FZ/2/6/2024"
+            };
+            var expense2 = new Expense
+            {
+                Date = DateTime.Parse("2024-09-10 16:11:17.6232408"),
+                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
+            {
+                var nieobecnosc1 = "Urlop / Urlop na żądanie" ;
+                var nieobecnosc2 =  "Zwolnienie chorobowe";
+                var nieobecnosc3 = "Szkolenie";
+                var nieobecnosc4 = "Przerwa prywatna";
+                WorkdayRepository work = new WorkdayRepository();
+                work.AddAbsence(nieobecnosc1);
+                work.AddAbsence(nieobecnosc2);
+                work.AddAbsence(nieobecnosc3);
+                work.AddAbsence(nieobecnosc4);
+
+            }
+            catch(Exception a)
+            {
+                Console.WriteLine("Nie udało się dodać typów nieobecności " + a.Message);
+            }
+
+            try
+            {
+                string appDirectory = Directory.GetCurrentDirectory();
+                string configFilePath = Path.Combine(appDirectory, "appsettings.json");
+                string connectionString = "";
+                if (File.Exists(configFilePath))
+                {
+                    var config = new ConfigurationBuilder()
+                      .AddJsonFile(configFilePath)
+                      .Build();
+
+                    var connectionstringsection = config.GetSection("AppSettings:ConnectionString");
+
+                    connectionString = connectionstringsection.Value;
+
+                    //SessionFactory.Init(connectionString);
+
+                    string queryUser = "insert into Users(Email,PassHash,Role) select '123@wp.pl', 'GOsGemJarMJu8btZKF6Rung27JLZkdO7Wfd4CwLhL1k=','User'";
+                    string queryAdmin = "insert into Users(Email,PassHash,Role) select '321@wp.pl', 'GOsGemJarMJu8btZKF6Rung27JLZkdO7Wfd4CwLhL1k=','Admin'";
+
+                   
+                    SqlConnection connection = new SqlConnection(connectionString);
+                    connection.Open();
+
+                    SqlCommand command = new SqlCommand(queryUser, connection);
+                    command.CommandTimeout = 200;
+                    command.ExecuteNonQuery();
+                    connection.Close();
+
+                 
+                    SqlConnection connection2 = new SqlConnection(connectionString);
+                    connection.Open();
+
+                    SqlCommand command2 = new SqlCommand(queryAdmin, connection);
+                    command2.CommandTimeout = 200;
+                    command2.ExecuteNonQuery();
+                    connection2.Close();
+
+                }
+
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Nie udało się dodać kont użytkowników " + e.Message);
+            }
+
+
+
+            try
+            {
+                FirmTracker_Server.nHibernate.Products.ProductCRUD productCrud = new ProductCRUD();
+                FirmTracker_Server.nHibernate.Transactions.TransactionCRUD transactionCrud = new nHibernate.Transactions.TransactionCRUD();
+               
+                ExpenseCRUD expenseCrud = new ExpenseCRUD();
+               // productCrud.AddProduct(product);
+                productCrud.AddProduct(product2);
+               // 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);
+                expenseCrud.AddExpense(expense3);
+
+                List<TransactionProduct> testTransactionProducts = new List<TransactionProduct>  {
+                    new TransactionProduct { ProductID =17, Quantity = 3 },
+                    new TransactionProduct { ProductID = 14, Quantity = 1 },
+                    new TransactionProduct { ProductID = 1, Quantity = 1 },
+                };
+                foreach (var transactionProduct in testTransactionProducts)
+                {
+                    transactionCrud.AddTransactionProductToTransaction(transaction1.Id, transactionProduct);
+
+                }
+
+                List<TransactionProduct> testTransactionProducts2 = new List<TransactionProduct>
+                {
+                    new TransactionProduct { ProductID = 28, Quantity=5},
+                    new TransactionProduct { ProductID = 22, Quantity=5}
+                };
+                foreach (var transactionProduct in testTransactionProducts2)
+                {
+                    transactionCrud.AddTransactionProductToTransaction(transaction2.Id, transactionProduct);
+
+                }
+
+                List<TransactionProduct> testTransactionProducts3 = new List<TransactionProduct>
+                {
+                    new TransactionProduct { ProductID = 3, Quantity=9},
+                    new TransactionProduct { ProductID = 2, Quantity=1}
+                };
+                foreach (var transactionProduct in testTransactionProducts3)
+                {
+                    transactionCrud.AddTransactionProductToTransaction(transaction3.Id, transactionProduct);
+
+                }
+                List<TransactionProduct> testTransactionProducts4 = new List<TransactionProduct>
+                {
+                    new TransactionProduct { ProductID = 33, Quantity=12},
+                    new TransactionProduct { ProductID = 12, Quantity=1}
+                };
+                foreach (var transactionProduct in testTransactionProducts4)
+                {
+                    transactionCrud.AddTransactionProductToTransaction(transaction4.Id, transactionProduct);
+
+                }
+
+            }
+            catch(Exception ex)
+            {
+                Console.WriteLine(ex.ToString());
+                throw;
+            }
+        }
+    }
+}

appsettings.json

@@ -0,0 +1,35 @@
+{
+  "AppSettings": {
+    "ConnectionString": "Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=master;Integrated Security=True;"
+
+  },
+  "TokenConfig": {
+    "JwtSecKey": "omgi5Rf4tqg351GQwefw1234567890123456",
+    "JwtExpireDays": 30,
+    "JwtIssuer": "http://api.graphcom.pl"
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5045"
+
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "https://localhost:7039"
+
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger"
+
+    }
+  }
+}

nHIbernate/Absence.cs

@@ -0,0 +1,10 @@
+using FirmTracker_Server.Entities;
+
+namespace FirmTracker_Server.nHibernate
+{
+    public class Absence
+    {
+        public virtual int Id { get; set; }
+        public virtual string AbsenceName { get; set; }
+    }
+}

nHIbernate/AbsenceMapping.cs

@@ -0,0 +1,14 @@
+using FirmTracker_Server.nHibernate;
+using FluentNHibernate.Mapping;
+namespace FirmTracker_Server.nHIbernate
+{
+    public class AbsenceMapping : ClassMap<Absence>
+    {
+        public AbsenceMapping()
+        {
+            Table("Absences"); 
+            Id(x => x.Id).GeneratedBy.Identity();
+            Map(x => x.AbsenceName);
+        }
+    }
+}

nHIbernate/PdfData.cs

@@ -1,19 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Transactions;
 using FirmTracker_Server.nHibernate.Expenses;
-using FirmTracker_Server.nHibernate.Products;
 using FirmTracker_Server.nHibernate.Transactions;
 using NHibernate;
-using Transaction = FirmTracker_Server.nHibernate.Transactions.Transaction;
 
 namespace FirmTracker_Server.nHibernate
 {
-    public interface IProductRepository
-    {
-        Product GetProduct(int id);
-    }
-
     public interface IExpenseRepository
     {
         List<Expense> GetAllExpenses();
@@ -33,17 +25,6 @@ namespace FirmTracker_Server.nHibernate
         void DeleteTransaction(int transactionId);
         List<TransactionProduct> GetTransactionProductsForTransactions(List<int> transactionIds);
     }
-    public class ProductRepository : IProductRepository
-    {
-        public Product GetProduct(int id)
-        {
-            using (var session = SessionFactory.OpenSession())
-            {
-                return session.Get<Product>(id);
-            }
-        }
-    }
-
     public class TransactionRepository : ITransactionRepository
     {
         // Retrieve all transactions

nHIbernate/SessionFactory.cs

@@ -15,6 +15,7 @@
  * along with FirmTracker - Server. If not, see <https://www.gnu.org/licenses/>.
  */
 
+using FirmTracker_Server.nHIbernate;
 using FluentNHibernate.Cfg;
 using FluentNHibernate.Cfg.Db;
 using NHibernate;
@@ -56,10 +57,11 @@ namespace FirmTracker_Server.nHibernate
                     .AddFromAssemblyOf<Reports.ReportExpenseMapping>()
                     .AddFromAssemblyOf<LogsMapping>()
                     .AddFromAssemblyOf<UserMapping>()
-                    .AddFromAssemblyOf<WorkdayMapping>();
+                    .AddFromAssemblyOf<WorkdayMapping>()
+                    .AddFromAssemblyOf<AbsenceMapping>();
                     
-                })         //SchemaExport   .Create    //żeby tworzyło za każdym razem
+                })
-                .ExposeConfiguration(cfg => new SchemaUpdate(cfg).Execute(true, true))  //SchemaUpdate . Execute  dla only update
+                .ExposeConfiguration(cfg => new SchemaExport(cfg).Create(true, true))  //SchemaUpdate . Execute  dla only update
                 .BuildSessionFactory();
         }
     }

nHIbernate/UserMapping.cs

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

nHIbernate/WorkdayRepository.cs

@@ -1,7 +1,6 @@
 using FirmTracker_Server.Entities;
 using FirmTracker_Server.nHibernate;
 using static NHibernate.Engine.Query.CallableParser;
-using FirmTracker_Server.Models;
 
 public class WorkdayRepository
 {
@@ -46,8 +45,29 @@ public class WorkdayRepository
             }
         }
     }
+    public void AddAbsence(string Absence)
+    {
+        using (var session = SessionFactory.OpenSession())
+        using (var transaction = session.BeginTransaction())
+        {
+            try
+            {           
+                var absence = new Absence
+                {
+                   AbsenceName = Absence,
+                };
 
-    public void AddAbsence(int userId, string absenceType, DateTime startTime, DateTime endTime)
+                session.Save(absence);
+                transaction.Commit();
+            }
+            catch (Exception ex)
+            {
+                transaction.Rollback();
+                throw new Exception("An error occurred while adding the absence", ex);
+            }
+        }
+    }
+    public void AddAbsenceToUser(int userId, string absenceType, DateTime startTime, DateTime endTime)
     {
         using (var session = SessionFactory.OpenSession())
         using (var transaction = session.BeginTransaction())
@@ -72,11 +92,13 @@ public class WorkdayRepository
             catch (Exception ex)
             {
                 transaction.Rollback();
-                throw new Exception("An error occurred while adding the absence", ex);
+                throw new Exception("An error occurred while adding the absence to user ", ex);
             }
         }
     }
 
+   
+
     public bool StopWorkday(int userId)
     {
         using (var session = SessionFactory.OpenSession())
@@ -108,7 +130,28 @@ public class WorkdayRepository
             }
         }
     }
+    public List<Absence> GetAbsences()
+    {
 
+        using (var session = SessionFactory.OpenSession())
+        {
+            try
+            {
+                var absences = session.Query<Absence>()
+                    .Select(w => new Absence
+                    {                     
+                        AbsenceName = w.AbsenceName
+                    })
+                    .ToList();
+
+                return absences;
+            }
+            catch (Exception ex)
+            {
+                throw new Exception("An error occurred while fetching workdays", ex);
+            }
+        }
+    }
     public List<Workday> GetWorkdaysByUser(string email)
     {
         using (var session = SessionFactory.OpenSession())
@@ -143,96 +186,6 @@ public class WorkdayRepository
             }
         }
     }
-    public DayDetailsDto GetDayDetails(string mail, DateTime date)
-    {
-        using (var session = SessionFactory.OpenSession())
-        {
-            try
-            {
-                // Fetch workdays for the specified user on the given date
-                var startOfDay = date.Date;
-                var endOfDay = startOfDay.AddDays(1);
-
-                var workdays = session.Query<Workday>()
-                    .Where(w => w.User.Email == mail && w.StartTime >= startOfDay && w.StartTime < endOfDay)
-                    .Select(w => new Workday
-                    {
-                        StartTime = w.StartTime,
-                        EndTime = w.EndTime ?? DateTime.Today.AddHours(17),
-                        Absence = w.Absence,
-                    })
-                    .ToList();
-
-                TimeSpan totalWorkedHours = TimeSpan.Zero;
-
-                // Calculate total worked hours and adjust if there's an absence
-                foreach (var workday in workdays)
-                {
-                    if (string.IsNullOrEmpty(workday.Absence))
-                    {
-                        totalWorkedHours += workday.WorkedHours;
-                    }
-                }
-
-                return new DayDetailsDto
-                {
-                    Email = mail,
-                    Date = date,
-                    TotalWorkedHours = totalWorkedHours.ToString(@"hh\:mm\:ss"),
-                    WorkdayDetails = workdays
-                };
-            }
-            catch (Exception ex)
-            {
-                throw new Exception("An error occurred while fetching the day's details", ex);
-            }
-        }
-    }
-    public DayDetailsLoggedUserDto GetDayDetailsForLoggedUser(int userId, DateTime date)
-    {
-        using (var session = SessionFactory.OpenSession())
-        {
-            try
-            {
-                // Fetch workdays for the specified user on the given date
-                var startOfDay = date.Date;
-                var endOfDay = startOfDay.AddDays(1);
-
-                var workdays = session.Query<Workday>()
-                    .Where(w => w.User.UserId == userId && w.StartTime >= startOfDay && w.StartTime < endOfDay)
-                    .Select(w => new Workday
-                    {
-                        StartTime = w.StartTime,
-                        EndTime = w.EndTime ?? DateTime.Today.AddHours(17),
-                        Absence = w.Absence,
-                    })
-                    .ToList();
-
-                TimeSpan totalWorkedHours = TimeSpan.Zero;
-
-                // Calculate total worked hours and adjust if there's an absence
-                foreach (var workday in workdays)
-                {
-                    if (string.IsNullOrEmpty(workday.Absence))
-                    {
-                        totalWorkedHours += workday.WorkedHours;
-                    }
-                }
-
-                return new DayDetailsLoggedUserDto
-                {
-                    UserId = userId,
-                    Date = date,
-                    TotalWorkedHours = totalWorkedHours.ToString(@"hh\:mm\:ss"),
-                    WorkdayDetails = workdays
-                };
-            }
-            catch (Exception ex)
-            {
-                throw new Exception("An error occurred while fetching the day's details", ex);
-            }
-        }
-    }
     public List<Workday> GetWorkdaysByLoggedUser(string userId)
     {
         using (var session = SessionFactory.OpenSession())
@@ -252,6 +205,14 @@ public class WorkdayRepository
                     })
                     .ToList();
 
+                foreach (var workday in workdays)
+                {
+                    if (workday.Absence != "")
+                    {
+                        workday.WorkedHours = TimeSpan.Zero;
+                    }
+                }
+
                 return workdays;
             }
             catch (Exception ex)

nHibernate/Transactions/TransactionCRUD.cs

@@ -253,7 +253,7 @@ namespace FirmTracker_Server.nHibernate.Transactions
                 catch (Exception ex)
                 {
                     transaction.Rollback();
-                    throw;
+                    throw ex;
                 }
             }
         }