Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/AlbumDto.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/AlbumDto.java (revision 8ccb07eaee0e86c4db97ef4fa7b747503a6fc43d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/AlbumDto.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) @@ -9,11 +9,10 @@ @Getter @Setter +@AllArgsConstructor public class AlbumDto extends MusicalEntityDto{ private Listsongs; - public AlbumDto(Long id, String title, String genre, String type, String releasedBy, String artistUsername, Boolean isLikedByCurrentUser) { - super(id, title, genre, type, releasedBy, artistUsername, isLikedByCurrentUser); + public AlbumDto(Long id, String title, String genre, String type, String releasedBy, String artistUsername, String cover, Boolean isLikedByCurrentUser) { + super(id, title, genre, type, releasedBy, artistUsername, cover, isLikedByCurrentUser); } - - } 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 8ccb07eaee0e86c4db97ef4fa7b747503a6fc43d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDto.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) @@ -19,26 +19,3 @@ private String cover; private Boolean isLikedByCurrentUser; - private String album; - private Long albumId; - - public MusicalEntityDto(Long id, String title, String genre, String type, String releasedBy, String artistUsername, Boolean isLikedByCurrentUser) { - this.id = id; - this.title = title; - this.genre = genre; - this.type = type; - this.releasedBy = releasedBy; - this.artistUsername = artistUsername; - this.isLikedByCurrentUser = isLikedByCurrentUser; - } - - public MusicalEntityDto(Long id, String title, String genre, String type, String releasedBy, String releasedByUsername, String cover, Boolean isLikedByCurrentUser) { - this.id = id; - this.title = title; - this.genre = genre; - this.type = type; - this.releasedBy = releasedBy; - this.artistUsername = artistUsername; - this.cover = cover; - this.isLikedByCurrentUser = isLikedByCurrentUser; - } } 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 8ccb07eaee0e86c4db97ef4fa7b747503a6fc43d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDetailsDto.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) @@ -1,4 +1,5 @@ package com.ukim.finki.develop.finkwave.model.dto; +import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -10,24 +11,7 @@ @Setter @NoArgsConstructor +@AllArgsConstructor public class SongDetailsDto extends SongDto{ private List contributions; private List reviews; - - public SongDetailsDto(Long id, String title, String genre, String type, String releasedBy, String artistUsername, String cover, Boolean isLikedByCurrentUser, String album, Long albumId, String link, List reviews, List contributions) { - super(id, title, genre, type, releasedBy, artistUsername, cover, isLikedByCurrentUser, album, albumId, link); - this.reviews = reviews; - this.contributions = contributions; - } - - public SongDetailsDto(Long id, String title, String genre, String type, String releasedBy, String artistUsername, Boolean isLikedByCurrentUser, String link, List reviews, List contributions) { - super(id, title, genre, type, releasedBy, artistUsername, isLikedByCurrentUser, link); - this.reviews = reviews; - this.contributions = contributions; - } - - public SongDetailsDto(Long id, String title, String genre, String type, String releasedBy, String artistUsername, String cover, Boolean isLikedByCurrentUser, String link, List reviews, List contributions) { - super(id, title, genre, type, releasedBy, artistUsername, cover, isLikedByCurrentUser, link); - this.reviews = reviews; - this.contributions = contributions; - } } 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 8ccb07eaee0e86c4db97ef4fa7b747503a6fc43d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDto.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) @@ -10,21 +10,12 @@ public class SongDto extends MusicalEntityDto{ private String link; - - // todo: clean up constructors - + private String album; + private Long albumId; public SongDto(Long id, String title, String genre, String type, String releasedBy, String artistUsername, String cover, Boolean isLikedByCurrentUser, String album, Long albumId, String link) { - super(id, title, genre, type, releasedBy, artistUsername, cover, isLikedByCurrentUser, album, albumId); - this.link = link; - } - - public SongDto(Long id, String title, String genre, String type, String releasedBy, String artistUsername, Boolean isLikedByCurrentUser, String link) { - super(id, title, genre, type, releasedBy, artistUsername, isLikedByCurrentUser); - this.link = link; - } - - public SongDto(Long id, String title, String genre, String type, String releasedBy, String artistUsername, String cover, Boolean isLikedByCurrentUser, String link) { super(id, title, genre, type, releasedBy, artistUsername, cover, isLikedByCurrentUser); this.link = link; + this.album = album; + this.albumId = albumId; } } 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 8ccb07eaee0e86c4db97ef4fa7b747503a6fc43d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/LikeRepository.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) @@ -24,4 +24,5 @@ u.fullName, u.username, + me.cover, (CASE WHEN currentUserLike.id IS NOT NULL THEN true ELSE false END)) FROM Like l 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 8ccb07eaee0e86c4db97ef4fa7b747503a6fc43d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) @@ -87,4 +87,6 @@ s.musicalEntities.cover, (EXISTS (SELECT 1 FROM Like l WHERE l.musicalEntity.id = s.id AND l.listener.id = :currentUserId)), + s.album.musicalEntities.title, + s.album.musicalEntities.id, s.link ) Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AlbumService.java =================================================================== --- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AlbumService.java (revision 8ccb07eaee0e86c4db97ef4fa7b747503a6fc43d) +++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AlbumService.java (revision 799f27deb5d35bc13bd3110958c54f5a7375710d) @@ -35,4 +35,5 @@ album.getMusicalEntities().getReleasedBy().getNonAdminUser().getUser().getFullName(), album.getMusicalEntities().getReleasedBy().getNonAdminUser().getUser().getUsername(), + album.getMusicalEntities().getCover(), likeRepository.isLikedByUser(currentUserId)); ListsongsFromAlbum=songRepository.findSongsByAlbum(id,currentUserId);