Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/ReviewController.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/ReviewController.java (revision 7621d7b2606460a77489dea20e584443f4fbdf4c) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/ReviewController.java (revision 7621d7b2606460a77489dea20e584443f4fbdf4c) @@ -0,0 +1,31 @@ +package com.ukim.finki.develop.finkwave.controller; + +import com.ukim.finki.develop.finkwave.model.dto.ReviewPostDto; +import com.ukim.finki.develop.finkwave.service.ReviewService; +import lombok.AllArgsConstructor; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequestMapping("/reviews") +@AllArgsConstructor +public class ReviewController { + private final ReviewService reviewService; + + @PostMapping("/{songId}") + public HttpEntity> postReview(@PathVariable Long songId, + @RequestBody ReviewPostDto reviewPostDto){ + reviewService.createReview(songId, reviewPostDto); + return ResponseEntity.status(HttpStatus.CREATED).build(); + } + + @DeleteMapping("/{songId}") + public HttpEntity deleteReview(@PathVariable Long songId){ + reviewService.deleteReview(songId); + return ResponseEntity.noContent().build(); + } +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ReviewDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ReviewDto.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ReviewDto.java (revision 7621d7b2606460a77489dea20e584443f4fbdf4c) @@ -10,4 +10,5 @@ private ReviewId id; private String author; + private String authorUsername; private Integer grade; private String comment; Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ReviewPostDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ReviewPostDto.java (revision 7621d7b2606460a77489dea20e584443f4fbdf4c) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ReviewPostDto.java (revision 7621d7b2606460a77489dea20e584443f4fbdf4c) @@ -0,0 +1,11 @@ +package com.ukim.finki.develop.finkwave.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class ReviewPostDto { + private int grade; + private String comment; +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ReviewRepository.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ReviewRepository.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ReviewRepository.java (revision 7621d7b2606460a77489dea20e584443f4fbdf4c) @@ -18,4 +18,5 @@ r.id, r.listener.nonAdminUser.user.fullName, + r.listener.nonAdminUser.user.username, r.grade, r.comment @@ -25,3 +26,5 @@ """) List getReviewsForSongId(@Param("songId") Long songId); + + Review getReviewById_ListenerIdAndId_MusicalEntityId(Long listenerId, Long musicalEntityId); } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ReviewService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ReviewService.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ReviewService.java (revision 7621d7b2606460a77489dea20e584443f4fbdf4c) @@ -1,5 +1,13 @@ package com.ukim.finki.develop.finkwave.service; +import com.ukim.finki.develop.finkwave.exceptions.UserNotFoundException; +import com.ukim.finki.develop.finkwave.model.Listener; +import com.ukim.finki.develop.finkwave.model.MusicalEntity; +import com.ukim.finki.develop.finkwave.model.Review; +import com.ukim.finki.develop.finkwave.model.ReviewId; import com.ukim.finki.develop.finkwave.model.dto.ReviewDto; +import com.ukim.finki.develop.finkwave.model.dto.ReviewPostDto; +import com.ukim.finki.develop.finkwave.repository.ListenerRepository; +import com.ukim.finki.develop.finkwave.repository.MusicalEntityRepository; import com.ukim.finki.develop.finkwave.repository.ReviewRepository; import lombok.AllArgsConstructor; @@ -12,7 +20,40 @@ public class ReviewService { private final ReviewRepository reviewRepository; + private final AuthService authService; + private final ListenerRepository listenerRepository; + private final MusicalEntityRepository musicalEntityRepository; public List getReviewsForSongId(Long songId){ return reviewRepository.getReviewsForSongId(songId); } + + public void createReview(Long songId, ReviewPostDto reviewPostDto){ + Long userId = authService.getCurrentUserID(); + + // todo: custom exceptions + Listener listener = listenerRepository.findById(userId) + .orElseThrow(UserNotFoundException::new); + + MusicalEntity musicalEntity = musicalEntityRepository + .findById(songId) + .orElseThrow(); + + // show proper error for doubled reviews from user + + Review review = new Review(); + review.setId(new ReviewId()); + review.setListener(listener); + review.setMusicalEntity(musicalEntity); + review.setComment(reviewPostDto.getComment()); + review.setGrade(reviewPostDto.getGrade()); + + reviewRepository.save(review); + } + + public void deleteReview(Long songId){ + Long userId = authService.getCurrentUserID(); + Review review = reviewRepository.getReviewById_ListenerIdAndId_MusicalEntityId(userId, songId); + + reviewRepository.delete(review); + } } Index: frontend/src/pages/SongDetail.tsx =================================================================== --- frontend/src/pages/SongDetail.tsx (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) +++ frontend/src/pages/SongDetail.tsx (revision 7621d7b2606460a77489dea20e584443f4fbdf4c) @@ -67,5 +67,9 @@ const [loading, setLoading] = useState(true); const [error, setError] = useState(null); - + const [showReviewModal, setShowReviewModal] = useState(false); + const [reviewRating, setReviewRating] = useState(0); + const [reviewComment, setReviewComment] = useState(""); + const [hoverRating, setHoverRating] = useState(0); + console.log(user); useEffect(() => { const fetchSong = async () => { @@ -84,4 +88,38 @@ if (id) fetchSong(); }, [id]); + + const handleSubmitReview = async () => { + if (reviewRating === 0) { + // todo: replace with toast + alert("Please select a rating"); + return; + } + try { + await axiosInstance.post(`reviews/${song?.id}`, { + grade: reviewRating, + comment: reviewComment, + }); + const response = await axiosInstance.get(`/songs/${id}/details`); + setSong(response.data); + } catch (err) { + // todo: replace with toast + console.error("Error submitting review:", err); + } finally { + setShowReviewModal(false); + setReviewRating(0); + setReviewComment(""); + setHoverRating(0); + } + }; + + const deleteReview = async () => { + try { + await axiosInstance.delete(`reviews/${song?.id}`); + const response = await axiosInstance.get(`/songs/${id}/details`); + setSong(response.data); + } catch (err) { + console.error("Error deleting review:", err); + } + }; const toggleLike = async () => { @@ -294,50 +332,4 @@ - {/* Play button — plays in persistent mini-player */} - {song.link && ( -
- {currentSong?.id === song.id ? ( -
-
- - - -
-

- Now playing in mini-player below -

-
- ) : ( - - )} -
- )} - {/* Credits / Contributions */} {song.contributions.length > 0 && ( @@ -402,7 +394,5 @@ + )}

@@ -462,4 +473,104 @@ + + {/* Review Modal */} + {showReviewModal && ( +

+
+
+

Add Review

+ +
+ + {/* Star Rating */} +
+ +
+ {[1, 2, 3, 4, 5].map((star) => ( + + ))} +
+
+ + {/* Comment */} +
+ +