Merge branch 'main' into tests

src/main/java/_11/asktpk/artisanconnectbackend/controller/AuthController.java

@@ -1,68 +1,70 @@
 package _11.asktpk.artisanconnectbackend.controller;
 
-import _11.asktpk.artisanconnectbackend.customExceptions.ClientAlreadyExistsException;
-import _11.asktpk.artisanconnectbackend.customExceptions.WrongLoginPasswordException;
 import _11.asktpk.artisanconnectbackend.dto.*;
-import _11.asktpk.artisanconnectbackend.service.AuthService;
+import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.security.JwtUtil;
+import _11.asktpk.artisanconnectbackend.service.ClientService;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
 
 @Slf4j
 @RestController
 @RequestMapping("/api/v1/auth")
 public class AuthController {
 
-    private final AuthService authService;
+    private final ClientService clientService;
+    private final JwtUtil jwtUtil;
 
-    public AuthController(AuthService authService) {
-        this.authService = authService;
+    public AuthController(ClientService clientService, JwtUtil jwtUtil) {
+        this.clientService = clientService;
+        this.jwtUtil = jwtUtil;
     }
 
     @PostMapping("/login")
-    public ResponseEntity<?> login(@RequestBody AuthRequestDTO authRequestDTO) {
-        if (authRequestDTO.getEmail() == null || authRequestDTO.getPassword() == null
-                || authRequestDTO.getEmail().isEmpty() || authRequestDTO.getPassword().isEmpty()) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO("Przekazano puste login lub hasło"));
-        }
+    public ResponseEntity<AuthResponseDTO> login(@RequestBody AuthRequestDTO authRequestDTO) {
+        if (clientService.checkClientCredentials(authRequestDTO)) {
+            Client client = clientService.getClientByEmail(authRequestDTO.getEmail());
+            Long userId = client.getId();
+            String userRole = client.getRole().getRole();
 
-        authRequestDTO.setEmail(authRequestDTO.getEmail().toLowerCase());
-
-        try {
-            AuthResponseDTO responseDTO = authService.login(authRequestDTO.getEmail(), authRequestDTO.getPassword());
+            String token = jwtUtil.generateToken(client.getEmail(), userRole, userId);
 
+            log.info("User logged in with {}", client.getEmail());
             return ResponseEntity.status(HttpStatus.OK)
-                    .body(responseDTO);
-
-        } catch (WrongLoginPasswordException e) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new RequestResponseDTO(e.getMessage()));
-        } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO(e.getMessage()));
+                    .body(new AuthResponseDTO(userId, userRole, token));
+        } else {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null);
         }
     }
 
     @PostMapping("/register")
-    public ResponseEntity<?> register(@RequestBody ClientRegistrationDTO clientRegistrationDTO) {
-        if (clientRegistrationDTO.getEmail() == null || clientRegistrationDTO.getPassword() == null
-                || clientRegistrationDTO.getEmail().isEmpty() || clientRegistrationDTO.getPassword().isEmpty()) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO("Przekazano puste login lub hasło"));
+    public ResponseEntity<AuthResponseDTO> register(@RequestBody ClientRegistrationDTO clientDTO) {
+        if (clientService.getClientByEmail(clientDTO.getEmail()) != null) {
+            return ResponseEntity.status(HttpStatus.CONFLICT).build();
         }
 
-        clientRegistrationDTO.setEmail(clientRegistrationDTO.getEmail().toLowerCase());
+        ClientDTO savedClient = clientService.registerClient(clientDTO);
 
-        try {
-            AuthResponseDTO registrationData = authService.register(clientRegistrationDTO.getEmail(), clientRegistrationDTO.getPassword(), clientRegistrationDTO.getFirstName(), clientRegistrationDTO.getLastName());
+        String token = jwtUtil.generateToken(
+                savedClient.getEmail(),
+                savedClient.getRole(),
+                savedClient.getId()
+        );
 
-            return ResponseEntity.status(HttpStatus.CREATED)
-                    .body(registrationData);
-        } catch (ClientAlreadyExistsException clientAlreadyExistsException) {
-            return ResponseEntity.status(HttpStatus.CONFLICT)
-                    .body(new RequestResponseDTO(clientAlreadyExistsException.getMessage()));
-        } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO(e.getMessage()));
-        }
+        log.info("New user registered with {}", savedClient.getEmail());
+
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(new AuthResponseDTO(
+                        savedClient.getId(),
+                        savedClient.getRole(),
+                        token
+                ));
     }
 
     @PostMapping("/logout")
@@ -71,7 +73,7 @@ public class AuthController {
 
         if (authHeader != null && authHeader.startsWith("Bearer ")) {
             String token = authHeader.substring(7);
-            authService.logout(token);
+            jwtUtil.blacklistToken(token);
             return ResponseEntity.ok(new RequestResponseDTO("Successfully logged out"));
         }
 
@@ -80,16 +82,43 @@ public class AuthController {
 
     @PostMapping("/google")
     public ResponseEntity<?> authenticateWithGoogle(@RequestBody GoogleAuthRequestDTO dto) {
-        if(dto.getGoogleToken() == null){
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO("Invalid or empty token"));
-        }
-
         try {
-            AuthResponseDTO response = authService.googleLogin(dto.getGoogleToken());
-            return ResponseEntity.status(HttpStatus.OK).body(response);
+            String accessToken = dto.getGoogleToken();
+            String googleUserInfoUrl = "https://www.googleapis.com/oauth2/v3/userinfo";
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.setBearerAuth(accessToken);
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    googleUserInfoUrl, HttpMethod.GET, entity, Map.class);
+
+            Map<String, Object> userInfo = response.getBody();
+
+//                String googleId = (String) userInfo.get("sub");  Potencjalnie możemy używać googlowskiego ID, ale to ma konflikt z naszym generowanym
+            assert userInfo != null;
+            String email = (String) userInfo.get("email");
+            String name = (String) userInfo.get("name");
+
+            Client client = clientService.getClientByEmail(email);
+            if (client == null) {
+                client = new Client();
+                client.setEmail(email);
+                client.setFirstName(name);
+                client.setRole(clientService.getUserRole()); // to pobiera po prostu role "USER" z tabeli w bazie
+                clientService.saveClientToDB(client);
+            }
+
+            String jwt = jwtUtil.generateToken(client.getEmail(), client.getRole().getRole(), client.getId());
+
+            log.info("User authenticated with google: {}", email);
+            return ResponseEntity.ok(new AuthResponseDTO(client.getId(), client.getRole().getRole(), jwt));
         } catch (HttpClientErrorException httpClientErrorException) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO("Google access token is invalid or expired"));
+            log.error("Token is invalid or expired");
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new RequestResponseDTO("Invalid access token"));
         } catch (Exception e) {
+            log.error("Error while checking Google access token", e);
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
                     .body(new RequestResponseDTO("Authentication Error (Google): " + e.getMessage()));
         }

src/main/java/_11/asktpk/artisanconnectbackend/controller/NoticeController.java

@@ -1,17 +1,17 @@
 package _11.asktpk.artisanconnectbackend.controller;
 
-import _11.asktpk.artisanconnectbackend.dto.*;
+import _11.asktpk.artisanconnectbackend.dto.NoticeAdditionDTO;
+import _11.asktpk.artisanconnectbackend.dto.NoticeBoostDTO;
+import _11.asktpk.artisanconnectbackend.dto.RequestResponseDTO;
 import _11.asktpk.artisanconnectbackend.service.ClientService;
 import _11.asktpk.artisanconnectbackend.service.NoticeService;
-import _11.asktpk.artisanconnectbackend.utils.Enums;
-import _11.asktpk.artisanconnectbackend.utils.Tools;
+import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
 import jakarta.persistence.EntityNotFoundException;
-import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 
 @RequestMapping("/api/v1/notices")
@@ -19,16 +19,14 @@ import java.util.List;
 public class NoticeController {
     private final NoticeService noticeService;
     private final ClientService clientService;
-    private final Tools tools;
 
-    public NoticeController(NoticeService noticeService, ClientService clientService, Tools tools) {
+    public NoticeController(NoticeService noticeService, ClientService clientService) {
         this.noticeService = noticeService;
         this.clientService = clientService;
-        this.tools = tools;
     }
 
     @GetMapping("/get/all")
-    public List<NoticeResponseDTO> getAllNotices() {
+    public List<NoticeDTO> getAllNotices() {
         return noticeService.getAllNotices();
     }
 
@@ -42,34 +40,57 @@ public class NoticeController {
     }
 
     @PostMapping("/add")
-    public ResponseEntity<NoticeAdditionDTO> addNotice(@RequestBody NoticeRequestDTO dto, HttpServletRequest request) {
-        Long clientId = tools.getClientIdFromRequest(request);
-        if (!clientService.clientExists(clientId)) {
+    public ResponseEntity<NoticeAdditionDTO> addNotice(@RequestBody NoticeDTO dto) {
+        if (!clientService.clientExists(dto.getClientId())) {
             return ResponseEntity
                     .status(HttpStatus.BAD_REQUEST)
-                    .body(new NoticeAdditionDTO("Nie znaleziono klienta o ID: " + clientId));
+                    .body(new NoticeAdditionDTO("Nie znaleziono klienta o ID: " + dto.getClientId()));
         }
 
-        dto.setClientId(clientId);
-
-        if (dto.getCategory() == null || !Arrays.asList(Enums.Category.values()).contains(dto.getCategory())) {
+        if (dto.getCategory() == null) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new NoticeAdditionDTO("Nie ma takiej kategorii"));
         }
+        dto.setPublishDate(java.time.LocalDateTime.now());
 
         Long newNoticeId = noticeService.addNotice(dto);
 
         return ResponseEntity.status(HttpStatus.CREATED).body(new NoticeAdditionDTO(newNoticeId ,"Dodano ogłoszenie."));
     }
 
-    @PutMapping("/edit/{id}")
-    public ResponseEntity<Object> editNotice(@PathVariable("id") long id, @RequestBody NoticeRequestDTO dto, HttpServletRequest request) {
-        Long clientIdFromToken = tools.getClientIdFromRequest(request);
-        if (noticeService.noticeExists(id)) {
-            if (!noticeService.isNoticeOwnedByClient(id, clientIdFromToken)) {
-                return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new RequestResponseDTO("Nie masz uprawnień do edycji tego ogłoszenia."));
+    // TODO: zamiast dodawać tutaj pętlą, musi to robić NoticeService, trzeba zaimplementować odpowienią metodę
+    @PostMapping("/bulk_add")
+    public ResponseEntity<String> addNotices(@RequestBody List<NoticeDTO> notices_list) {
+        ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.CREATED);
+        List<String> errors = new ArrayList<>();
+        boolean isError = false;
+
+        if (notices_list.isEmpty()) {
+            return response.status(HttpStatus.BAD_REQUEST).body("Lista ogłoszeń jest pusta.");
+        }
+
+        for (NoticeDTO dto : notices_list) {
+            if (!clientService.clientExists(dto.getClientId())) {
+                isError = true;
+                errors.add(dto.getClientId().toString());
+            } else {
+                if (!isError) {
+                    noticeService.addNotice(dto);
+                }
             }
+        }
+
+        if (isError) {
+            return response.status(HttpStatus.BAD_REQUEST).body("Nie znaleziono klientów: " + errors);
+        }
+
+        return response;
+    }
+
+    @PutMapping("/edit/{id}")
+    public ResponseEntity<Object> editNotice(@PathVariable("id") long id, @RequestBody NoticeDTO dto) {
+        if (noticeService.noticeExists(id)) {
             try {
-                return ResponseEntity.status(HttpStatus.OK).body(noticeService.updateNotice(id, dto));
+                return new ResponseEntity<>(noticeService.updateNotice(id, dto), HttpStatus.OK);
             } catch (EntityNotFoundException e) {
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
             }
@@ -79,13 +100,8 @@ public class NoticeController {
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<RequestResponseDTO> deleteNotice(@PathVariable("id") long id, HttpServletRequest request) {
-        Long clientIdFromToken = tools.getClientIdFromRequest(request);
+    public ResponseEntity<RequestResponseDTO> deleteNotice(@PathVariable("id") long id) {
         if (noticeService.noticeExists(id)) {
-            if (!noticeService.isNoticeOwnedByClient(id, clientIdFromToken)) {
-                return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new RequestResponseDTO("Nie masz uprawnień do usunięcia tego ogłoszenia."));
-            }
-
             noticeService.deleteNotice(id);
             return ResponseEntity.status(HttpStatus.OK).body(new RequestResponseDTO("Pomyślnie usunięto ogłoszenie o ID: " + id));
         } else {
@@ -93,10 +109,9 @@ public class NoticeController {
         }
     }
 
-    @PostMapping("/boost")
-    public ResponseEntity<RequestResponseDTO> boostNotice(@RequestBody NoticeBoostDTO dto, HttpServletRequest request) {
-        Long clientId = tools.getClientIdFromRequest(request);
-        if (noticeService.isNoticeOwnedByClient(dto.getNoticeId(), clientId)) {
+    @PostMapping("/boost/{id}")
+    public ResponseEntity<RequestResponseDTO> boostNotice(@PathVariable("id") long clientId, @RequestBody NoticeBoostDTO dto) {
+        if (!noticeService.isNoticeOwnedByClient(dto.getNoticeId(), clientId)) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new RequestResponseDTO("Ogłoszenie nie istnieje lub nie należy do zalogowanego klienta."));
         }
         noticeService.boostNotice(dto.getNoticeId());

src/main/java/_11/asktpk/artisanconnectbackend/controller/OrderController.java

@@ -2,45 +2,40 @@ package _11.asktpk.artisanconnectbackend.controller;
 
 import _11.asktpk.artisanconnectbackend.dto.*;
 import _11.asktpk.artisanconnectbackend.entities.Order;
+import _11.asktpk.artisanconnectbackend.service.ClientService;
 import _11.asktpk.artisanconnectbackend.service.OrderService;
 import _11.asktpk.artisanconnectbackend.service.PaymentService;
 import _11.asktpk.artisanconnectbackend.utils.Enums;
-import _11.asktpk.artisanconnectbackend.utils.Tools;
-import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-
 @RestController
 @RequestMapping("/api/v1/orders")
 public class OrderController {
 
     private final OrderService orderService;
     private final PaymentService paymentService;
-    private final Tools tools;
 
-    public OrderController(OrderService orderService, PaymentService paymentService, Tools tools) {
+    public OrderController(OrderService orderService, PaymentService paymentService) {
         this.orderService = orderService;
         this.paymentService = paymentService;
-        this.tools = tools;
     }
 
     @PostMapping("/add")
-    public ResponseEntity<?> addClient(@RequestBody OrderDTO orderDTO, HttpServletRequest request) {
-        orderDTO.setClientId(tools.getClientIdFromRequest(request));
-        return ResponseEntity.status(HttpStatus.CREATED).body(orderService.addOrder(orderDTO));
+    public ResponseEntity addClient(@RequestBody OrderDTO orderDTO) {
+            return new ResponseEntity<>(orderService.addOrder(orderDTO), HttpStatus.CREATED);
     }
 
     @PutMapping("/changeStatus")
-    public ResponseEntity<?> changeStatus(@RequestBody OrderStatusDTO orderStatusDTO) {
-        return ResponseEntity.status(HttpStatus.OK).body(orderService.changeOrderStatus(orderStatusDTO.getId(), orderStatusDTO.getStatus()));
+    public ResponseEntity changeStatus(@RequestBody OrderStatusDTO orderStatusDTO) {
+        return new ResponseEntity<>(orderService.changeOrderStatus(orderStatusDTO.getId(),orderStatusDTO.getStatus()), HttpStatus.OK);
     }
 
     @PostMapping("/token")
     public ResponseEntity<?> fetchToken() {
         Order order = orderService.getOrderById(1L);
-        OAuthPaymentResponseDTO authPaymentDTO = paymentService.getOAuthToken();
+        OAuthPaymentResponseDTO  authPaymentDTO=  paymentService.getOAuthToken();
         TransactionPaymentRequestDTO.Payer payer = new TransactionPaymentRequestDTO.Payer(
                 "patryk@test.pl", "Patryk Test");
 
@@ -49,10 +44,10 @@ public class OrderController {
         TransactionPaymentRequestDTO request = new TransactionPaymentRequestDTO(
                 order.getAmount(), paymentDescription, payer);
 
-        String response = paymentService.createTransaction(order, authPaymentDTO.getAccess_token(), request);
+        String response = paymentService.createTransaction(order,authPaymentDTO.getAccess_token(), request);
         System.out.println(response);
         System.out.println(request);
 
-        return ResponseEntity.status(HttpStatus.OK).body(response);
+        return ResponseEntity.ok(response);
     }
 }

src/main/java/_11/asktpk/artisanconnectbackend/controller/WishlistController.java

@@ -1,39 +1,35 @@
 package _11.asktpk.artisanconnectbackend.controller;
 
-import _11.asktpk.artisanconnectbackend.dto.NoticeResponseDTO;
+import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
 import _11.asktpk.artisanconnectbackend.dto.RequestResponseDTO;
+import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
 import _11.asktpk.artisanconnectbackend.service.ClientService;
 import _11.asktpk.artisanconnectbackend.service.NoticeService;
 import _11.asktpk.artisanconnectbackend.service.WishlistService;
-import _11.asktpk.artisanconnectbackend.utils.Tools;
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@Slf4j
 @RestController
 @RequestMapping("/api/v1/wishlist")
 public class WishlistController {
     private final WishlistService wishlistService;
     private final ClientService clientService;
     private final NoticeService noticeService;
-    private final Tools tools;
 
-    public WishlistController(WishlistService wishlistService, ClientService clientService, NoticeService noticeService, Tools tools) {
+    public WishlistController(WishlistService wishlistService, ClientService clientService, NoticeService noticeService) {
         this.wishlistService = wishlistService;
         this.clientService = clientService;
         this.noticeService = noticeService;
-        this.tools = tools;
     }
 
     @PostMapping("/toggle/{noticeId}")
-    public ResponseEntity<RequestResponseDTO> toggleWishlist(@PathVariable Long noticeId, HttpServletRequest request) {
-        Long clientId = tools.getClientIdFromRequest(request);
-        NoticeResponseDTO noticeResponseDTO = noticeService.getNoticeById(noticeId);
-        if (noticeResponseDTO == null) {
+    public ResponseEntity<RequestResponseDTO> toggleWishlist(@PathVariable Long noticeId) {
+
+        Long clientId = 1L;
+        NoticeDTO noticeDTO = noticeService.getNoticeById(noticeId);
+        if (noticeDTO == null) {
             return ResponseEntity.badRequest().body(new RequestResponseDTO("Notice not found"));
         }
         boolean added = wishlistService.toggleWishlist(
@@ -55,8 +51,9 @@ public class WishlistController {
 //    }
 
     @GetMapping("/")
-    public List<NoticeResponseDTO> getWishlistForClient(HttpServletRequest request) {
-        Long clientId = tools.getClientIdFromRequest(request);
+    public List<NoticeDTO> getWishlistForClient() {
+        // TODO: Replace with actual client ID from authentication context
+        Long clientId = 1L;
         return wishlistService.getNoticesInWishlist(clientId);
     }
 }

src/main/java/_11/asktpk/artisanconnectbackend/customExceptions/ClientAlreadyExistsException.java

@@ -1,7 +0,0 @@
-package _11.asktpk.artisanconnectbackend.customExceptions;
-
-public class ClientAlreadyExistsException extends Exception {
-    public ClientAlreadyExistsException(String message) {
-        super(message);
-    }
-}

src/main/java/_11/asktpk/artisanconnectbackend/customExceptions/WrongLoginPasswordException.java

@@ -1,7 +0,0 @@
-package _11.asktpk.artisanconnectbackend.customExceptions;
-
-public class WrongLoginPasswordException extends Exception {
-    public WrongLoginPasswordException(String message) {
-        super(message);
-    }
-}

src/main/java/_11/asktpk/artisanconnectbackend/dto/AttributeDto.java

@@ -1,11 +0,0 @@
-package _11.asktpk.artisanconnectbackend.dto;
-
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter @Setter
-public class AttributeDto {
-    private String name;
-    private String value;
-}

src/main/java/_11/asktpk/artisanconnectbackend/dto/ClientDTO.java

@@ -1,16 +1,12 @@
 package _11.asktpk.artisanconnectbackend.dto;
 
 import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import jakarta.validation.constraints.Email;
 
 @Getter @Setter
-@AllArgsConstructor
-@NoArgsConstructor
 public class ClientDTO {
     private Long id;
 

src/main/java/_11/asktpk/artisanconnectbackend/dto/NoticeDTO.java

@@ -1,5 +1,6 @@
 package _11.asktpk.artisanconnectbackend.dto;
 
+import _11.asktpk.artisanconnectbackend.entities.AttributesNotice;
 import _11.asktpk.artisanconnectbackend.utils.Enums;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,7 +9,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Getter @Setter
-public class NoticeResponseDTO {
+public class NoticeDTO {
     private long noticeId;
 
     private String title;
@@ -25,9 +26,11 @@ public class NoticeResponseDTO {
 
     private LocalDateTime publishDate;
 
-    private List<AttributeDto> attributes;
+    private List<AttributesNotice> attributesNotices;
 
-    public NoticeResponseDTO() {
+    private boolean isWishlisted;
+
+    public NoticeDTO() {
 
     }
 }

src/main/java/_11/asktpk/artisanconnectbackend/dto/NoticeRequestDTO.java

@@ -1,27 +0,0 @@
-package _11.asktpk.artisanconnectbackend.dto;
-
-import _11.asktpk.artisanconnectbackend.utils.Enums;
-import lombok.Getter;
-import lombok.Setter;
-import java.util.List;
-
-@Getter @Setter
-public class NoticeRequestDTO {
-    private String title;
-
-    private Long clientId;
-
-    private String description;
-
-    private Double price;
-
-    private Enums.Category category;
-
-    private Enums.Status status;
-
-    private List<AttributeDto> attributes;
-
-    public NoticeRequestDTO() {
-
-    }
-}

src/main/java/_11/asktpk/artisanconnectbackend/entities/AttributeValues.java

@@ -1,12 +1,9 @@
 package _11.asktpk.artisanconnectbackend.entities;
 
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
 
 @Entity
 @Table(name = "attribute_values")
-@Getter @Setter
 public class AttributeValues {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -17,4 +14,6 @@ public class AttributeValues {
     private Attributes attribute;
 
     private String value;
+
+    // Getters, setters, and constructors
 }

src/main/java/_11/asktpk/artisanconnectbackend/entities/Attributes.java

@@ -1,14 +1,10 @@
 package _11.asktpk.artisanconnectbackend.entities;
 
 import jakarta.persistence.*;
-import lombok.Setter;
-import lombok.Getter;
-
 import java.util.List;
 
 @Entity
 @Table(name = "attributes")
-@Getter @Setter
 public class Attributes {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -16,6 +12,8 @@ public class Attributes {
 
     private String name;
 
-    @OneToMany(mappedBy = "attribute")
+    @OneToMany(mappedBy = "attribute", cascade = CascadeType.ALL)
     private List<AttributeValues> attributeValues;
+
+    // Getters, setters, and constructors
 }

src/main/java/_11/asktpk/artisanconnectbackend/entities/AttributesNotice.java

@@ -1,20 +1,21 @@
 package _11.asktpk.artisanconnectbackend.entities;
 
 import jakarta.persistence.*;
-import lombok.Setter;
-import lombok.Getter;
 
 @Entity
 @Table(name = "attributes_notice")
-@Getter @Setter
 public class AttributesNotice {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    private Long notice_id;
+    @ManyToOne
+    @JoinColumn(name = "id_notice")
+    private Notice notice;
 
     @ManyToOne
     @JoinColumn(name = "id_value")
     private AttributeValues attributeValue;
+
+    // Getters, setters, and constructors
 }

src/main/java/_11/asktpk/artisanconnectbackend/entities/Client.java

@@ -2,7 +2,6 @@ package _11.asktpk.artisanconnectbackend.entities;
 
 import jakarta.persistence.*;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
 
@@ -12,15 +11,7 @@ import java.util.List;
 @Entity
 @Table(name = "clients")
 @Getter @Setter
-@NoArgsConstructor
 public class Client {
-    public Client(String email, String password, String firstName, String lastName) {
-        this.email = email;
-        this.password = password;
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

src/main/java/_11/asktpk/artisanconnectbackend/entities/Notice.java

@@ -35,10 +35,10 @@ public class Notice {
 
     private LocalDateTime publishDate;
 
-    @OneToMany(mappedBy = "notice_id")
+    @OneToMany(mappedBy = "notice", cascade = CascadeType.ALL)
     private List<AttributesNotice> attributesNotices;
 
-    @OneToMany(mappedBy = "notice")
+    @OneToMany(mappedBy = "notice", cascade = CascadeType.ALL)
     private List<Order> orders;
 
 //    @OneToMany(mappedBy = "notice", cascade = CascadeType.ALL)

src/main/java/_11/asktpk/artisanconnectbackend/repository/AttributeValuesRepository.java

@@ -1,14 +0,0 @@
-package _11.asktpk.artisanconnectbackend.repository;
-
-import _11.asktpk.artisanconnectbackend.entities.AttributeValues;
-import _11.asktpk.artisanconnectbackend.entities.Attributes;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.Optional;
-
-@Repository
-public interface AttributeValuesRepository extends JpaRepository<AttributeValues, Long> {
-
-    Optional<AttributeValues> findByAttributeAndValue(Attributes attribute, String value);
-}

src/main/java/_11/asktpk/artisanconnectbackend/repository/AttributesNoticeRepository.java

@@ -1,9 +0,0 @@
-package _11.asktpk.artisanconnectbackend.repository;
-
-import _11.asktpk.artisanconnectbackend.entities.AttributesNotice;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AttributesNoticeRepository extends JpaRepository<AttributesNotice, Long> {
-}

src/main/java/_11/asktpk/artisanconnectbackend/repository/AttributesRepository.java

@@ -1,12 +0,0 @@
-package _11.asktpk.artisanconnectbackend.repository;
-
-import _11.asktpk.artisanconnectbackend.entities.Attributes;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.Optional;
-
-@Repository
-public interface AttributesRepository extends JpaRepository<Attributes, Long> {
-    Optional<Attributes> findByName(String name);
-}

src/main/java/_11/asktpk/artisanconnectbackend/repository/NoticeRepository.java

@@ -1,9 +1,11 @@
 package _11.asktpk.artisanconnectbackend.repository;
 
 import _11.asktpk.artisanconnectbackend.entities.Notice;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface NoticeRepository extends JpaRepository<Notice, Long> {
 
     boolean existsByIdNoticeAndClientId(long noticeId, long clientId);
-}
+
+}

src/main/java/_11/asktpk/artisanconnectbackend/security/JwtRequestFilter.java

@@ -43,7 +43,7 @@ public class JwtRequestFilter extends OncePerRequestFilter {
                     response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
                     response.setContentType("application/json");
                     response.setCharacterEncoding("UTF-8");
-                    String jsonResponse = "{\"error\": \"Token is invalid. Please login again.\"}";
+                    String jsonResponse = "{\"error\": \"Token is invalid or expired. Please login again.\"}";
                     response.getWriter().write(jsonResponse);
                     return;
                 }
@@ -53,7 +53,6 @@ public class JwtRequestFilter extends OncePerRequestFilter {
             } catch (ExpiredJwtException expiredJwtException) {
                 logger.error(expiredJwtException.getMessage());
                 response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-                response.getWriter().write(new RequestResponseDTO("Authentication token is expired. Please login again.").toJSON());
                 return;
             } catch (Exception e) {
                 logger.error(e.getMessage());

src/main/java/_11/asktpk/artisanconnectbackend/security/JwtUtil.java

@@ -82,10 +82,6 @@ public class JwtUtil {
         return extractAllClaims(token).get("role", String.class);
     }
 
-    public Long extractUserId(String token) {
-        return extractAllClaims(token).get("userId", Long.class);
-    }
-
     public <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
         final Claims claims = extractAllClaims(token);
         return claimsResolver.apply(claims);

src/main/java/_11/asktpk/artisanconnectbackend/service/AuthService.java

@@ -1,117 +0,0 @@
-package _11.asktpk.artisanconnectbackend.service;
-
-import _11.asktpk.artisanconnectbackend.customExceptions.ClientAlreadyExistsException;
-import _11.asktpk.artisanconnectbackend.customExceptions.WrongLoginPasswordException;
-import _11.asktpk.artisanconnectbackend.dto.AuthResponseDTO;
-import _11.asktpk.artisanconnectbackend.dto.ClientDTO;
-import _11.asktpk.artisanconnectbackend.entities.Client;
-import _11.asktpk.artisanconnectbackend.security.JwtUtil;
-import org.springframework.http.*;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.Map;
-
-@Slf4j
-@Service
-public class AuthService {
-
-    private final ClientService clientService;
-    private final PasswordEncoder passwordEncoder;
-    private final JwtUtil jwtUtil;
-
-    public AuthService(ClientService clientService, JwtUtil jwtUtil) {
-        this.clientService = clientService;
-        this.jwtUtil = jwtUtil;
-        this.passwordEncoder = new BCryptPasswordEncoder();
-    }
-
-    public AuthResponseDTO login(String email, String password) throws Exception {
-        Client client = clientService.getClientByEmail(email);
-        if (client == null) {
-            throw new Exception("Klient o podanym adresie nie istnieje!");
-        }
-
-        if (passwordEncoder.matches(password, client.getPassword())) {
-            String token = jwtUtil.generateToken(client.getEmail(), client.getRole().getRole(), client.getId());
-            log.info("User logged in with {}", client.getEmail());
-            return new AuthResponseDTO(client.getId(), client.getRole().getRole(), token);
-        }
-        throw new WrongLoginPasswordException("Login lub hasło jest niepoprawny!");
-    }
-
-    public AuthResponseDTO register(String email, String password, String firstName, String lastName) throws Exception {
-        if (clientService.getClientByEmail(email) != null) {
-            throw new ClientAlreadyExistsException("Klient o podanym adresie email już istnieje!");
-        }
-
-        Client newClient = new Client();
-        newClient.setEmail(email);
-        newClient.setPassword(passwordEncoder.encode(password));
-        newClient.setFirstName(firstName);
-        newClient.setLastName(lastName);
-
-        ClientDTO savedClient = clientService.registerClient(newClient);
-        if (savedClient != null) {
-            log.info("New user registered with {}", savedClient.getEmail());
-            String token = jwtUtil.generateToken(
-                    savedClient.getEmail(),
-                    savedClient.getRole(),
-                    savedClient.getId()
-            );
-
-            return new AuthResponseDTO(savedClient.getId(), savedClient.getRole(), token);
-        } else {
-            throw new Exception("Rejestracja nie powiodła się!");
-        }
-    }
-
-    public void logout(String token) {
-        jwtUtil.blacklistToken(token);
-    }
-
-    public AuthResponseDTO googleLogin(String googleAccessToken) throws Exception {
-        String googleUserInfoUrl = "https://www.googleapis.com/oauth2/v3/userinfo";
-
-        ResponseEntity<Map> response;
-
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setBearerAuth(googleAccessToken);
-        RestTemplate restTemplate = new RestTemplate();
-        response = restTemplate.exchange(
-                googleUserInfoUrl, HttpMethod.GET, new HttpEntity<>(headers), Map.class);
-
-
-        Map<String, Object> userInfo = response.getBody();
-
-//                String googleId = (String) userInfo.get("sub");  Potencjalnie możemy używać googlowskiego ID, ale to ma konflikt z naszym generowanym
-        if (userInfo == null) {
-            throw new Exception("Pobrany użytkownik jest pusty! Może to być spowodowane niepoprawnym tokenem lub brakiem dostępu do Google API.");
-        }
-        String email = (String) userInfo.get("email");
-        String name = (String) userInfo.get("name");
-
-        Client client = clientService.getClientByEmail(email);
-        if (client == null) {
-            client = new Client();
-            client.setEmail(email);
-            client.setFirstName(name);
-            client.setRole(clientService.getUserRole()); // to pobiera po prostu role "USER" z tabeli w bazie
-            clientService.saveClientToDB(client);
-        }
-
-        String jwt = jwtUtil.generateToken(client.getEmail(), client.getRole().getRole(), client.getId());
-        log.info("User authenticated with google: {}", client.getEmail());
-        return new AuthResponseDTO(
-                client.getId(),
-                client.getRole().getRole(),
-                jwt
-        );
-    }
-
-}
-

src/main/java/_11/asktpk/artisanconnectbackend/service/ClientService.java

@@ -1,5 +1,6 @@
 package _11.asktpk.artisanconnectbackend.service;
 
+import _11.asktpk.artisanconnectbackend.dto.AuthRequestDTO;
 import _11.asktpk.artisanconnectbackend.dto.ClientDTO;
 import _11.asktpk.artisanconnectbackend.dto.ClientRegistrationDTO;
 import _11.asktpk.artisanconnectbackend.entities.Client;
@@ -24,7 +25,7 @@ public class ClientService {
         this.rolesRepository = rolesRepository;
     }
 
-    public ClientDTO toDto(Client client) {
+    private ClientDTO toDto(Client client) {
         if(client == null) {
             return null;
         }
@@ -41,7 +42,7 @@ public class ClientService {
         return dto;
     }
 
-    public Client fromDto(ClientDTO dto) {
+    private Client fromDto(ClientDTO dto) {
         Client client = new Client();
         Role rola;
 
@@ -85,14 +86,6 @@ public class ClientService {
         return toDto(clientRepository.findById(id).orElse(null));
     }
 
-    public Client getClientByEmail(String email) {
-        return clientRepository.findByEmail(email);
-    }
-
-    public Role getUserRole() {
-        return rolesRepository.findRoleByRole("USER");
-    }
-
     public boolean clientExists(Long id) {
         return clientRepository.existsById(id);
     }
@@ -124,9 +117,29 @@ public class ClientService {
         clientRepository.deleteById(id);
     }
 
-    public ClientDTO registerClient(Client client) {
-        client.setRole(getUserRole()); // ID 1 - USER role
+    // И замените метод checkClientCredentials на:
+    public boolean checkClientCredentials(AuthRequestDTO dto) {
+        Client cl = clientRepository.findByEmail(dto.getEmail());
+        if (cl == null) {
+            return false;
+        }
+
+        return passwordEncoder.matches(dto.getPassword(), cl.getPassword());
+    }
+
+    // При создании нового пользователя не забудьте шифровать пароль:
+    public ClientDTO registerClient(ClientRegistrationDTO clientDTO) {
+        Client client = fromDto(clientDTO);
+        client.setRole(rolesRepository.findRoleById(1L));
         client.setPassword(passwordEncoder.encode(client.getPassword()));
         return toDto(clientRepository.save(client));
     }
+
+    public Client getClientByEmail(String email) {
+        return clientRepository.findByEmail(email);
+    }
+
+    public Role getUserRole() {
+        return rolesRepository.findRoleByRole("USER");
+    }
 }

src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java

@@ -1,10 +1,10 @@
 package _11.asktpk.artisanconnectbackend.service;
 
-import _11.asktpk.artisanconnectbackend.dto.AttributeDto;
-import _11.asktpk.artisanconnectbackend.dto.NoticeRequestDTO;
-import _11.asktpk.artisanconnectbackend.entities.*;
-import _11.asktpk.artisanconnectbackend.repository.*;
-import _11.asktpk.artisanconnectbackend.dto.NoticeResponseDTO;
+import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.entities.Notice;
+import _11.asktpk.artisanconnectbackend.repository.ClientRepository;
+import _11.asktpk.artisanconnectbackend.repository.NoticeRepository;
+import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
 import jakarta.persistence.EntityNotFoundException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class NoticeService {
@@ -24,32 +25,25 @@ public class NoticeService {
 
     private final NoticeRepository noticeRepository;
     private final ClientRepository clientRepository;
+    private final WishlistService wishlistService;
     private final ImageService imageService;
-    private final AttributesRepository attributesRepository;
-    private final AttributeValuesRepository attributeValuesRepository;
-    private final AttributesNoticeRepository attributesNoticeRepository;
 
-    public NoticeService(NoticeRepository noticeRepository,
-                         ClientRepository clientRepository,
-                         ImageService imageService,
-                         AttributesRepository attributesRepository,
-                         AttributeValuesRepository attributeValuesRepository,
-                         AttributesNoticeRepository attributesNoticeRepository) {
+    public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository, WishlistService wishlistService, ImageService imageService) {
         this.noticeRepository = noticeRepository;
         this.clientRepository = clientRepository;
+        this.wishlistService = wishlistService;
         this.imageService = imageService;
-        this.attributesRepository = attributesRepository;
-        this.attributeValuesRepository = attributeValuesRepository;
-        this.attributesNoticeRepository = attributesNoticeRepository;
     }
 
-    public Notice fromDTO(NoticeRequestDTO dto) {
+    public Notice fromDTO(NoticeDTO dto) {
         Notice notice = new Notice();
         notice.setTitle(dto.getTitle());
         notice.setDescription(dto.getDescription());
         notice.setPrice(dto.getPrice());
         notice.setCategory(dto.getCategory());
         notice.setStatus(dto.getStatus());
+        notice.setPublishDate(dto.getPublishDate());
+        notice.setAttributesNotices(dto.getAttributesNotices());
 
         Client client = clientRepository.findById(dto.getClientId())
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono klienta o ID: " + dto.getClientId()));
@@ -58,8 +52,15 @@ public class NoticeService {
         return notice;
     }
 
-    private NoticeResponseDTO toDTO(Notice notice) {
-        NoticeResponseDTO dto = new NoticeResponseDTO();
+    private NoticeDTO toDTO(Notice notice) {
+        NoticeDTO dto = new NoticeDTO();
+        // TODO: To be updated using AuthService after implementing authentication.
+        Optional<Client> client = clientRepository.findById(1L);
+        boolean isWishlisted = false;
+        if (client.isPresent()) {
+            Client c = client.get();
+            isWishlisted = wishlistService.isWishlisted(c, notice);
+        }
         dto.setNoticeId(notice.getIdNotice());
         dto.setTitle(notice.getTitle());
         dto.setClientId(notice.getClient().getId());
@@ -68,30 +69,20 @@ public class NoticeService {
         dto.setCategory(notice.getCategory());
         dto.setStatus(notice.getStatus());
         dto.setPublishDate(notice.getPublishDate());
-
-        List<AttributeDto> attributes = new ArrayList<>();
-        if (notice.getAttributesNotices() != null) {
-            for (AttributesNotice an : notice.getAttributesNotices()) {
-                AttributeDto attr = new AttributeDto();
-                attr.setName(an.getAttributeValue().getAttribute().getName());
-                attr.setValue(an.getAttributeValue().getValue());
-                attributes.add(attr);
-            }
-        }
-        dto.setAttributes(attributes);
-
+        dto.setAttributesNotices(notice.getAttributesNotices());
+        dto.setWishlisted(isWishlisted);
         return dto;
     }
 
-    public List<NoticeResponseDTO> getAllNotices() {
-        List<NoticeResponseDTO> result = new ArrayList<>();
+    public List<NoticeDTO> getAllNotices() {
+        List<NoticeDTO> result = new ArrayList<>();
         for (Notice notice : noticeRepository.findAll()) {
             result.add(toDTO(notice));
         }
         return result;
     }
 
-    public NoticeResponseDTO getNoticeById(Long id) {
+    public NoticeDTO getNoticeById(Long id) {
         Notice notice = noticeRepository.findById(id)
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
         return toDTO(notice);
@@ -102,48 +93,15 @@ public class NoticeService {
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
     }
 
-    public Long addNotice(NoticeRequestDTO dto) {
-        Notice notice = fromDTO(dto);
-        notice.setPublishDate(LocalDateTime.now());
-        Notice savedNotice = noticeRepository.save(notice);
-
-        if (dto.getAttributes() != null && !dto.getAttributes().isEmpty()) {
-            saveAttributes(savedNotice.getIdNotice(), dto.getAttributes());
-        }
-
-        return savedNotice.getIdNotice();
-    }
-
-    private void saveAttributes(Long noticeId, List<AttributeDto> attributeDtos) {
-        for (AttributeDto attributeDto : attributeDtos) {
-            Attributes attribute = attributesRepository.findByName(attributeDto.getName())
-                    .orElseGet(() -> {
-                        Attributes newAttribute = new Attributes();
-                        newAttribute.setName(attributeDto.getName());
-                        return attributesRepository.save(newAttribute);
-                    });
-
-            AttributeValues attributeValue = attributeValuesRepository
-                    .findByAttributeAndValue(attribute, attributeDto.getValue())
-                    .orElseGet(() -> {
-                        AttributeValues newValue = new AttributeValues();
-                        newValue.setAttribute(attribute);
-                        newValue.setValue(attributeDto.getValue());
-                        return attributeValuesRepository.save(newValue);
-                    });
-
-            AttributesNotice attributesNotice = new AttributesNotice();
-            attributesNotice.setNotice_id(noticeId);
-            attributesNotice.setAttributeValue(attributeValue);
-            attributesNoticeRepository.save(attributesNotice);
-        }
+    public Long addNotice(NoticeDTO dto) {
+        return noticeRepository.save(fromDTO(dto)).getIdNotice();
     }
 
     public boolean noticeExists(Long id) {
         return noticeRepository.existsById(id);
     }
 
-    public NoticeResponseDTO updateNotice(Long id, NoticeRequestDTO dto) {
+    public NoticeDTO updateNotice(Long id, NoticeDTO dto) {
         Notice existingNotice = noticeRepository.findById(id)
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
 
@@ -152,6 +110,7 @@ public class NoticeService {
         existingNotice.setPrice(dto.getPrice());
         existingNotice.setCategory(dto.getCategory());
         existingNotice.setStatus(dto.getStatus());
+        existingNotice.setAttributesNotices(dto.getAttributesNotices());
 
         if (dto.getClientId() != null && !dto.getClientId().equals(existingNotice.getClient().getId())) {
             Client client = clientRepository.findById(dto.getClientId())

src/main/java/_11/asktpk/artisanconnectbackend/service/OrderService.java

@@ -56,7 +56,8 @@ public class OrderService {
 
 
     public Long addOrder(OrderDTO orderDTO) {
-        return orderRepository.save(fromDTO(orderDTO)).getId();
+        Order order = fromDTO(orderDTO);
+        return orderRepository.save(order).getId();
     }
 
     public Long changeOrderStatus(Long id, Enums.OrderStatus status) {

src/main/java/_11/asktpk/artisanconnectbackend/service/WishlistService.java

@@ -1,7 +1,7 @@
 package _11.asktpk.artisanconnectbackend.service;
 
 import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
-import _11.asktpk.artisanconnectbackend.dto.NoticeResponseDTO;
+import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
 import _11.asktpk.artisanconnectbackend.entities.Client;
 import _11.asktpk.artisanconnectbackend.entities.Notice;
 import _11.asktpk.artisanconnectbackend.entities.Wishlist;
@@ -31,6 +31,12 @@ public class WishlistService {
                 .toList();
     }
 
+    public boolean isWishlisted(Client client, Notice notice) {
+        Optional<Wishlist> existingEntry = wishlistRepository.findByClientAndNotice(client, notice);
+
+        return existingEntry.isEmpty();
+    }
+
     public boolean toggleWishlist(Client client, Notice notice) {
         Optional<Wishlist> existingEntry = wishlistRepository.findByClientAndNotice(client, notice);
 
@@ -55,7 +61,7 @@ public class WishlistService {
         return dto;
     }
 
-    public List<NoticeResponseDTO> getNoticesInWishlist(Long clientId) {
+    public List<NoticeDTO> getNoticesInWishlist(Long clientId) {
         List<Wishlist> wishlistEntries = wishlistRepository.findAllByClientId(clientId);
 
         return wishlistEntries.stream()

src/main/java/_11/asktpk/artisanconnectbackend/utils/Tools.java

@@ -1,24 +0,0 @@
-package _11.asktpk.artisanconnectbackend.utils;
-
-import _11.asktpk.artisanconnectbackend.security.JwtUtil;
-
-import jakarta.servlet.http.HttpServletRequest;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Tools {
-    private final JwtUtil jwtUtil;
-
-    public Tools(JwtUtil jwtUtil) {
-        this.jwtUtil = jwtUtil;
-    }
-
-    public Long getClientIdFromRequest(HttpServletRequest request) {
-        String authorizationHeader = request.getHeader("Authorization");
-        if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) {
-            return jwtUtil.extractUserId(authorizationHeader.substring(7));
-        } else {
-            return -1L;
-        }
-    }
-}

src/main/resources/sql/data.sql

@@ -17,45 +17,4 @@ INSERT INTO notice (title, description, client_id, price, category, status, publ
     ('Drewniany stół', 'Solidny stół wykonany z litego drewna dębowego.', 3, 1200.00, 'Furniture', 'ACTIVE', '2023-09-15'),
     ('Ceramiczna waza', 'Piękna waza ceramiczna, idealna na prezent.', 2, 300.00, 'Ceramics', 'INACTIVE', '2023-08-20'),
     ('Obraz olejny', 'Obraz olejny przedstawiający krajobraz górski.', 4, 800.00, 'Painting', 'ACTIVE', '2023-07-10'),
-    ('Skórzany portfel', 'Ręcznie wykonany portfel ze skóry naturalnej.', 1, 250.00, 'Leatherwork', 'ACTIVE', '2023-06-05');
-
-
-insert into attributes (name) values
-                                  ('Kolor'),
-                                  ('Materiał');
-
--- Kolory
-insert into attribute_values (value, id_attribute)  values
-                                                        ('Zielony', 1),
-                                                        ('Czerwony', 1),
-                                                        ('Niebieski', 1),
-                                                        ('Żółty', 1),
-                                                        ('Biały', 1),
-                                                        ('Czarny', 1),
-                                                        ('Różowy', 1),
-                                                        ('Szary', 1),
-                                                        ('Fioletowy', 1),
-                                                        ('Pomarańczowy', 1),
-                                                        ('Inny', 1);
-
--- Materiały
-insert into attribute_values (value, id_attribute)  values
-                                                        ('Bawełna', 2),
-                                                        ('Wełna', 2),
-                                                        ('Syntetyk', 2),
-                                                        ('Skóra', 2),
-                                                        ('Len', 2),
-                                                        ('Jedwab', 2),
-                                                        ('Poliester', 2),
-                                                        ('Akryl', 2),
-                                                        ('Wiskoza', 2),
-                                                        ('Nylon', 2),
-                                                        ('Inny', 2);
-
-insert into attributes_notice (id_value, notice_id) values
-                                                        (1, 1), -- Ręcznie robiona biżuteria - Zielony
-                                                        (22, 1),
-                                                        (2, 2), -- Drewniany stół - Czerwony
-                                                        (3, 3), -- Ceramiczna waza - Niebieski
-                                                        (4, 4), -- Obraz olejny - Żółty
-                                                        (5, 5); -- Skórzany portfel - Biały
+    ('Skórzany portfel', 'Ręcznie wykonany portfel ze skóry naturalnej.', 1, 250.00, 'Leatherwork', 'ACTIVE', '2023-06-05');

src/test/java/_11/asktpk/artisanconnectbackend/ArtisanConnectBackendApplicationTests.java

@@ -1,33 +1,591 @@
 package _11.asktpk.artisanconnectbackend;
 
+import _11.asktpk.artisanconnectbackend.dto.CategoriesDTO;
+import _11.asktpk.artisanconnectbackend.dto.ClientDTO;
+import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
+import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
+import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.entities.Notice;
+import _11.asktpk.artisanconnectbackend.entities.Wishlist;
+import _11.asktpk.artisanconnectbackend.repository.ClientRepository;
+import _11.asktpk.artisanconnectbackend.repository.NoticeRepository;
+import _11.asktpk.artisanconnectbackend.repository.WishlistRepository;
+import _11.asktpk.artisanconnectbackend.service.ClientService;
+import _11.asktpk.artisanconnectbackend.service.ImageService;
+import _11.asktpk.artisanconnectbackend.service.NoticeService;
+import _11.asktpk.artisanconnectbackend.service.WishlistService;
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+import jakarta.persistence.EntityNotFoundException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.junit.jupiter.api.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.http.*;
+import _11.asktpk.artisanconnectbackend.entities.Image;
+import _11.asktpk.artisanconnectbackend.repository.ImageRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.web.multipart.MultipartFile;
 
-@SpringBootTest
+
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+
+import static _11.asktpk.artisanconnectbackend.utils.Enums.Role.USER;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * Testy dla funkcjonalności klienta w backendzie.
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class ArtisanConnectBackendApplicationTests {
+
     private static final Logger logger = LogManager.getLogger(ArtisanConnectBackendApplicationTests.class);
 
-//    @Test
-//    void testPostgresDatabase() {
-//        postgresDatabase.add(new Notice("Test Notice", "Username", "Test Description"));
-//        Boolean isRecordAvailable = postgresDatabase.get().size() > 0;
-//        if(isRecordAvailable) {
-//            logger.info("The record is available in the database");
-//        } else {
-//            logger.error("The record is not available in the database");
-//        }
-//        assert isRecordAvailable;
-//    }
-//
-//    @Test
-//    void getAllNotices() throws IOException {
-//        OkHttpClient client = new OkHttpClient().newBuilder()
-//                .build();
-//        MediaType mediaType = MediaType.parse("text/plain");
-//        Request request = new Request.Builder()
-//                .url("http://localhost:8080/api/v1/notices/all")
-//                .build();
-//        Response response = client.newCall(request).execute();
-//    }
-}
+    @LocalServerPort
+    private final int port;
+
+    private final ClientService clientService;
+    private final TestRestTemplate restTemplate;
+
+    @Autowired
+    public ArtisanConnectBackendApplicationTests(ClientService clientService, @LocalServerPort int port) {
+        this.clientService = clientService;
+        this.port = port;
+        this.restTemplate = new TestRestTemplate();
+    }
+
+
+    @Nested
+    @DisplayName("Testy jednostkowe ClientService")
+    class ClientServiceTest {
+
+        private final ClientRepository clientRepository;
+        private final ClientService clientService;
+
+        ClientServiceTest() {
+            logger.info("Inicjalizacja mocków dla ClientService");
+            this.clientRepository = mock(ClientRepository.class);
+            this.clientService = new ClientService(clientRepository);
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie mapować klientów na ClientDTO")
+        void testClientMappingToDTO() {
+            logger.info("Tworzenie danych klientów...");
+            Client client = createTestClient("Jan", "Kowalski");
+            when(clientRepository.findAll()).thenReturn(List.of(client));
+
+            logger.info("Wywołanie metody getAllClients...");
+            List<ClientDTO> clientDTOList = clientService.getAllClients();
+
+            assertThat(clientDTOList).hasSize(1);
+            assertThat(clientDTOList.get(0).getFirstName()).isEqualTo("Jan");
+            verify(clientRepository, times(1)).findAll();
+            logger.info("Test zakończony poprawnie");
+        }
+
+        private Client createTestClient(String firstName, String lastName) {
+            Client client = new Client();
+            client.setFirstName(firstName);
+            client.setLastName(lastName);
+            client.setEmail(firstName.toLowerCase() + "." + lastName.toLowerCase() + "@example.com");
+            client.setRole(USER);
+            return client;
+        }
+    }
+
+    @Nested
+    @DisplayName("Testy integracyjne ClientController")
+    class ClientControllerTest {
+
+        private final int port;
+        private final TestRestTemplate restTemplate;
+        private final ClientService clientService;
+        private final NoticeService noticeService;
+        private final NoticeRepository noticeRepository;
+        private final Logger logger = LogManager.getLogger(ClientControllerTest.class);
+
+        @Autowired
+        public ClientControllerTest(
+                @LocalServerPort int port,
+                TestRestTemplate restTemplate,
+                ClientService clientService,
+                NoticeService noticeService,
+                NoticeRepository noticeRepository) {
+            this.port = port;
+            this.restTemplate = restTemplate;
+            this.clientService = clientService;
+            this.noticeService = noticeService;
+            this.noticeRepository = noticeRepository;
+        }
+
+        @BeforeEach
+        void cleanDatabase() {
+
+            noticeRepository.deleteAll();
+
+            clientService.getAllClients().forEach(client -> {
+                try {
+                    clientService.deleteClient(client.getId());
+                } catch (Exception e) {
+                    logger.error("Błąd podczas usuwania klienta: {}", e.getMessage());
+                }
+            });
+        }
+
+        private boolean hasNotices(Long clientId) {
+            return noticeService.getAllNotices().stream()
+                    .anyMatch(notice -> notice.getClientId().equals(clientId));
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie usunąć klienta z powiązanymi ogłoszeniami")
+        void shouldDeleteClientWithNotices() {
+            ClientDTO client = clientService.addClient(createTestDTO("client@example.com", "Jan", "Kowalski"));
+
+            NoticeDTO notice = new NoticeDTO();
+            notice.setClientId(client.getId());
+            notice.setTitle("Test Notice");
+            Long noticeId = noticeService.addNotice(notice);
+
+            ResponseEntity<Void> deleteNoticeResponse = restTemplate.exchange(
+                    createURLWithPort("/api/v1/notices/delete/" + noticeId),
+                    HttpMethod.DELETE,
+                    null,
+                    Void.class
+            );
+            assertThat(deleteNoticeResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
+
+            ResponseEntity<Void> deleteClientResponse = restTemplate.exchange(
+                    createURLWithPort("/api/v1/clients/delete/" + client.getId()),
+                    HttpMethod.DELETE,
+                    null,
+                    Void.class
+            );
+
+            assertThat(deleteClientResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
+            assertThat(clientService.clientExists(client.getId())).isFalse();
+            assertThat(noticeService.noticeExists(noticeId)).isFalse();
+        }
+        @Autowired
+        private ClientRepository clientRepository;
+
+
+        @Test
+        @DisplayName("Powinien zwracać wszystkich klientów")
+        void shouldReturnAllClients() {
+            ClientDTO client1 = clientService.addClient(createTestDTO("client1@example.com", "Anna", "Nowak"));
+            ClientDTO client2 = clientService.addClient(createTestDTO("client2@example.com", "Adam", "Kowalski"));
+
+            ResponseEntity<ClientDTO[]> response = restTemplate.getForEntity(
+                    createURLWithPort("/api/v1/clients/get/all"),
+                    ClientDTO[].class
+            );
+
+            assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+            assertThat(response.getBody()).isNotNull();
+            assertThat(response.getBody()).hasSize(2);
+        }
+
+
+
+        @Test
+        @DisplayName("Powinien zwrócić błąd przy próbie usunięcia klienta z powiązanymi ogłoszeniami bez kaskady")
+        void shouldFailWhenDeletingClientWithNoticesWithoutCascade() {
+            noticeService.getAllNotices().forEach(n -> noticeService.deleteNotice(n.getNoticeId()));
+            clientService.getAllClients().forEach(c -> clientService.deleteClient(c.getId()));
+
+            ClientDTO client = clientService.addClient(createTestDTO("client@example.com", "Jan", "Kowalski"));
+
+            NoticeDTO notice = new NoticeDTO();
+            notice.setClientId(client.getId());
+            notice.setTitle("Test Notice");
+            noticeService.addNotice(notice);
+
+            try {
+                clientService.deleteClient(client.getId());
+                fail("Powinien zostać rzucony wyjątek DataIntegrityViolationException");
+            } catch (DataIntegrityViolationException e) {
+                // Oczekiwany wyjątek
+                assertThat(e.getMessage()).contains("could not execute statement");
+            }
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie usunąć klienta bez powiązanych ogłoszeń")
+        void shouldDeleteClientWithoutNotices() {
+            ClientDTO client = clientService.addClient(createTestDTO("client@example.com", "Jan", "Kowalski"));
+
+            ResponseEntity<Void> deleteResponse = restTemplate.exchange(
+                    createURLWithPort("/api/v1/clients/delete/" + client.getId()),
+                    HttpMethod.DELETE,
+                    null,
+                    Void.class
+            );
+
+            assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
+            assertThat(clientService.clientExists(client.getId())).isFalse();
+        }
+
+        private ClientDTO createTestDTO(String email, String firstName, String lastName) {
+            ClientDTO clientDTO = new ClientDTO();
+            clientDTO.setEmail(email);
+            clientDTO.setFirstName(firstName);
+            clientDTO.setLastName(lastName);
+            clientDTO.setRole(USER);
+            return clientDTO;
+        }
+
+        private String createURLWithPort(String uri) {
+            return "http://localhost:" + port + uri;
+        }
+    }
+
+    @Nested
+    @DisplayName("Testy jednostkowe NoticeService")
+    class NoticeServiceUnitTest {
+
+        private final NoticeRepository noticeRepository;
+        private final ClientRepository clientRepository;
+        private final NoticeService noticeService;
+
+        NoticeServiceUnitTest() {
+            this.noticeRepository = mock(NoticeRepository.class);
+            this.clientRepository = mock(ClientRepository.class);
+            this.noticeService = new NoticeService(
+                    noticeRepository,
+                    clientRepository,
+                    null,
+                    null
+            );
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie dodać ogłoszenie")
+        void shouldAddNoticeSuccessfully() {
+            Client client = createTestClient("test@example.com", "Anna", "Kowalska");
+            when(clientRepository.findById(1L)).thenReturn(Optional.of(client));
+
+            NoticeDTO noticeDTO = new NoticeDTO();
+            noticeDTO.setClientId(1L);
+            noticeDTO.setTitle("Test Notice");
+            noticeDTO.setDescription("Opis ogłoszenia");
+            noticeDTO.setPrice(100.0);
+
+            Notice notice = new Notice();
+            notice.setIdNotice(1L);
+
+            when(noticeRepository.save(any(Notice.class))).thenReturn(notice);
+
+            Long savedNoticeId = noticeService.addNotice(noticeDTO);
+
+            assertThat(savedNoticeId).isEqualTo(1L);
+            verify(noticeRepository, times(1)).save(any(Notice.class));
+        }
+
+        @Test
+        @DisplayName("Powinien zwrócić wyjątek, gdy klient dla ogłoszenia nie istnieje")
+        void shouldThrowExceptionWhenClientNotFound() {
+            NoticeDTO noticeDTO = new NoticeDTO();
+            noticeDTO.setClientId(1L);
+
+            when(clientRepository.findById(1L)).thenReturn(Optional.empty());
+
+            assertThrows(EntityNotFoundException.class, () -> noticeService.addNotice(noticeDTO));
+        }
+
+        private Client createTestClient(String email, String firstName, String lastName) {
+            Client client = new Client();
+            client.setId(1L);
+            client.setEmail(email);
+            client.setFirstName(firstName);
+            client.setLastName(lastName);
+            return client;
+        }
+    }
+
+
+    @Nested
+    @DisplayName("Testy integracyjne ImageService")
+    class ImageServiceTest {
+
+        private final ImageRepository imageRepository;
+        private final ImageService imageService;
+
+        ImageServiceTest() throws Exception {
+            this.imageRepository = mock(ImageRepository.class);
+            Constructor<ImageService> constructor = ImageService.class.getDeclaredConstructor(ImageRepository.class);
+            constructor.setAccessible(true);
+            this.imageService = constructor.newInstance(imageRepository);
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie zapisać obraz w magazynie plików")
+        void shouldSaveImageToStorage() throws IOException {
+            MultipartFile file = mock(MultipartFile.class);
+            when(file.getOriginalFilename()).thenReturn("test.jpg");
+            when(file.getInputStream()).thenReturn(Files.newInputStream(Path.of("src/test/resources/test.jpg")));
+
+            String uploadDirectory = "upload_dir";
+            Path uploadPath = Path.of(uploadDirectory);
+            Files.createDirectories(uploadPath);
+
+            String savedFileName = imageService.saveImageToStorage(uploadDirectory, file);
+
+            assertTrue(savedFileName.contains(".jpg"));
+            assertTrue(Files.exists(uploadPath.resolve(savedFileName)));
+
+            Files.deleteIfExists(uploadPath.resolve(savedFileName));
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie zapisać nazwę obrazu do bazy danych")
+        void shouldAddImageNameToDB() {
+            String filename = UUID.randomUUID() + "test.jpg";
+            Long noticeId = 1L;
+
+            imageService.addImageNameToDB(filename, noticeId);
+
+            verify(imageRepository, times(1)).save(Mockito.any(Image.class));
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie pobrać obraz")
+        void shouldGetImage() throws IOException {
+            Path imagePath = Path.of("src/test/resources/test.jpg");
+            Resource resource = imageService.getImage("src/test/resources", "test.jpg");
+
+            assertNotNull(resource);
+            assertTrue(resource instanceof UrlResource);
+            assertTrue(Files.exists(imagePath));
+        }
+
+        @Test
+        @DisplayName("Powinien zgłosić błąd, gdy obraz nie zostanie znaleziony")
+        void shouldThrowExceptionWhenImageNotFound() {
+            Exception exception = assertThrows(IOException.class, () -> {
+                imageService.getImage("invalid/path", "missing.jpg");
+            });
+
+            assertThat(exception).hasMessageContaining("File not found");
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie usuwać obraz z magazynu plików i bazy danych")
+        void shouldDeleteImage() throws IOException {
+            Path imagePath = Files.createTempFile("temp-dir", "temp-image.jpg");
+            String imageName = imagePath.getFileName().toString();
+            String imageDirectory = imagePath.getParent().toString();
+
+            Image image = new Image();
+            image.setImageName(imageName);
+            when(imageRepository.existsImageByImageNameEqualsIgnoreCase(imageName)).thenReturn(true);
+
+            imageService.deleteImage(imageDirectory, imageName);
+
+            assertFalse(Files.exists(imagePath));
+            verify(imageRepository, times(1)).deleteByImageNameEquals(imageName);
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie zwrócić listę nazw obrazów dla podanego ogłoszenia")
+        void shouldGetImagesListForNotice() throws Exception {
+            Long noticeId = 1L;
+            List<Image> images = List.of(
+                    createTestImage(1L, noticeId, "image1.jpg"),
+                    createTestImage(2L, noticeId, "image2.jpg")
+            );
+            when(imageRepository.findByNoticeId(noticeId)).thenReturn(images);
+
+            List<String> imageNames = imageService.getImagesList(noticeId);
+
+            assertThat(imageNames).hasSize(2);
+            assertThat(imageNames).containsExactly("image1.jpg", "image2.jpg");
+        }
+
+        private Image createTestImage(Long id, Long noticeId, String imageName) {
+            Image image = new Image();
+            image.setId(id);
+            image.setNoticeId(noticeId);
+            image.setImageName(imageName);
+            return image;
+        }
+    }
+
+    @Nested
+    @DisplayName("Testy integracyjne WishlistService")
+    class WishlistServiceTest {
+
+        private final WishlistRepository wishlistRepository;
+        private final NoticeService noticeService;
+        private final WishlistService wishlistService;
+
+        WishlistServiceTest() {
+            this.wishlistRepository = mock(WishlistRepository.class);
+            this.noticeService = mock(NoticeService.class);
+            this.wishlistService = new WishlistService(wishlistRepository, noticeService);
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie zwrócić wishlist dla klienta")
+        void shouldGetWishlistForClient() {
+            Long clientId = 1L;
+            Wishlist wishlist1 = createTestWishlist(1L, clientId, 10L);
+            Wishlist wishlist2 = createTestWishlist(2L, clientId, 20L);
+
+            when(wishlistRepository.findAllByClientId(clientId)).thenReturn(List.of(wishlist1, wishlist2));
+
+            List<WishlistDTO> result = wishlistService.getWishlistForClientId(clientId);
+
+            assertThat(result).hasSize(2);
+            assertThat(result.get(0).getNoticeId()).isEqualTo(10L);
+            verify(wishlistRepository, times(1)).findAllByClientId(clientId);
+        }
+
+        @Test
+        @DisplayName("Powinien poprawnie dodać lub usunąć element z wishlist")
+        void shouldToggleWishlist() {
+            Client client = createTestClient(1L, "test@example.com");
+            Notice notice = createTestNotice(10L);
+
+            // Scenariusz 1: Element istnieje i powinien zostać usunięty
+            when(wishlistRepository.findByClientAndNotice(client, notice)).thenReturn(Optional.of(new Wishlist()));
+
+            boolean removed = wishlistService.toggleWishlist(client, notice);
+
+            assertThat(removed).isFalse();
+            verify(wishlistRepository, times(1)).delete(any(Wishlist.class));
+
+            // Scenariusz 2: Element nie istnieje i powinien zostać dodany
+            when(wishlistRepository.findByClientAndNotice(client, notice)).thenReturn(Optional.empty());
+
+            boolean added = wishlistService.toggleWishlist(client, notice);
+
+            assertThat(added).isTrue();
+            verify(wishlistRepository, times(1)).save(any(Wishlist.class));
+        }
+
+        @Test
+        @DisplayName("Powinien zwrócić listę ogłoszeń w wishlist klienta")
+        void shouldGetNoticesInWishlist() {
+            Long clientId = 1L;
+            Wishlist wishlist1 = createTestWishlist(1L, clientId, 10L);
+            Wishlist wishlist2 = createTestWishlist(2L, clientId, 20L);
+
+            when(wishlistRepository.findAllByClientId(clientId)).thenReturn(List.of(wishlist1, wishlist2));
+            when(noticeService.getNoticeById(10L)).thenReturn(createNoticeDTO(10L, "Ogłoszenie 1"));
+            when(noticeService.getNoticeById(20L)).thenReturn(createNoticeDTO(20L, "Ogłoszenie 2"));
+
+            List<NoticeDTO> result = wishlistService.getNoticesInWishlist(clientId);
+
+            assertThat(result).hasSize(2);
+            assertThat(result.get(0).getNoticeId()).isEqualTo(10L);
+            assertThat(result.get(1).getNoticeId()).isEqualTo(20L);
+        }
+
+        private Wishlist createTestWishlist(Long id, Long clientId, Long noticeId) {
+            Wishlist wishlist = new Wishlist();
+            wishlist.setId(id);
+
+            Client client = new Client();
+            client.setId(clientId);
+            wishlist.setClient(client);
+
+            Notice notice = new Notice();
+            notice.setIdNotice(noticeId);
+            wishlist.setNotice(notice);
+
+            return wishlist;
+        }
+
+        private Client createTestClient(Long id, String email) {
+            Client client = new Client();
+            client.setId(id);
+            client.setEmail(email);
+            return client;
+        }
+
+        private Notice createTestNotice(Long noticeId) {
+            Notice notice = new Notice();
+            notice.setIdNotice(noticeId);
+            return notice;
+        }
+
+        private NoticeDTO createNoticeDTO(Long noticeId, String title) {
+            NoticeDTO noticeDTO = new NoticeDTO();
+            noticeDTO.setNoticeId(noticeId);
+            noticeDTO.setTitle(title);
+            return noticeDTO;
+        }
+    }
+
+    @Nested
+    @DisplayName("Testy dla VariablesController")
+    class VariablesControllerTest {
+
+        private final int port;
+        private final TestRestTemplate restTemplate;
+
+        @Autowired
+        public VariablesControllerTest(@LocalServerPort int port, TestRestTemplate restTemplate) {
+            this.port = port;
+            this.restTemplate = restTemplate;
+        }
+
+        @Test
+        @DisplayName("Powinien zwrócić kategorie")
+        void shouldGetCategories() {
+            String url = createURLWithPort("/api/v1/vars/categories");
+
+            ResponseEntity<CategoriesDTO[]> response = restTemplate.getForEntity(url, CategoriesDTO[].class);
+
+            assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+            assertThat(response.getBody()).isNotNull().isNotEmpty();
+        }
+
+        @Test
+        @DisplayName("Powinien zwrócić statusy")
+        void shouldGetStatuses() {
+            String url = createURLWithPort("/api/v1/vars/statuses");
+
+            ResponseEntity<Enums.Status[]> response = restTemplate.getForEntity(url, Enums.Status[].class);
+
+            assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+            assertThat(response.getBody()).isNotNull().isNotEmpty();
+        }
+
+        @Test
+        @DisplayName("Powinien zwrócić role")
+        void shouldGetRoles() {
+            String url = createURLWithPort("/api/v1/vars/roles");
+
+            ResponseEntity<Enums.Role[]> response = restTemplate.getForEntity(url, Enums.Role[].class);
+
+            assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+            assertThat(response.getBody()).isNotNull().isNotEmpty();
+        }
+
+        private String createURLWithPort(String uri) {
+            return "http://localhost:" + port + uri;
+        }
+    }
+
+
+}