Changeset 799f27d

Timestamp:

02/07/26 21:56:29 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

7621d7b

Parents:

8ccb07e

Message:

refactor and simplify musical entity related dto-s

Location:

finkwave/src/main/java/com/ukim/finki/develop/finkwave

Files:

• model/dto/AlbumDto.java (modified) (1 diff)
• model/dto/MusicalEntityDto.java (modified) (1 diff)
• model/dto/SongDetailsDto.java (modified) (2 diffs)
• model/dto/SongDto.java (modified) (1 diff)
• repository/LikeRepository.java (modified) (1 diff)
• repository/SongRepository.java (modified) (1 diff)
• service/AlbumService.java (modified) (1 diff)

finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/AlbumDto.java

@@ -9 +9 @@
 @Getter
 @Setter
+@AllArgsConstructor
 public class AlbumDto extends MusicalEntityDto{
     private List<MusicalEntityDto>songs;
 
-    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);
     }
-
-
 }

finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDto.java

@@ -19 +19 @@
     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;
-    }
 }

finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDetailsDto.java

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.model.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -10 +11 @@
 @Setter
 @NoArgsConstructor
+@AllArgsConstructor
 public class SongDetailsDto extends SongDto{
     private List<ArtistContributionSummaryDto> contributions;
     private List<ReviewDto> 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<ReviewDto> reviews, List<ArtistContributionSummaryDto> 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<ReviewDto> reviews, List<ArtistContributionSummaryDto> 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<ReviewDto> reviews, List<ArtistContributionSummaryDto> contributions) {
-        super(id, title, genre, type, releasedBy, artistUsername, cover, isLikedByCurrentUser, link);
-        this.reviews = reviews;
-        this.contributions = contributions;
-    }
 }

finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/SongDto.java

@@ -10 +10 @@
 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;
     }
 }

finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/LikeRepository.java

@@ -24 +24 @@
             u.fullName,
             u.username,
+            me.cover,
             (CASE WHEN currentUserLike.id IS NOT NULL THEN true ELSE false END))
         FROM Like l

finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java

@@ -87 +87 @@
             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
         )

finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AlbumService.java

@@ -35 +35 @@
                 album.getMusicalEntities().getReleasedBy().getNonAdminUser().getUser().getFullName(),
                 album.getMusicalEntities().getReleasedBy().getNonAdminUser().getUser().getUsername(),
+                album.getMusicalEntities().getCover(),
                 likeRepository.isLikedByUser(currentUserId));
         List<MusicalEntityDto>songsFromAlbum=songRepository.findSongsByAlbum(id,currentUserId);