hamx/ArtisanConnectBackend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

few cosmetic fixes

Browse Source
This commit is contained in:
Andrii Solianyk
2025-05-14 08:35:33 +02:00
parent 5ccfc6ba2c
commit 3d205df038
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/_11/asktpk/artisanconnectbackend/controller/WishlistController.java
View File

@@ -3,7 +3,6 @@ package _11.asktpk.artisanconnectbackend.controller;
import _11.asktpk.artisanconnectbackend.dto.NoticeDTO; import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
import _11.asktpk.artisanconnectbackend.dto.RequestResponseDTO; import _11.asktpk.artisanconnectbackend.dto.RequestResponseDTO;
import _11.asktpk.artisanconnectbackend.dto.WishlistDTO; import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
import _11.asktpk.artisanconnectbackend.entities.Wishlist;
import _11.asktpk.artisanconnectbackend.service.ClientService; import _11.asktpk.artisanconnectbackend.service.ClientService;
import _11.asktpk.artisanconnectbackend.service.NoticeService; import _11.asktpk.artisanconnectbackend.service.NoticeService;
import _11.asktpk.artisanconnectbackend.service.WishlistService; import _11.asktpk.artisanconnectbackend.service.WishlistService;
@@ -53,7 +52,8 @@ public class WishlistController {
@GetMapping("/") @GetMapping("/")
public List<NoticeDTO> getWishlistForClient() { public List<NoticeDTO> getWishlistForClient() {
Long clientId =1L; // TODO: Replace with actual client ID from authentication context
Long clientId = 1L;
return wishlistService.getNoticesInWishlist(clientId); return wishlistService.getNoticesInWishlist(clientId);
} }
} }

2
src/main/java/_11/asktpk/artisanconnectbackend/repository/WishlistRepository.java
View File

@@ -13,6 +13,4 @@ public interface WishlistRepository extends JpaRepository<Wishlist, Long> {
List<Wishlist> findAllByClientId(Long clientId); List<Wishlist> findAllByClientId(Long clientId);
Optional<Wishlist> findByClientAndNotice(Client client, Notice notice); Optional<Wishlist> findByClientAndNotice(Client client, Notice notice);
Boolean existsByClientAndNotice(Client client, Notice notice);
} }

12
src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java
View File

@@ -18,10 +18,9 @@ public class NoticeService {
private final NoticeRepository noticeRepository; private final NoticeRepository noticeRepository;
private final ClientRepository clientRepository; private final ClientRepository clientRepository;
// private final WishlistRepository wishlistRepository;
private final WishlistService wishlistService; private final WishlistService wishlistService;
public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository,WishlistService wishlistService) { public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository, WishlistService wishlistService) {
this.noticeRepository = noticeRepository; this.noticeRepository = noticeRepository;
this.clientRepository = clientRepository; this.clientRepository = clientRepository;
this.wishlistService = wishlistService; this.wishlistService = wishlistService;
@@ -46,11 +45,12 @@ public class NoticeService {
private NoticeDTO toDTO(Notice notice) { private NoticeDTO toDTO(Notice notice) {
NoticeDTO dto = new NoticeDTO(); 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; boolean isWishlisted = false;
if (client.isPresent()) { if (client.isPresent()) {
Client c = client.get(); Client c = client.get();
isWishlisted = wishlistService.isWishlisted(c, notice); isWishlisted = wishlistService.isWishlisted(c, notice);
} }
dto.setNoticeId(notice.getIdNotice()); dto.setNoticeId(notice.getIdNotice());
dto.setTitle(notice.getTitle()); dto.setTitle(notice.getTitle());
@@ -78,10 +78,10 @@ public class NoticeService {
.orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id)); .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
return toDTO(notice); return toDTO(notice);
} }
public Notice getNoticeByIdEntity(Long id) { public Notice getNoticeByIdEntity(Long id) {
Notice notice = noticeRepository.findById(id) return noticeRepository.findById(id)
.orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id)); .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
return notice;
} }
public Long addNotice(NoticeDTO dto) { public Long addNotice(NoticeDTO dto) {

7
src/main/java/_11/asktpk/artisanconnectbackend/service/WishlistService.java
View File

@@ -2,7 +2,6 @@ package _11.asktpk.artisanconnectbackend.service;
import _11.asktpk.artisanconnectbackend.dto.WishlistDTO; import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
import _11.asktpk.artisanconnectbackend.dto.NoticeDTO; import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
import _11.asktpk.artisanconnectbackend.service.NoticeService;
import _11.asktpk.artisanconnectbackend.entities.Client; import _11.asktpk.artisanconnectbackend.entities.Client;
import _11.asktpk.artisanconnectbackend.entities.Notice; import _11.asktpk.artisanconnectbackend.entities.Notice;
import _11.asktpk.artisanconnectbackend.entities.Wishlist; import _11.asktpk.artisanconnectbackend.entities.Wishlist;
@@ -35,11 +34,7 @@ public class WishlistService {
public boolean isWishlisted(Client client, Notice notice) { public boolean isWishlisted(Client client, Notice notice) {
Optional<Wishlist> existingEntry = wishlistRepository.findByClientAndNotice(client, notice); Optional<Wishlist> existingEntry = wishlistRepository.findByClientAndNotice(client, notice);
if (existingEntry.isPresent()) { return existingEntry.isEmpty();
return false;
} else {
return true;
}
} }
public boolean toggleWishlist(Client client, Notice notice) { public boolean toggleWishlist(Client client, Notice notice) {