Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/NonAdminUserController.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/NonAdminUserController.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/NonAdminUserController.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,5 +1,4 @@ package com.ukim.finki.develop.finkwave.controller; -import com.ukim.finki.develop.finkwave.model.NonAdminUser; import com.ukim.finki.develop.finkwave.model.dto.NonAdminUserDTO; import com.ukim.finki.develop.finkwave.service.NonAdminUserService; Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistContributionDTO.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistContributionDTO.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistContributionDTO.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -9,7 +9,7 @@ @AllArgsConstructor public class ArtistContributionDTO { - private String role; private Long musicalEntityId; private String title; + private String role; private String entityType; } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistMusicalEntitiesDTO.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistMusicalEntitiesDTO.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ArtistMusicalEntitiesDTO.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -5,4 +5,5 @@ import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @@ -12,6 +13,6 @@ @Setter @AllArgsConstructor +@NoArgsConstructor public class ArtistMusicalEntitiesDTO { - private List songs; - private List albums; + private List contributions; } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ListenerLikesDTO.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ListenerLikesDTO.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/ListenerLikesDTO.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,6 +1,7 @@ package com.ukim.finki.develop.finkwave.model.dto; - +import java.util.*; import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @@ -8,8 +9,8 @@ @Getter @AllArgsConstructor +@NoArgsConstructor public class ListenerLikesDTO { - private Long entityId; - private String entityTitle; - private String entityGenre; - private String entityType; + private List likedEntities; + + } 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 fd81a1852ddb6ef6fb10e109702ca71525257923) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDTO.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -0,0 +1,15 @@ +package com.ukim.finki.develop.finkwave.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@AllArgsConstructor +@Getter +@Setter +public class MusicalEntityDTO { + private Long id; + private String title; + private String genre; + private String type; +} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/NonAdminUserDTO.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/NonAdminUserDTO.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/NonAdminUserDTO.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,25 +1,27 @@ package com.ukim.finki.develop.finkwave.model.dto; -import lombok.AllArgsConstructor; +import com.ukim.finki.develop.finkwave.model.Playlist; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; import java.util.List; + @Getter @Setter -@AllArgsConstructor -@NoArgsConstructor + public class NonAdminUserDTO { - private Long Id; + private Long id; private String username; private String fullName; - private String profilePhoto; - private Long followerCount; - private Long followingCount; private String userType; - // is it best practice to have this empty in listeners? - private List contributions; - private List likedEntities; + private Long followers; + private Long following; + + + + private ArtistMusicalEntitiesDTO musicalEntities; + + private ListenerLikesDTO likes; + private ListcreatedPlaylists; } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/PlaylistDTO.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/PlaylistDTO.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/PlaylistDTO.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -0,0 +1,16 @@ +package com.ukim.finki.develop.finkwave.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@AllArgsConstructor +@Getter +@Setter +public class PlaylistDTO { + private Long id; + private String name; + private String cover; + private String creatorName; + +} 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 efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistContributionRepository.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -2,6 +2,7 @@ import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; - +import org.springframework.data.repository.query.Param; import com.ukim.finki.develop.finkwave.model.ArtistContribution; import com.ukim.finki.develop.finkwave.model.ArtistContributionId; @@ -12,4 +13,12 @@ public interface ArtistContributionRepository extends JpaRepository { - ListfindAllByArtist_Id(Long id); + @Query("SELECT ac.musicalEntity.id,ac.musicalEntity.title,ac.role, "+ + "CASE WHEN s.id IS NOT NULL THEN 'Song' "+ + "WHEN a.id IS NOT NULL THEN 'Album' "+ + "ELSE 'Unknown' END "+ + "FROM ArtistContribution ac "+ + "LEFT JOIN Song s ON s.musicalEntities.id=ac.musicalEntity.id "+ + "LEFT JOIN Album a ON a.musicalEntities.id=ac.musicalEntity.id "+ + "WHERE ac.artist.id=:artistId") + ListfindContributionsByArtistId(@Param("artistId")Long artistId); } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistRepository.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistRepository.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ArtistRepository.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,5 +1,9 @@ package com.ukim.finki.develop.finkwave.repository; +import java.util.Optional; + 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; @@ -8,3 +12,10 @@ @Repository public interface ArtistRepository extends JpaRepository { + + @Query("SELECT DISTINCT a FROM Artist a "+ + "JOIN FETCH a.nonAdminUser nu "+ + "JOIN FETCH nu.user "+ + "WHERE a.id=:artistId") + OptionalfindByIdWithUser(@Param("artistId")Long artistId); + } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/LikeRepository.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/LikeRepository.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/LikeRepository.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -2,4 +2,6 @@ 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; @@ -11,4 +13,12 @@ @Repository public interface LikeRepository extends JpaRepository { - ListgetLikesByListener_Id(Long id); + @Query("SELECT l.musicalEntity.id, l.musicalEntity.title,l.musicalEntity.genre, " + + "CASE WHEN s.id IS NOT NULL THEN 'SONG' " + + "WHEN a.id IS NOT NULL THEN 'ALBUM' " + + "ELSE 'UNKNOWN' END " + + "FROM Like l " + + "LEFT JOIN Song s ON s.musicalEntities.id = l.musicalEntity.id " + + "LEFT JOIN Album a ON a.musicalEntities.id = l.musicalEntity.id " + + "WHERE l.listener.id = :listenerId") + List findLikedEntitiesWithTypeByListenerId(@Param("listenerId") Long listenerId); } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ListenerRepository.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ListenerRepository.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/ListenerRepository.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,5 +1,9 @@ package com.ukim.finki.develop.finkwave.repository; +import java.util.Optional; + 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; @@ -8,3 +12,8 @@ @Repository public interface ListenerRepository extends JpaRepository { + @Query("SELECT DISTINCT l FROM Listener l " + + "JOIN FETCH l.nonAdminUser nu " + + "JOIN FETCH nu.user " + + "WHERE l.id = :listenerId") + Optional findByIdWithUser(@Param("listenerId") Long listenerId); } 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 efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/PlaylistRepository.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -2,9 +2,26 @@ 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; import com.ukim.finki.develop.finkwave.model.Playlist; +import java.util.List; + @Repository public interface PlaylistRepository extends JpaRepository { + + + @Query("SELECT DISTINCT p FROM Playlist p " + + "JOIN FETCH p.createdBy l " + + "JOIN FETCH l.nonAdminUser nu " + + "JOIN FETCH nu.user u " + + "WHERE l.id = :creatorId") + List findByCreatorId(@Param("creatorId") Long creatorId); + + + + + } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ArtistService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ArtistService.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ArtistService.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,13 +1,11 @@ package com.ukim.finki.develop.finkwave.service; -import com.ukim.finki.develop.finkwave.model.ArtistContribution; -import com.ukim.finki.develop.finkwave.model.Song; import com.ukim.finki.develop.finkwave.model.dto.ArtistContributionDTO; -import com.ukim.finki.develop.finkwave.model.dto.ArtistMusicalEntitiesDTO; import com.ukim.finki.develop.finkwave.repository.ArtistContributionRepository; + +import org.springframework.transaction.annotation.Transactional; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -17,23 +15,14 @@ public class ArtistService { - private final MusicalEntityService musicalEntityService; - private final ArtistContributionRepository contributionRepository; + private final ArtistContributionRepository artistContributionRepository; - public List getArtistContributions(Long id){ + @Transactional(readOnly=true) + public List getArtistContributions(Long artistId){ + Listresults=artistContributionRepository.findContributionsByArtistId(artistId); - ArtistMusicalEntitiesDTO artistMusicalEntities=musicalEntityService.getArtistMusicalEntities(id); - Listcontributions=contributionRepository.findAllByArtist_Id(id); - return contributions.stream().map(c -> { - boolean isSong = artistMusicalEntities.getSongs().stream() - .anyMatch(s -> s.getId().equals(c.getMusicalEntity().getId())); - - return new ArtistContributionDTO( - c.getRole(), - c.getMusicalEntity().getId(), - c.getMusicalEntity().getTitle(), - isSong ? "Song" : "Album" - ); - }).collect(Collectors.toList()); + return results.stream() + .map(row->new ArtistContributionDTO((Long)row[0], (String)row[1], (String)row[2], (String)row[3])) + .collect(Collectors.toList()); } 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 efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/ListenerService.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,19 +1,14 @@ package com.ukim.finki.develop.finkwave.service; -import com.ukim.finki.develop.finkwave.model.Album; -import com.ukim.finki.develop.finkwave.model.Like; -import com.ukim.finki.develop.finkwave.model.MusicalEntity; -import com.ukim.finki.develop.finkwave.model.Song; -import com.ukim.finki.develop.finkwave.model.dto.ArtistMusicalEntitiesDTO; +import com.ukim.finki.develop.finkwave.model.Playlist; import com.ukim.finki.develop.finkwave.model.dto.ListenerLikesDTO; -import com.ukim.finki.develop.finkwave.repository.AlbumRepository; +import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDTO; +import com.ukim.finki.develop.finkwave.model.dto.PlaylistDTO; import com.ukim.finki.develop.finkwave.repository.LikeRepository; -import com.ukim.finki.develop.finkwave.repository.SongRepository; +import com.ukim.finki.develop.finkwave.repository.PlaylistRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; - -import java.util.ArrayList; +import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.stream.Collectors; @Service @@ -21,18 +16,23 @@ public class ListenerService { private final LikeRepository likeRepository; - private final MusicalEntityService musicalEntityService; + private final PlaylistRepository playlistRepository; + @Transactional(readOnly = true) + public ListenerLikesDTO getLikedEntities(Long listenerId) { + List results = likeRepository.findLikedEntitiesWithTypeByListenerId(listenerId); - public ListgetLikedEntities(Long listenerId){ - Listlikes=likeRepository.getLikesByListener_Id(listenerId); + ListlikedEntities=results.stream() + .map(row->new MusicalEntityDTO((Long)row[0], (String)row[1], (String)row[2],(String)row[3])) + .toList(); + + ListenerLikesDTO dto=new ListenerLikesDTO(); + dto.setLikedEntities(likedEntities); + return dto; + } + + @Transactional(readOnly = true) + public ListgetPlaylistsCreatedByUser(Long listenerId){ + return playlistRepository.findByCreatorId(listenerId); + } +} - return likes.stream().map(l -> new ListenerLikesDTO( - l.getMusicalEntity().getId(), - l.getMusicalEntity().getTitle(), - l.getMusicalEntity().getGenre(), - musicalEntityService.getEntityType(l.getMusicalEntity().getId()) - )).toList(); - } - - -} Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/MusicalEntityService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/MusicalEntityService.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/MusicalEntityService.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,49 +1,49 @@ -package com.ukim.finki.develop.finkwave.service; +// package com.ukim.finki.develop.finkwave.service; -import com.ukim.finki.develop.finkwave.model.Album; -import com.ukim.finki.develop.finkwave.model.MusicalEntity; -import com.ukim.finki.develop.finkwave.model.Song; -import com.ukim.finki.develop.finkwave.model.dto.ArtistMusicalEntitiesDTO; -import com.ukim.finki.develop.finkwave.repository.AlbumRepository; -import com.ukim.finki.develop.finkwave.repository.MusicalEntityRepository; -import com.ukim.finki.develop.finkwave.repository.SongRepository; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; +// import com.ukim.finki.develop.finkwave.model.Album; +// import com.ukim.finki.develop.finkwave.model.MusicalEntity; +// import com.ukim.finki.develop.finkwave.model.Song; +// import com.ukim.finki.develop.finkwave.model.dto.ArtistMusicalEntitiesDTO; +// import com.ukim.finki.develop.finkwave.repository.AlbumRepository; +// import com.ukim.finki.develop.finkwave.repository.MusicalEntityRepository; +// import com.ukim.finki.develop.finkwave.repository.SongRepository; +// import lombok.AllArgsConstructor; +// import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; +// import java.util.ArrayList; +// import java.util.Collections; +// import java.util.List; +// import java.util.stream.Collectors; -@Service -@AllArgsConstructor -public class MusicalEntityService { +// @Service +// @AllArgsConstructor +// public class MusicalEntityService { - private final MusicalEntityRepository musicalEntityRepository; - private final SongRepository songRepository; - private final AlbumRepository albumRepository; +// private final MusicalEntityRepository musicalEntityRepository; +// private final SongRepository songRepository; +// private final AlbumRepository albumRepository; - public ArtistMusicalEntitiesDTO getArtistMusicalEntities(Long artistId){ - ListentitiesIDs=musicalEntityRepository.findAllByReleasedBy_Id(artistId).stream() - .map(MusicalEntity::getId) - .toList(); +// public ArtistMusicalEntitiesDTO getArtistMusicalEntities(Long artistId){ +// ListentitiesIDs=musicalEntityRepository.findAllByReleasedBy_Id(artistId).stream() +// .map(MusicalEntity::getId) +// .toList(); - if (entitiesIDs.isEmpty()) { - return new ArtistMusicalEntitiesDTO(Collections.emptyList(), Collections.emptyList()); - } +// if (entitiesIDs.isEmpty()) { +// return new ArtistMusicalEntitiesDTO(Collections.emptyList(), Collections.emptyList()); +// } - // bulk fetching - List songs = songRepository.findAllByIdIn(entitiesIDs); +// // bulk fetching +// List songs = songRepository.findAllByIdIn(entitiesIDs); - List albums = albumRepository.findAllByIdIn(entitiesIDs); +// List albums = albumRepository.findAllByIdIn(entitiesIDs); - return new ArtistMusicalEntitiesDTO(songs, albums); - } +// return new ArtistMusicalEntitiesDTO(songs, albums); +// } - public String getEntityType(Long id) { - if (songRepository.existsById(id)) return "Song"; - if (albumRepository.existsById(id)) return "Album"; - return "Unknown"; - } +// public String getEntityType(Long id) { +// if (songRepository.existsById(id)) return "Song"; +// if (albumRepository.existsById(id)) return "Album"; +// return "Unknown"; +// } -} +// } Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/NonAdminUserService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/NonAdminUserService.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/NonAdminUserService.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -4,6 +4,6 @@ import com.ukim.finki.develop.finkwave.model.Listener; import com.ukim.finki.develop.finkwave.model.NonAdminUser; -import com.ukim.finki.develop.finkwave.model.dto.ArtistContributionDTO; -import com.ukim.finki.develop.finkwave.model.dto.NonAdminUserDTO; +import com.ukim.finki.develop.finkwave.model.Playlist; +import com.ukim.finki.develop.finkwave.model.dto.*; import com.ukim.finki.develop.finkwave.repository.ArtistRepository; import com.ukim.finki.develop.finkwave.repository.FollowRepository; @@ -13,7 +13,6 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; - +import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Optional; import java.util.stream.Collectors; @@ -27,30 +26,61 @@ private final ArtistService artistService; private final ListenerService listenerService; + private final FollowRepository followRepository; + @Transactional(readOnly = true) public List getAllUsers() { return nonAdminUserRepository.findAllWithUser().stream() .map(user -> { String type = determineType(user.getId()); - return mapper.toDTO(user, type); + Long followers = followRepository.countByFolloweeId(user.getId()); + Long following = followRepository.countByFollowerId(user.getId()); + return mapper.toDTO(user, type, followers, following); }) .collect(Collectors.toList()); } + @Transactional(readOnly = true) public NonAdminUserDTO getById(Long id) { - NonAdminUser userEntity = nonAdminUserRepository.findById(id) - .orElseThrow(() -> new RuntimeException("User not found with id: " + id)); - - String type = determineType(id); - NonAdminUserDTO dto = mapper.toDTO(userEntity, type); - if (type.equals("Artist")){ - List workHistory = artistService.getArtistContributions(id); - dto.setContributions(workHistory); - }else if(type.equals("Listener")){ - dto.setLikedEntities(listenerService.getLikedEntities(id)); + Long followers=followRepository.countByFolloweeId(id); + Long following=followRepository.countByFollowerId(id); + + if (artistRepository.existsById(id)) { + return getArtistProfile(id,followers,following); } - - return dto; + + if (listenerRepository.existsById(id)) { + return getListenerProfile(id,followers,following); + } + + throw new RuntimeException("User not found with id: " + id); } + private NonAdminUserDTO getArtistProfile(Long artistId, Long followers,Long following) { + Artist artist = artistRepository.findByIdWithUser(artistId) + .orElseThrow(() -> new RuntimeException("Artist not found with id: " + artistId)); + + + ArtistMusicalEntitiesDTO entitiesDTO = new ArtistMusicalEntitiesDTO(); + entitiesDTO.setContributions(artistService.getArtistContributions(artistId)); + + return mapper.toArtistDTO(artist, entitiesDTO,followers,following); + } + + private NonAdminUserDTO getListenerProfile(Long listenerId, Long followers,Long following) { + Listener listener = listenerRepository.findByIdWithUser(listenerId) + .orElseThrow(() -> new RuntimeException("Listener not found with id: " + listenerId)); + + + ListenerLikesDTO likesDTO = listenerService.getLikedEntities(listenerId); + Listplaylists=listenerService.getPlaylistsCreatedByUser(listenerId).stream() + .map(p->new PlaylistDTO( + p.getId(), + p.getName(), + p.getCover(), + p.getCreatedBy().getNonAdminUser().getUser().getFullName() + )).toList(); + + return mapper.toListenerDTO(listener, likesDTO,followers,following,playlists); + } private String determineType(Long id) { Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/mappers/NonAdminUserMapper.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/mappers/NonAdminUserMapper.java (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/mappers/NonAdminUserMapper.java (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,39 +1,58 @@ package com.ukim.finki.develop.finkwave.service.mappers; -import com.ukim.finki.develop.finkwave.model.ArtistContribution; -import com.ukim.finki.develop.finkwave.model.MusicalEntity; +import com.ukim.finki.develop.finkwave.model.Artist; + +import com.ukim.finki.develop.finkwave.model.Listener; + +import com.ukim.finki.develop.finkwave.model.Playlist; +import com.ukim.finki.develop.finkwave.model.dto.ArtistMusicalEntitiesDTO; +import com.ukim.finki.develop.finkwave.model.dto.ListenerLikesDTO; +import com.ukim.finki.develop.finkwave.model.dto.NonAdminUserDTO; import com.ukim.finki.develop.finkwave.model.NonAdminUser; -import com.ukim.finki.develop.finkwave.model.dto.ArtistContributionDTO; -import com.ukim.finki.develop.finkwave.model.dto.NonAdminUserDTO; -import com.ukim.finki.develop.finkwave.repository.ArtistContributionRepository; -import com.ukim.finki.develop.finkwave.repository.FollowRepository; -import com.ukim.finki.develop.finkwave.repository.MusicalEntityRepository; -import lombok.AllArgsConstructor; +import com.ukim.finki.develop.finkwave.model.dto.PlaylistDTO; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.List; + @Component -@AllArgsConstructor public class NonAdminUserMapper { - private final FollowRepository followRepository; + public NonAdminUserDTO toArtistDTO(Artist artist, ArtistMusicalEntitiesDTO entitiesDTO, Long followers, Long following) { + NonAdminUserDTO dto = createBaseDTO( + artist.getNonAdminUser(), + "ARTIST", + followers, + following + ); + dto.setMusicalEntities(entitiesDTO); + return dto; + } + public NonAdminUserDTO toListenerDTO(Listener listener, ListenerLikesDTO likesDTO, Long followers, Long following, Listplaylists) { + NonAdminUserDTO dto = createBaseDTO( + listener.getNonAdminUser(), + "LISTENER", + followers, + following + ); + dto.setLikes(likesDTO); + dto.setCreatedPlaylists(playlists); + return dto; + } - public NonAdminUserDTO toDTO(NonAdminUser entity, String type) { - if (entity == null) return null; + public NonAdminUserDTO toDTO(NonAdminUser user, String type,Long followers,Long following) { + return createBaseDTO(user, type, followers, following); + } - return new NonAdminUserDTO( - entity.getId(), - entity.getUser().getUsername(), - entity.getUser().getFullName(), - entity.getUser().getProfilePhoto(), - followRepository.countByFolloweeId(entity.getId()), - followRepository.countByFollowerId(entity.getId()), - type, - new ArrayList<>(), - new ArrayList<>() - ); + private NonAdminUserDTO createBaseDTO(NonAdminUser user, String userType, Long followers, Long following) { + NonAdminUserDTO dto = new NonAdminUserDTO(); + dto.setId(user.getId()); + dto.setUsername(user.getUser().getUsername()); + dto.setFullName(user.getUser().getFullName()); + dto.setUserType(userType); + dto.setFollowers(followers); + dto.setFollowing(following); + return dto; } } Index: frontend/src/components/userProfile/ArtistView.tsx =================================================================== --- frontend/src/components/userProfile/ArtistView.tsx (revision fd81a1852ddb6ef6fb10e109702ca71525257923) +++ frontend/src/components/userProfile/ArtistView.tsx (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -0,0 +1,55 @@ +import { useNavigate } from "react-router-dom"; + +interface ArtistContributionDTO { + musicalEntityId: number; + title: string; + role: string; + entityType: string; +} + +interface ArtistViewProps { + contributions: ArtistContributionDTO[]; +} + +const ArtistView = ({ contributions }: ArtistViewProps) => { + const navigate = useNavigate(); + + return ( +
+

Contributions

+
+ {contributions.map((contribution, index) => ( +
+ navigate(`/musical-entity/${contribution.musicalEntityId}`) + } + > +
+
+

{contribution.title}

+

+ ID: {contribution.musicalEntityId} +

+
+
+ + {contribution.role} + + + {contribution.entityType} + +
+
+
+ ))} +
+ {contributions.length === 0 && ( +

No contributions yet

+ )} +
+ ); +}; + +export default ArtistView; Index: frontend/src/components/userProfile/ListenerView.tsx =================================================================== --- frontend/src/components/userProfile/ListenerView.tsx (revision fd81a1852ddb6ef6fb10e109702ca71525257923) +++ frontend/src/components/userProfile/ListenerView.tsx (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -0,0 +1,147 @@ +import { useNavigate } from "react-router-dom"; + +interface MusicalEntityDTO { + id: number; + title: string; + genre: string; + type: string; +} + +interface Playlist { + id: number; + name: string; + cover: string; + creatorName: string; +} + +interface ListenerViewProps { + likedEntities: MusicalEntityDTO[]; + playlists?: Playlist[]; +} + +const ListenerView = ({ likedEntities, playlists }: ListenerViewProps) => { + const navigate = useNavigate(); + + return ( +
+ {/* --- PLAYLISTS SECTION --- */} +
+

+ My Playlists + + ({playlists?.length}) + +

+ +
+ {playlists?.map((playlist) => ( +
navigate(`/playlist/${playlist.id}`)} + > + {/* Playlist Cover Container */} +
+ {playlist.cover ? ( + {playlist.name} + ) : ( +
+ + + +
+ )} + {/* Hover Overlay */} +
+
+ + + +
+
+
+ +

+ {playlist.name} +

+

+ Playlist +

+
+ ))} + + {playlists?.length === 0 && ( +
+

No playlists created yet

+
+ )} +
+
+ + {/* --- LIKED MUSIC SECTION --- */} +
+

Liked Music

+
+ {likedEntities.map((entity) => ( +
navigate(`/musical-entity/${entity.id}`)} + > +
+
+ + {entity.title} + +

{entity.genre}

+
+ + {entity.type} + +
+
+ ))} +
+ {likedEntities.length === 0 && ( +

+ No liked music yet +

+ )} +
+
+ ); +}; + +export default ListenerView; Index: frontend/src/components/userProfile/UserDetail.tsx =================================================================== --- frontend/src/components/userProfile/UserDetail.tsx (revision efe76febc84767c79b12dc47ef59644804ce6f97) +++ frontend/src/components/userProfile/UserDetail.tsx (revision fd81a1852ddb6ef6fb10e109702ca71525257923) @@ -1,4 +1,27 @@ import { useEffect, useState } from "react"; import { useParams, useNavigate } from "react-router-dom"; +import ArtistView from "./ArtistView"; +import ListenerView from "./ListenerView"; + +interface MusicalEntityDTO { + id: number; + title: string; + genre: string; + type: string; +} + +interface ArtistContributionDTO { + musicalEntityId: number; + title: string; + role: string; + entityType: string; +} + +interface Playlist { + id: number; + name: string; + cover: string; + creatorName: string; +} interface User { @@ -6,20 +29,17 @@ username: string; fullName: string; - followerCount: number; - followingCount: number; userType: string; - contributions?: { - role: string; - title: string; - musicalEntityId: number; - entityType: string; - }[]; + followers: number; + following: number; - likedEntities?: { - entityId: number; - entityTitle: string; - entityGenre: string; - entityType: string; - }[]; + musicalEntities?: { + contributions: ArtistContributionDTO[]; + }; + + likes?: { + likedEntities: MusicalEntityDTO[]; + }; + + createdPlaylists?: Playlist[]; } @@ -34,4 +54,5 @@ const response = await fetch(`http://localhost:8080/users/${userId}`); const data = await response.json(); + console.log("Fetched user data:", data); setUser(data); }; @@ -43,65 +64,55 @@ return (
- {/* */} + ← Back + +
-

{user.fullName}

-

Username: @{user.username}

-

- Followers: {user.followerCount} -

-

- Following: {user.followingCount} -

-

Type: {user.userType}

- {user.userType === "Artist" && user.contributions && ( -
-

Discography

-
- {user.contributions.map((item, index) => ( -
-
-

{item.title}

-

{item.entityType}

-
- - {item.role} - - - {item.musicalEntityId} - -
- ))} + {/* Profile Header */} +
+ {/* Profile Photo */} +
+
+ {user.fullName.charAt(0).toUpperCase()}
+ + {/* User Info */} +
+

{user.fullName}

+ + {user.userType} + + + {/* Followers/Following Stats */} +
+
+ {user.followers} + Followers +
+
+ {user.following} + Following +
+
+ + +
+
+ + {user.userType === "ARTIST" && user.musicalEntities?.contributions && ( + )} - {user.userType === "Listener" && user.likedEntities && ( -
-

Liked Songs & Albums

-
- {user.likedEntities.map((like) => ( -
- {like.entityTitle} - - {like.entityType} - - - {like.entityGenre} - -
- ))} -
-
+ {user.userType === "LISTENER" && user.likes?.likedEntities && ( + )}