Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java (revision dc30259a457c1232ee6ee1f6096c9fa50172e058) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -3,14 +3,13 @@ import com.ukim.finki.develop.finkwave.model.dto.BasicSongDto; import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto; +import com.ukim.finki.develop.finkwave.model.dto.SongDetailsDto; import com.ukim.finki.develop.finkwave.repository.SongRepository; import com.ukim.finki.develop.finkwave.service.AuthService; import com.ukim.finki.develop.finkwave.service.SongService; import lombok.AllArgsConstructor; +import org.springframework.data.repository.query.Param; import org.springframework.http.HttpEntity; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -37,3 +36,8 @@ return ResponseEntity.ok(songService.getRecentlyListened()); } + + @GetMapping("/{songId}/details") + public HttpEntity getSongById(@PathVariable Long songId){ + return ResponseEntity.ok(songService.getSongDetails(songId)); + } } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistContributionSummaryDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistContributionSummaryDto.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistContributionSummaryDto.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -0,0 +1,12 @@ +package com.ukim.finki.develop.finkwave.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +// this dto is useful when we already have all the necessary info for the song and just need the contribution info +@Getter +@AllArgsConstructor +public class ArtistContributionSummaryDto { + private String artistName; + private String role; +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistDto.java (revision dc30259a457c1232ee6ee1f6096c9fa50172e058) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistDto.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -9,7 +9,4 @@ @Setter public class ArtistDto extends NonAdminUserDto { - - private List contributions; - } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDto.java (revision dc30259a457c1232ee6ee1f6096c9fa50172e058) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDto.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -4,4 +4,5 @@ import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @@ -9,4 +10,5 @@ @Getter @Setter +@NoArgsConstructor public class MusicalEntityDto { private Long id; 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 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ReviewDto.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -0,0 +1,14 @@ +package com.ukim.finki.develop.finkwave.model.dto; + +import com.ukim.finki.develop.finkwave.model.ReviewId; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class ReviewDto { + private ReviewId id; + private String author; + private Integer grade; + private String comment; +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDetailsDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDetailsDto.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDetailsDto.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -0,0 +1,34 @@ +package com.ukim.finki.develop.finkwave.model.dto; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +public class SongDetailsDto extends SongDto{ + private List contributions; + private List reviews; + + public SongDetailsDto(Long id, String title, String genre, String type, String releasedBy, String cover, Boolean isLikedByCurrentUser, String album, String link, List contributions, List reviews) { + super(id, title, genre, type, releasedBy, cover, isLikedByCurrentUser, album, link); + this.contributions = contributions; + this.reviews = reviews; + } + + public SongDetailsDto(Long id, String title, String genre, String type, String releasedBy, Boolean isLikedByCurrentUser, String link, List contributions, List reviews) { + super(id, title, genre, type, releasedBy, isLikedByCurrentUser, link); + this.contributions = contributions; + this.reviews = reviews; + } + + public SongDetailsDto(Long id, String title, String genre, String type, String releasedBy, String cover, Boolean isLikedByCurrentUser, String link, List contributions, List reviews) { + super(id, title, genre, type, releasedBy, cover, isLikedByCurrentUser, link); + this.contributions = contributions; + this.reviews = reviews; + } + +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDto.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDto.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -0,0 +1,30 @@ +package com.ukim.finki.develop.finkwave.model.dto; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class SongDto extends MusicalEntityDto{ + private String link; + + // todo: clean up constructors + + public SongDto(Long id, String title, String genre, String type, String releasedBy, String cover, Boolean isLikedByCurrentUser, String album, String link) { + super(id, title, genre, type, releasedBy, cover, isLikedByCurrentUser, album); + this.link = link; + } + + public SongDto(Long id, String title, String genre, String type, String releasedBy, Boolean isLikedByCurrentUser, String link) { + super(id, title, genre, type, releasedBy, isLikedByCurrentUser); + this.link = link; + } + + public SongDto(Long id, String title, String genre, String type, String releasedBy, String cover, Boolean isLikedByCurrentUser, String link) { + super(id, title, genre, type, releasedBy, cover, isLikedByCurrentUser); + this.link = link; + } + +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistContributionRepository.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistContributionRepository.java (revision dc30259a457c1232ee6ee1f6096c9fa50172e058) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistContributionRepository.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -2,4 +2,5 @@ import com.ukim.finki.develop.finkwave.model.dto.ArtistContributionDto; +import com.ukim.finki.develop.finkwave.model.dto.ArtistContributionSummaryDto; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -28,3 +29,13 @@ """) ListfindContributionsByArtistId(@Param("currentUserId")Long currentUserId,@Param("artistId")Long artistId); + + + @Query(""" + SELECT NEW com.ukim.finki.develop.finkwave.model.dto.ArtistContributionSummaryDto( + ac.artist.nonAdminUser.user.fullName, ac.role + ) + FROM ArtistContribution ac + WHERE ac.id.musicalEntityId = :songId + """) + List findContributionsBySongId(@Param("songId")Long songId); } 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 dc30259a457c1232ee6ee1f6096c9fa50172e058) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ReviewRepository.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -1,5 +1,8 @@ package com.ukim.finki.develop.finkwave.repository; +import com.ukim.finki.develop.finkwave.model.dto.ReviewDto; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @@ -7,5 +10,18 @@ import com.ukim.finki.develop.finkwave.model.ReviewId; +import java.util.List; + @Repository public interface ReviewRepository extends JpaRepository { + @Query(""" + SELECT NEW com.ukim.finki.develop.finkwave.model.dto.ReviewDto( + r.id, + r.listener.nonAdminUser.user.fullName, + r.grade, + r.comment + ) + FROM Review r + WHERE r.id.musicalEntityId = :songId + """) + List getReviewsForSongId(@Param("songId") Long songId); } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java (revision dc30259a457c1232ee6ee1f6096c9fa50172e058) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -3,7 +3,9 @@ import com.ukim.finki.develop.finkwave.model.dto.BasicSongDto; import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto; +import com.ukim.finki.develop.finkwave.model.dto.SongDto; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Repository; @@ -96,3 +98,30 @@ """, nativeQuery = true) List getRecentlyListened(@Param("userId")Long userId); + + @Query(value = """ + SELECT NEW com.ukim.finki.develop.finkwave.model.dto.SongDto( + s.id, + me.title, + me.genre, + 'SONG', + u.fullName, + me.cover, + (EXISTS ( + SELECT 1 FROM Like l + WHERE l.musicalEntity.id = s.id + AND l.listener.id = :userId + )), + albumMe.title, + s.link + ) + FROM Song s + JOIN s.musicalEntities me + JOIN me.releasedBy a + JOIN a.nonAdminUser nau + JOIN nau.user u + LEFT JOIN s.album album + LEFT JOIN album.musicalEntities albumMe + WHERE s.id = :songId + """) + SongDto getSongById(@Param("songId") Long songId, @Param("userId") Long userId); } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ArtistContributionService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ArtistContributionService.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ArtistContributionService.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -0,0 +1,18 @@ +package com.ukim.finki.develop.finkwave.service; + +import com.ukim.finki.develop.finkwave.model.dto.ArtistContributionSummaryDto; +import com.ukim.finki.develop.finkwave.repository.ArtistContributionRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class ArtistContributionService { + private final ArtistContributionRepository artistContributionRepository; + + public List getContributionsBySongId(Long songId){ + return artistContributionRepository.findContributionsBySongId(songId); + } +} 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 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ReviewService.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -0,0 +1,18 @@ +package com.ukim.finki.develop.finkwave.service; + +import com.ukim.finki.develop.finkwave.model.dto.ReviewDto; +import com.ukim.finki.develop.finkwave.repository.ReviewRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@AllArgsConstructor +public class ReviewService { + private final ReviewRepository reviewRepository; + + public List getReviewsForSongId(Long songId){ + return reviewRepository.getReviewsForSongId(songId); + } +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java (revision dc30259a457c1232ee6ee1f6096c9fa50172e058) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -1,7 +1,7 @@ package com.ukim.finki.develop.finkwave.service; -import com.ukim.finki.develop.finkwave.model.dto.BasicSongDto; -import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto; +import com.ukim.finki.develop.finkwave.model.dto.*; import com.ukim.finki.develop.finkwave.repository.SongRepository; +import com.ukim.finki.develop.finkwave.service.mappers.SongDetailsMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -14,4 +14,7 @@ private final SongRepository songRepository; private final AuthService authService; + private final ArtistContributionService artistContributionService; + private final ReviewService reviewService; + private final SongDetailsMapper songDetailsMapper; public List getTopSongs(){ @@ -32,3 +35,22 @@ return songRepository.getRecentlyListened(userId); } + + public MusicalEntityDto getSongById(Long songId){ + Long userId = null; + try { + userId = authService.getCurrentUserID(); + } catch (Exception ignored) {} + return songRepository.getSongById(songId, userId); + } + + public SongDetailsDto getSongDetails(Long songId){ + Long userId = null; + try { + userId = authService.getCurrentUserID(); + } catch (Exception ignored){} + SongDto songDto = songRepository.getSongById(songId, userId); + List contributionsBySongId = artistContributionService.getContributionsBySongId(songId); + List reviewsForSongId = reviewService.getReviewsForSongId(songId); + return songDetailsMapper.toSongDetailsDto(songDto, contributionsBySongId, reviewsForSongId); + } } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/mappers/SongDetailsMapper.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/mappers/SongDetailsMapper.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/mappers/SongDetailsMapper.java (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -0,0 +1,28 @@ +package com.ukim.finki.develop.finkwave.service.mappers; + +import com.ukim.finki.develop.finkwave.model.dto.*; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class SongDetailsMapper { + public SongDetailsDto toSongDetailsDto(SongDto songDto, + List artistContributionSummaryDtos, + List reviewDtos){ + SongDetailsDto songDetailsDto = new SongDetailsDto(); + songDetailsDto.setId(songDto.getId()); + songDetailsDto.setTitle(songDto.getTitle()); + songDetailsDto.setAlbum(songDto.getAlbum()); + songDetailsDto.setCover(songDto.getCover()); + songDetailsDto.setGenre(songDto.getGenre()); + songDetailsDto.setType(songDto.getType()); + songDetailsDto.setAlbum(songDto.getAlbum()); + songDetailsDto.setLink(songDto.getLink()); + songDetailsDto.setIsLikedByCurrentUser(songDto.getIsLikedByCurrentUser()); + songDetailsDto.setReleasedBy(songDto.getReleasedBy()); + songDetailsDto.setContributions(artistContributionSummaryDtos); + songDetailsDto.setReviews(reviewDtos); + return songDetailsDto; + } +} Index: frontend/src/App.tsx =================================================================== --- frontend/src/App.tsx (revision dc30259a457c1232ee6ee1f6096c9fa50172e058) +++ frontend/src/App.tsx (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -17,4 +17,5 @@ import Nav from "./pages/Nav"; import Register from "./pages/Register"; +import SongDetail from "./pages/SongDetail"; import UserDetail from "./pages/UserDetail"; @@ -99,4 +100,8 @@ }, { + path: "/songs/:id", + element: , + }, + { path: "/collection/:type/:id", element: , Index: frontend/src/pages/SongDetail.tsx =================================================================== --- frontend/src/pages/SongDetail.tsx (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) +++ frontend/src/pages/SongDetail.tsx (revision 8a47b30f7be0c80847e0bb6d30060d214d1bd85d) @@ -0,0 +1,394 @@ +import { useEffect, useState } from "react"; +import { Link, useParams } from "react-router-dom"; +import axiosInstance from "../api/axiosInstance"; +import { useAuth } from "../context/authContext"; +import type { SongDetail as SongDetailType } from "../utils/types"; + +const ROLE_LABELS: Record = { + MAIN_VOCAL: "Main Vocal", + FEATURED: "Featured", + PRODUCER: "Producer", + SONGWRITER: "Songwriter", + COMPOSER: "Composer", + MIXER: "Mixer", + ENGINEER: "Engineer", +}; + +const formatRole = (role: string): string => { + return ROLE_LABELS[role] || role.replace(/_/g, " "); +}; + +// convert a regular youtube URL to an embeddable URL +const toEmbedUrl = (url: string): string => { + try { + const parsed = new URL(url); + // youtube.com/watch?v=ID + if ( + (parsed.hostname === "www.youtube.com" || + parsed.hostname === "youtube.com") && + parsed.searchParams.has("v") + ) { + return `https://www.youtube.com/embed/${parsed.searchParams.get("v")}`; + } + // youtu.be/ID + if (parsed.hostname === "youtu.be") { + return `https://www.youtube.com/embed${parsed.pathname}`; + } + // already an embed URL or other provider – return as-is + return url; + } catch { + return url; + } +}; + +const renderStars = (grade: number) => { + return ( +
+ {[1, 2, 3, 4, 5].map((star) => ( + + + + ))} +
+ ); +}; + +const SongDetail = () => { + const { id } = useParams<{ id: string }>(); + const { user } = useAuth(); + const [song, setSong] = useState(null); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + + useEffect(() => { + const fetchSong = async () => { + try { + setLoading(true); + const response = await axiosInstance.get(`/songs/${id}/details`); + setSong(response.data); + } catch (err) { + console.error("Error fetching song details:", err); + setError("Failed to load song details."); + } finally { + setLoading(false); + } + }; + if (id) fetchSong(); + }, [id]); + + const toggleLike = async () => { + if (!song) return; + try { + await axiosInstance.post(`/musical-entity/${song.id}/like`); + setSong((prev) => + prev + ? { ...prev, isLikedByCurrentUser: !prev.isLikedByCurrentUser } + : prev, + ); + } catch (err) { + console.error("Error toggling like:", err); + } + }; + + if (loading) { + return ( +
+
+
+

Loading song…

+
+
+ ); + } + + if (error || !song) { + return ( +
+
+

+ {error ?? "Song not found"} +

+ + ← Back to Home + +
+
+ ); + } + + const otherContributors = song.contributions.filter( + (c) => c.artistName !== song.releasedBy, + ); + + const avgRating = + song.reviews.length > 0 + ? ( + song.reviews.reduce((sum, r) => sum + r.grade, 0) / + song.reviews.length + ).toFixed(1) + : null; + + return ( +
+
+ {/* Back link */} + + + + + Back to Home + + + {/* Hero section */} +
+ {/* Cover art */} +
+
+ {song.title} { + (e.target as HTMLImageElement).src = "/favicon.png"; + }} + /> +
+
+ + {/* Song info */} +
+ + {song.genre} • Song + +

+ {song.title} +

+ + {/* Main artist */} +

+ {song.releasedBy} +

+ + {/* Album */} + {song.album && ( +

+ Album: {song.album} +

+ )} + + {/* Rating summary */} + {avgRating && ( +
+ {renderStars(Math.round(Number(avgRating)))} + + {avgRating} · {song.reviews.length}{" "} + {song.reviews.length === 1 ? "review" : "reviews"} + +
+ )} + + {/* Action buttons */} + {/* todo: add add to playlist button */} +
+ {user && ( + + )} +
+
+
+ + {/* YouTube embed */} + {song.link && ( +
+
+