From 3d205df0381a64931cc9c5c14facbe3ba11917ce Mon Sep 17 00:00:00 2001
From: Andrii Solianyk <asolianik2015@gmail.com>
Date: Wed, 14 May 2025 08:35:33 +0200
Subject: [PATCH] few cosmetic fixes

---
 .../controller/WishlistController.java               |  4 ++--
 .../repository/WishlistRepository.java               |  2 --
 .../artisanconnectbackend/service/NoticeService.java | 12 ++++++------
 .../service/WishlistService.java                     |  7 +------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/controller/WishlistController.java b/src/main/java/_11/asktpk/artisanconnectbackend/controller/WishlistController.java
index c1097e9..c30f654 100644
--- a/src/main/java/_11/asktpk/artisanconnectbackend/controller/WishlistController.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/controller/WishlistController.java
@@ -3,7 +3,6 @@ package _11.asktpk.artisanconnectbackend.controller;
 import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
 import _11.asktpk.artisanconnectbackend.dto.RequestResponseDTO;
 import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
-import _11.asktpk.artisanconnectbackend.entities.Wishlist;
 import _11.asktpk.artisanconnectbackend.service.ClientService;
 import _11.asktpk.artisanconnectbackend.service.NoticeService;
 import _11.asktpk.artisanconnectbackend.service.WishlistService;
@@ -53,7 +52,8 @@ public class WishlistController {
 
     @GetMapping("/")
     public List<NoticeDTO> getWishlistForClient() {
-        Long clientId =1L;
+        // TODO: Replace with actual client ID from authentication context
+        Long clientId = 1L;
         return wishlistService.getNoticesInWishlist(clientId);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/repository/WishlistRepository.java b/src/main/java/_11/asktpk/artisanconnectbackend/repository/WishlistRepository.java
index c3bc132..1b3fc78 100644
--- a/src/main/java/_11/asktpk/artisanconnectbackend/repository/WishlistRepository.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/repository/WishlistRepository.java
@@ -13,6 +13,4 @@ public interface WishlistRepository extends JpaRepository<Wishlist, Long> {
     List<Wishlist> findAllByClientId(Long clientId);
 
     Optional<Wishlist> findByClientAndNotice(Client client, Notice notice);
-
-    Boolean existsByClientAndNotice(Client client, Notice notice);
 }
\ No newline at end of file
diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java b/src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java
index 95be3fa..46d6058 100644
--- a/src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java
@@ -18,10 +18,9 @@ public class NoticeService {
 
     private final NoticeRepository noticeRepository;
     private final ClientRepository clientRepository;
-//    private final WishlistRepository wishlistRepository;
     private final WishlistService wishlistService;
 
-    public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository,WishlistService wishlistService) {
+    public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository, WishlistService wishlistService) {
         this.noticeRepository = noticeRepository;
         this.clientRepository = clientRepository;
         this.wishlistService = wishlistService;
@@ -46,11 +45,12 @@ public class NoticeService {
 
     private NoticeDTO toDTO(Notice notice) {
         NoticeDTO dto = new NoticeDTO();
-        Optional<Client> client = clientRepository.findById(1L);//To be updated using AuthService after implementing authentication.
+        // 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);
+            isWishlisted = wishlistService.isWishlisted(c, notice);
         }
         dto.setNoticeId(notice.getIdNotice());
         dto.setTitle(notice.getTitle());
@@ -78,10 +78,10 @@ public class NoticeService {
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
         return toDTO(notice);
     }
+
     public Notice getNoticeByIdEntity(Long id) {
-        Notice notice = noticeRepository.findById(id)
+        return noticeRepository.findById(id)
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
-        return notice;
     }
 
     public Long addNotice(NoticeDTO dto) {
diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/service/WishlistService.java b/src/main/java/_11/asktpk/artisanconnectbackend/service/WishlistService.java
index 6c22044..781a92f 100644
--- a/src/main/java/_11/asktpk/artisanconnectbackend/service/WishlistService.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/service/WishlistService.java
@@ -2,7 +2,6 @@ package _11.asktpk.artisanconnectbackend.service;
 
 import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
 import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
-import _11.asktpk.artisanconnectbackend.service.NoticeService;
 import _11.asktpk.artisanconnectbackend.entities.Client;
 import _11.asktpk.artisanconnectbackend.entities.Notice;
 import _11.asktpk.artisanconnectbackend.entities.Wishlist;
@@ -35,11 +34,7 @@ public class WishlistService {
     public boolean isWishlisted(Client client, Notice notice) {
         Optional<Wishlist> existingEntry = wishlistRepository.findByClientAndNotice(client, notice);
 
-        if (existingEntry.isPresent()) {
-            return false;
-        } else {
-            return true;
-        }
+        return existingEntry.isEmpty();
     }
 
     public boolean toggleWishlist(Client client, Notice notice) {