Changeset 15782a6

Timestamp:

02/05/26 17:56:50 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

694fc25

Parents:

929e93c

Message:

add cover to musical entity and endpoint for fetching all songs

Location:

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

Files:

• controller/AllController.java (deleted)
• controller/SongController.java (added)
• model/MusicalEntity.java (modified) (1 diff)
• model/dto/MusicalEntityDto.java (modified) (2 diffs)
• repository/SongRepository.java (modified) (3 diffs)
• service/SongService.java (added)

finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/MusicalEntity.java

@@ -37 +37 @@
     private LocalDate releaseDate;
 
+    private String cover;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @OnDelete(action = OnDeleteAction.CASCADE)

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

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.model.dto;
 
+import jakarta.annotation.Nullable;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -14 +15 @@
     private String type;
     private String releasedBy;
+    private String cover;
     private Boolean isLikedByCurrentUser;
+
+    public MusicalEntityDto(Long id, String title, String genre, String type, String releasedBy, Boolean isLikedByCurrentUser) {
+        this.id = id;
+        this.title = title;
+        this.genre = genre;
+        this.type = type;
+        this.releasedBy = releasedBy;
+        this.isLikedByCurrentUser = isLikedByCurrentUser;
+    }
 }

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

@@ -21 +21 @@
             "'SONG', " +
             "u.fullName, " +
+            "me.cover," +
             "(CASE WHEN :currentUserId IS NOT NULL AND l.id IS NOT NULL THEN true ELSE false END)) " +
             "FROM Song s " +
@@ -39 +40 @@
             "'SONG', " +
             "u.fullName, " +
+            "me.cover," +
             "(CASE WHEN :currentUserId IS NOT NULL AND l.id IS NOT NULL THEN true ELSE false END)) " +
             "FROM Song s "+
@@ -49 +51 @@
             "WHERE ps.playlist.id=:playlistId")
     List<MusicalEntityDto>findSongsByPlaylistId(@Param("playlistId")Long playlistId, @Param("currentUserId")Long currentUserId);
+
+    @Query("SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(" +
+            "s.id, " +
+            "me.title, " +
+            "me.genre, " +
+            "'SONG', " +
+            "u.fullName, " +
+            "me.cover," +
+            "FALSE ) " +
+//            "(CASE WHEN :currentUserId IS NOT NULL AND l.id IS NOT NULL THEN true ELSE false END)) " +
+//            "COUNT(*) " +
+            "FROM Song s "+
+            "JOIN s.musicalEntities me " +
+            "JOIN me.releasedBy a " +
+            "JOIN a.nonAdminUser nau "+
+            "JOIN nau.user u " +
+            "JOIN Listen l on l.song.id = s.id " +
+            "GROUP BY s.id, me.title, me.genre, u.fullName, me.cover " +
+            "ORDER BY count(*) desc "
+    )
+    // todo: handle likes, momentalno site se false za da raboti joinot
+    // todo: add paging
+    List<MusicalEntityDto> findTopByListens(@Param("currentUserId")Long currentUserId);
 }