boost controller endpoint little fix

+ get rid of not used dependencies
add boostNotice function
2025-05-16 13:42:24 +02:00 · 2025-05-15 20:29:37 +02:00 · 2025-05-14 08:35:33 +02:00 · 2025-05-13 20:54:44 +02:00 · 2025-05-13 20:54:39 +02:00
8 changed files with 71 additions and 69 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
    </parent>
    <groupId>_11.asktpk</groupId>
    <artifactId>ArtisanConnectBackend</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0</version>
    <name>ArtisanConnectBackend</name>
    <description>ArtisanConnectBackend</description>
    <url/>
@@ -34,31 +34,16 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-rest</artifactId>
-        </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-oauth2-client</artifactId>-->
-<!--        </dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
-
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-devtools</artifactId>
            <scope>runtime</scope>
            <optional>true</optional>
        </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-docker-compose</artifactId>-->
-<!--            <scope>runtime</scope>-->
-<!--            <optional>true</optional>-->
-<!--        </dependency>-->
        <dependency>
            <groupId>org.postgresql</groupId>
            <artifactId>postgresql</artifactId>
@@ -73,15 +58,10 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
-        <!--        <dependency>-->
-<!--            <groupId>org.springframework.security</groupId>-->
-<!--            <artifactId>spring-security-test</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
        <dependency>
            <groupId>com.squareup.okhttp3</groupId>
            <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
+            <version>4.12.0</version>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
@@ -93,11 +73,6 @@
            <artifactId>jakarta.validation-api</artifactId>
            <version>3.1.0</version>
        </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springdoc</groupId>-->
-<!--            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>-->
-<!--            <version>2.8.5</version>-->
-<!--        </dependency>-->
    </dependencies>

    <build>
--- a/src/main/java/_11/asktpk/artisanconnectbackend/controller/NoticeController.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/controller/NoticeController.java
@@ -1,6 +1,8 @@
 package _11.asktpk.artisanconnectbackend.controller;

 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.dto.NoticeDTO;
@@ -29,7 +31,7 @@ public class NoticeController {
    }

    @GetMapping("/get/{id}")
-    public ResponseEntity getNoticeById(@PathVariable long id) {
+    public ResponseEntity<?> getNoticeById(@PathVariable long id) {
        if (noticeService.noticeExists(id)) {
            return ResponseEntity.ok(noticeService.getNoticeById(id));
        } else {
@@ -48,7 +50,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 +57,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) {
@@ -100,12 +100,22 @@ public class NoticeController {
    }

    @DeleteMapping("/delete/{id}")
-    public ResponseEntity deleteNotice(@PathVariable("id") long id) {
+    public ResponseEntity<RequestResponseDTO> deleteNotice(@PathVariable("id") long id) {
        if (noticeService.noticeExists(id)) {
            noticeService.deleteNotice(id);
-            return new ResponseEntity<>(HttpStatus.OK);
+            return ResponseEntity.status(HttpStatus.OK).body(new RequestResponseDTO("Pomyślnie usunięto ogłoszenie o ID: " + id));
        } else {
-            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new RequestResponseDTO("Nie znaleziono ogłoszenia o ID: " + id));
        }
    }
+
+    @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());
+
+        return ResponseEntity.status(HttpStatus.OK).body(new RequestResponseDTO("Ogłoszenie zostało pomyślnie wypromowane."));
+    }
 }
--- 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;
@@ -15,7 +14,6 @@ import java.util.List;
@RestController
@RequestMapping("/api/v1/wishlist")
 public class WishlistController {
-
    private final WishlistService wishlistService;
    private final ClientService clientService;
    private final NoticeService noticeService;
@@ -30,7 +28,6 @@ public class WishlistController {
    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"));
@@ -47,21 +44,16 @@ public class WishlistController {
        }
    }

-
-
-    @GetMapping("/{clientId}")
-    public  ResponseEntity<List<WishlistDTO>>  getWishlist(@PathVariable Long clientId) {
-        List<WishlistDTO> wishlist = wishlistService.getWishlistForClientId(clientId);
-        return ResponseEntity.ok(wishlist);
-    }
-//
-//    @GetMapping("/get/all")
-//    public List<NoticeDTO> getAllNotices() {
-//        return noticeService.getAllNotices();
+//    @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() {
-    Long clientId =1L;
-    return wishlistService.getNoticesInWishlist(clientId);
-}
+
+    @GetMapping("/")
+    public List<NoticeDTO> getWishlistForClient() {
+        // TODO: Replace with actual client ID from authentication context
+        Long clientId = 1L;
+        return wishlistService.getNoticesInWishlist(clientId);
+    }
 }
--- a/src/main/java/_11/asktpk/artisanconnectbackend/dto/NoticeBoostDTO.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/dto/NoticeBoostDTO.java
@@ -0,0 +1,9 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class NoticeBoostDTO {
+    private Long noticeId;
+}
--- a/src/main/java/_11/asktpk/artisanconnectbackend/repository/NoticeRepository.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/repository/NoticeRepository.java
@@ -5,4 +5,7 @@ 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);
+
 }
--- 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);
 }
--- a/src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java
@@ -5,10 +5,11 @@ 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.repository.WishlistRepository;
+//import _11.asktpk.artisanconnectbackend.service.WishlistService;
 import jakarta.persistence.EntityNotFoundException;
 import org.springframework.stereotype.Service;

+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -18,12 +19,12 @@ 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,WishlistRepository wishlistRepository) {
+    public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository, WishlistService wishlistService) {
        this.noticeRepository = noticeRepository;
        this.clientRepository = clientRepository;
-        this.wishlistRepository = wishlistRepository;//serwis zamiast repository
+        this.wishlistService = wishlistService;
    }

    public Notice fromDTO(NoticeDTO dto) {
@@ -45,11 +46,12 @@ 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 = wishlistRepository.existsByClientAndNotice(c,notice);
+            isWishlisted = wishlistService.isWishlisted(c, notice);
        }
        dto.setNoticeId(notice.getIdNotice());
        dto.setTitle(notice.getTitle());
@@ -77,10 +79,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) {
@@ -118,4 +120,20 @@ public class NoticeService {
            throw new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id);
        }
    }
+
+    public boolean isNoticeOwnedByClient(long noticeId, long clientId) {
+        return noticeRepository.existsByIdNoticeAndClientId(noticeId, clientId);
+    }
+
+    public void boostNotice(long noticeId) {
+        Notice notice = noticeRepository.findById(noticeId)
+                .orElseThrow(() -> new EntityNotFoundException("Ogłoszenie o ID " + noticeId + " nie istnieje."));
+
+        notice.setPublishDate(LocalDateTime.now());
+
+        noticeRepository.save(notice);
+
+    }
+
+
 }
--- a/src/main/java/_11/asktpk/artisanconnectbackend/service/WishlistService.java
+++ b/src/main/java/_11/asktpk/artisanconnectbackend/service/WishlistService.java
@@ -2,25 +2,26 @@ 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;
 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, NoticeService noticeService) {
+    public WishlistService(WishlistRepository wishlistRepository, @Lazy NoticeService noticeService) {
        this.wishlistRepository = wishlistRepository;
-        this.noticeService = noticeService;//tak robimy
+        this.noticeService = noticeService;
    }

    public List<WishlistDTO> getWishlistForClientId(Long clientId) {
@@ -33,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) {
Author	SHA1	Message	Date
Andrii Solianyk	d869a18901	boost controller endpoint little fix + get rid of not used dependencies	2025-05-16 13:42:24 +02:00
Patryk	1d55f40753	add boostNotice function	2025-05-15 20:29:37 +02:00
Andrii Solianyk	3d205df038	few cosmetic fixes	2025-05-14 08:35:33 +02:00
Patryk	5ccfc6ba2c	change repository to service in wishlist, add @Lazy	2025-05-13 20:54:44 +02:00
Patryk	f0e3a129d0	change repository to service in wishlist, add @Lazy	2025-05-13 20:54:39 +02:00