Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/PlaylistController.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/PlaylistController.java (revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/PlaylistController.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -1,4 +1,5 @@ package com.ukim.finki.develop.finkwave.controller; +import com.ukim.finki.develop.finkwave.model.dto.BasicPlaylistDto; import com.ukim.finki.develop.finkwave.model.dto.PlaylistDto; import com.ukim.finki.develop.finkwave.service.PlaylistService; @@ -11,4 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import java.util.List; @RestController @@ -23,3 +26,8 @@ } + @GetMapping("/user") + public HttpEntity> getUserBasicPlaylists(){ + return ResponseEntity.ok(playlistService.getBasicPlaylists()); + } + } 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 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -1,4 +1,5 @@ package com.ukim.finki.develop.finkwave.controller; +import com.ukim.finki.develop.finkwave.model.dto.BasicSongDto; import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto; import com.ukim.finki.develop.finkwave.repository.SongRepository; @@ -23,5 +24,5 @@ @GetMapping("/top") - private HttpEntity> getSongs(){ + public HttpEntity> getSongs(){ Long userId = authService.getCurrentUserID(); return ResponseEntity.ok(songService.getTopSongs(userId)); @@ -29,7 +30,12 @@ @GetMapping("/search") - private HttpEntity> searchSongs( + public HttpEntity> searchSongs( @RequestParam(name = "q") String searchTerm){ return ResponseEntity.ok(songService.searchSongs(null, searchTerm)); } + + @GetMapping("/recent") + public HttpEntity> getRecentlyListenedSongs(){ + return ResponseEntity.ok(songService.getRecentlyListened()); + } } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Listen.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Listen.java (revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Listen.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -2,5 +2,4 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import jakarta.persistence.*; import lombok.Getter; @@ -8,6 +7,4 @@ import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; - -import java.time.LocalDateTime; @Getter Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/BasicPlaylistDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/BasicPlaylistDto.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/BasicPlaylistDto.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -0,0 +1,8 @@ +package com.ukim.finki.develop.finkwave.model.dto; + + +public record BasicPlaylistDto( + Long id, + String name, + String cover, + Long songCount){} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/BasicSongDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/BasicSongDto.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/BasicSongDto.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -0,0 +1,10 @@ +package com.ukim.finki.develop.finkwave.model.dto; + +import jakarta.annotation.Nullable; + +public record BasicSongDto ( + Long id, + String title, + String artist, + @Nullable String cover +){} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/PlaylistRepository.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/PlaylistRepository.java (revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/PlaylistRepository.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -1,4 +1,5 @@ package com.ukim.finki.develop.finkwave.repository; +import com.ukim.finki.develop.finkwave.model.dto.BasicPlaylistDto; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -23,7 +24,12 @@ List findByCreatorId(@Param("creatorId") Long creatorId); - - - - + @SuppressWarnings("JpaQlInspection") // count returns long, intellij expects int + @Query(""" + SELECT NEW com.ukim.finki.develop.finkwave.model.dto.BasicPlaylistDto( + p.id, p.name, p.cover, (SELECT COUNT(*) FROM PlaylistSong ps where ps.playlist.id = p.id) + ) + FROM Playlist p + WHERE p.createdBy.id = :userId + """) + List getPlaylistsByIdIs(@Param("userId") Long userId); } 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 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -1,4 +1,5 @@ package com.ukim.finki.develop.finkwave.repository; +import com.ukim.finki.develop.finkwave.model.dto.BasicSongDto; import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto; import org.springframework.data.jpa.repository.JpaRepository; @@ -48,5 +49,7 @@ @Query(""" SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto( - s.id, me.title, me.genre, 'SONG', u.fullName, me.cover, FALSE) + 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 = :currentUserId)) + ) FROM Song s JOIN s.musicalEntities me @@ -58,8 +61,6 @@ ORDER BY count(*) desc """) - // todo: handle likes, momentalno site se false za da raboti joinot // todo: add paging List findTopByListens(@Param("currentUserId")Long currentUserId); - // todo: fix is liked by user, currently returns hard coded false @@ -72,7 +73,22 @@ JOIN a.nonAdminUser nau JOIN nau.user u - WHERE me.title ILIKE %:searchTerm% + WHERE me.title ILIKE '%' || :searchTerm || '%' """) List searchSongs(@Param("currentUserId")Long currentUserId, @Param("searchTerm") String searchTerm); + + @Query(value = """ + SELECT DISTINCT on (l.song_id) + l.song_id, + me.title, + u.full_name, + me.cover + FROM LISTENS l + JOIN MUSICAL_ENTITIES me on me.id = l.song_id + JOIN USERS u on u.user_id = l.listener_id + WHERE u.user_id = :userId + ORDER BY l.song_id, l.timestamp DESC + LIMIT 5 + """, nativeQuery = true) + List getRecentlyListened(@Param("userId")Long userId); } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ListenerService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ListenerService.java (revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ListenerService.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -29,4 +29,5 @@ } + public ListgetPlaylistsSavedByUser(Long listenerId){ return playlistService.findSavedByUser(listenerId); Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/PlaylistService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/PlaylistService.java (revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/PlaylistService.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -3,4 +3,5 @@ import com.ukim.finki.develop.finkwave.exceptions.PlaylistNotFoundException; import com.ukim.finki.develop.finkwave.model.Playlist; +import com.ukim.finki.develop.finkwave.model.dto.BasicPlaylistDto; import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto; import com.ukim.finki.develop.finkwave.model.dto.PlaylistDto; @@ -50,4 +51,8 @@ } + public List getBasicPlaylists(){ + Long userId = authService.getCurrentUserID(); + return playlistRepository.getPlaylistsByIdIs(userId); + } 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 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -1,4 +1,5 @@ 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.repository.SongRepository; @@ -12,4 +13,5 @@ public class SongService { private final SongRepository songRepository; + private final AuthService authService; public List getTopSongs(Long userId){ @@ -20,3 +22,8 @@ return songRepository.searchSongs(userId, searchTerm); } + + public List getRecentlyListened(){ + Long userId = authService.getCurrentUserID(); + return songRepository.getRecentlyListened(userId); + } } Index: frontend/src/components/Sidebar.tsx =================================================================== --- frontend/src/components/Sidebar.tsx (revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ frontend/src/components/Sidebar.tsx (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -1,25 +1,30 @@ -interface SidebarProps { - isOpen: boolean; - onClose: () => void; -} +import { useEffect, useState } from "react"; +import axiosInstance from "../api/axiosInstance"; +import type { BasicPlaylist, BasicSong, SidebarProps } from "../utils/types"; const Sidebar = ({ isOpen, onClose }: SidebarProps) => { - // mock data for recently listened songs - const recentlyListened = [ - { id: 1, title: "Song One", artist: "Artist A", cover: "/favicon.png" }, - { id: 2, title: "Song Two", artist: "Artist B", cover: "/favicon.png" }, - { id: 3, title: "Song Three", artist: "Artist C", cover: "/favicon.png" }, - { id: 4, title: "Song Four", artist: "Artist D", cover: "/favicon.png" }, - { id: 5, title: "Song Five", artist: "Artist E", cover: "/favicon.png" }, - ]; + const [recentlyListened, setRecentlyListened] = useState([]); + const [playlists, setPlaylists] = useState([]); - // mock data for my playlists - const playlists = [ - { id: 1, name: "My Favorites", songCount: 25 }, - { id: 2, name: "Workout Mix", songCount: 18 }, - { id: 3, name: "Chill Vibes", songCount: 32 }, - { id: 4, name: "Party Hits", songCount: 45 }, - ]; - + useEffect(() => { + const fetchData = async () => { + try { + const data = await axiosInstance.get("/songs/recent"); + setRecentlyListened(data.data); + } catch (error) { + console.error("Error fetching recently listened songs:", error); + // todo: show toast + } + try { + const data = + await axiosInstance.get("/playlists/user"); + setPlaylists(data.data); + } catch (error) { + console.error("Error fetching playlists:", error); + // todo: show toast + } + }; + fetchData(); + }, []); return (
{song.title}(null); + const playlistDropdownRefs = useRef<{ [key: number]: HTMLDivElement | null }>( + {}, + ); useEffect(() => { @@ -43,4 +51,52 @@ fetchSongs(); }, []); + + // Handle click outside for playlist dropdown + useEffect(() => { + const handleClickOutside = (event: MouseEvent) => { + if (openPlaylistDropdown !== null) { + const ref = playlistDropdownRefs.current[openPlaylistDropdown]; + if (ref && !ref.contains(event.target as Node)) { + setOpenPlaylistDropdown(null); + } + } + }; + + document.addEventListener("mousedown", handleClickOutside); + return () => { + document.removeEventListener("mousedown", handleClickOutside); + }; + }, [openPlaylistDropdown]); + + const toggleLike = async (songId: number) => { + try { + await axiosInstance.post(`/musical-entity/${songId}/like`); + setSongs((prevSongs) => + prevSongs.map((song) => + song.id === songId + ? { ...song, isLikedByCurrentUser: !song.isLikedByCurrentUser } + : song, + ), + ); + } catch (error) { + console.error("Error toggling like:", error); + } + }; + + const togglePlaylistDropdown = (songId: number) => { + setOpenPlaylistDropdown((prev) => (prev === songId ? null : songId)); + }; + + const handleAddToPlaylist = (songId: number, playlistName: string) => { + console.log(`Adding song ${songId} to ${playlistName}`); + // TODO: Implement actual API call + setOpenPlaylistDropdown(null); + }; + + const handleCreateNewPlaylist = (songId: number) => { + console.log(`Creating new playlist for song ${songId}`); + // TODO: Implement actual playlist creation + setOpenPlaylistDropdown(null); + }; const performSearch = async (query: string, category: SearchCategory) => { @@ -289,5 +345,5 @@
-
+

{song.title} @@ -299,4 +355,129 @@ {song.releasedBy}

+
+ {/* Like button */} + + + {/* Add to playlist button */} +
{ + if (el) + playlistDropdownRefs.current[song.id] = el; + }} + > + + + {/* Playlist dropdown */} + {openPlaylistDropdown === song.id && ( +
+
+ Add to playlist +
+ + + +
+ )} +
+

Index: frontend/src/utils/types.ts =================================================================== --- frontend/src/utils/types.ts (revision 2ce7c1e0bad813ed1a0f626dac2d85bf67c1c891) +++ frontend/src/utils/types.ts (revision b071fb4a2344e233ee12641fe437797ae1bbb736) @@ -57,2 +57,20 @@ export type SearchCategory = "songs" | "albums" | "artists" | "users"; + +export interface SidebarProps { + isOpen: boolean; + onClose: () => void; +} + +export interface BasicSong { + id: number; + title: string; + artist: string; + cover?: string; +} + +export interface BasicPlaylist { + id: number; + name: string; + songCount: number; +}