few cosmetic fixes

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

@@ -48,7 +48,6 @@ public class NoticeController {
         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);
@@ -56,7 +55,6 @@ public class NoticeController {
         return ResponseEntity.status(HttpStatus.CREATED).body(new NoticeAdditionDTO(newNoticeId ,"Dodano ogłoszenie."));
     }
 
-
     // 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) {

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

@@ -0,0 +1,59 @@
+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.service.ClientService;
+import _11.asktpk.artisanconnectbackend.service.NoticeService;
+import _11.asktpk.artisanconnectbackend.service.WishlistService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1/wishlist")
+public class WishlistController {
+    private final WishlistService wishlistService;
+    private final ClientService clientService;
+    private final NoticeService noticeService;
+
+    public WishlistController(WishlistService wishlistService, ClientService clientService, NoticeService noticeService) {
+        this.wishlistService = wishlistService;
+        this.clientService = clientService;
+        this.noticeService = noticeService;
+    }
+
+    @PostMapping("/toggle")
+    public ResponseEntity<RequestResponseDTO> toggleWishlist(@RequestBody WishlistDTO wishlistDTO) {
+        Long noticeId = wishlistDTO.getNoticeId();
+        Long clientId = wishlistDTO.getClientId();
+        NoticeDTO noticeDTO = noticeService.getNoticeById(noticeId);
+        if (noticeDTO == null) {
+            return ResponseEntity.badRequest().body(new RequestResponseDTO("Notice not found"));
+        }
+        boolean added = wishlistService.toggleWishlist(
+                clientService.getClientById(clientId),
+                noticeService.getNoticeByIdEntity(noticeId)
+        );
+
+        if (added) {
+            return ResponseEntity.ok(new RequestResponseDTO("Wishlist entry added"));
+        } else {
+            return ResponseEntity.ok(new RequestResponseDTO("Wishlist entry removed"));
+        }
+    }
+
+//    @GetMapping("/{clientId}")
+//    public  ResponseEntity<List<WishlistDTO>>  getWishlist(@PathVariable Long clientId) {
+//        List<WishlistDTO> wishlist = wishlistService.getWishlistForClientId(clientId);
+//        return ResponseEntity.ok(wishlist);
+//    }
+
+    @GetMapping("/")
+    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/dto/NoticeDTO.java

@@ -28,6 +28,8 @@ public class NoticeDTO {
 
     private List<AttributesNotice> attributesNotices;
 
+    private boolean isWishlisted;
+
     public NoticeDTO() {
 
     }

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

@@ -0,0 +1,12 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class WishlistDTO {
+    private Long id;
+    private Long clientId;
+    private Long noticeId;
+}

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

@@ -0,0 +1,24 @@
+package _11.asktpk.artisanconnectbackend.entities;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "wishlist")
+@Getter
+@Setter
+public class Wishlist {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "client_id", nullable = false)
+    private Client client;
+
+    @ManyToOne
+    @JoinColumn(name = "notice_id", nullable = false)
+    private Notice notice;
+}

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

@@ -0,0 +1,16 @@
+package _11.asktpk.artisanconnectbackend.repository;
+
+import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.entities.Notice;
+import _11.asktpk.artisanconnectbackend.entities.Wishlist;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface WishlistRepository extends JpaRepository<Wishlist, Long> {
+
+    List<Wishlist> findAllByClientId(Long clientId);
+
+    Optional<Wishlist> findByClientAndNotice(Client client, Notice notice);
+}

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

@@ -5,24 +5,28 @@ 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 _11.asktpk.artisanconnectbackend.service.WishlistService;
 import jakarta.persistence.EntityNotFoundException;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class NoticeService {
 
     private final NoticeRepository noticeRepository;
     private final ClientRepository clientRepository;
+    private final WishlistService wishlistService;
 
-    public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository) {
+    public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository, WishlistService wishlistService) {
         this.noticeRepository = noticeRepository;
         this.clientRepository = clientRepository;
+        this.wishlistService = wishlistService;
     }
 
-    private Notice fromDTO(NoticeDTO dto) {
+    public Notice fromDTO(NoticeDTO dto) {
         Notice notice = new Notice();
         notice.setTitle(dto.getTitle());
         notice.setDescription(dto.getDescription());
@@ -41,6 +45,13 @@ public class NoticeService {
 
     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());
@@ -50,7 +61,7 @@ public class NoticeService {
         dto.setStatus(notice.getStatus());
         dto.setPublishDate(notice.getPublishDate());
         dto.setAttributesNotices(notice.getAttributesNotices());
-
+        dto.setWishlisted(isWishlisted);
         return dto;
     }
 
@@ -68,6 +79,11 @@ public class NoticeService {
         return toDTO(notice);
     }
 
+    public Notice getNoticeByIdEntity(Long id) {
+        return noticeRepository.findById(id)
+                .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
+    }
+
     public Long addNotice(NoticeDTO dto) {
         return noticeRepository.save(fromDTO(dto)).getIdNotice();
     }

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

@@ -0,0 +1,72 @@
+package _11.asktpk.artisanconnectbackend.service;
+
+import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
+import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
+import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.entities.Notice;
+import _11.asktpk.artisanconnectbackend.entities.Wishlist;
+import _11.asktpk.artisanconnectbackend.repository.WishlistRepository;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Service
+public class WishlistService {
+
+    private final WishlistRepository wishlistRepository;
+    private final NoticeService noticeService;
+
+    public WishlistService(WishlistRepository wishlistRepository, @Lazy NoticeService noticeService) {
+        this.wishlistRepository = wishlistRepository;
+        this.noticeService = noticeService;
+    }
+
+    public List<WishlistDTO> getWishlistForClientId(Long clientId) {
+        List<Wishlist> wishlistEntities = wishlistRepository.findAllByClientId(clientId);
+        return wishlistEntities.stream()
+                .map(this::toDTO)
+                .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);
+
+        if (existingEntry.isPresent()) {
+            wishlistRepository.delete(existingEntry.get());
+            return false;
+        } else {
+            Wishlist wishlist = new Wishlist();
+            wishlist.setClient(client);
+            wishlist.setNotice(notice);
+            wishlistRepository.save(wishlist);
+            return true;
+        }
+    }
+
+    private WishlistDTO toDTO(Wishlist wishlist) {
+        WishlistDTO dto = new WishlistDTO();
+        dto.setId(wishlist.getId());
+        dto.setClientId(wishlist.getClient().getId());
+        dto.setNoticeId(wishlist.getNotice().getIdNotice());
+
+        return dto;
+    }
+
+    public List<NoticeDTO> getNoticesInWishlist(Long clientId) {
+        List<Wishlist> wishlistEntries = wishlistRepository.findAllByClientId(clientId);
+
+        return wishlistEntries.stream()
+                .map(wishlist -> noticeService.getNoticeById(wishlist.getNotice().getIdNotice()))
+                .collect(Collectors.toList());
+
+    }
+}