Changeset 591919d

Timestamp:

02/06/26 21:36:01 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

5938bc9

Parents:

b071fb4

Message:

add album to songs on landing page

Files:

• finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java (modified) (1 diff)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntityDto.java (modified) (2 diffs)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java (modified) (2 diffs)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java (modified) (1 diff)
• frontend/src/pages/LandingPage.tsx (modified) (1 diff)
• frontend/src/utils/types.ts (modified) (1 diff)

finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java

@@ -32 +32 @@
     public HttpEntity<List<MusicalEntityDto>> searchSongs(
             @RequestParam(name = "q") String searchTerm){
-        return ResponseEntity.ok(songService.searchSongs(null, searchTerm));
+        return ResponseEntity.ok(songService.searchSongs(searchTerm));
     }
 

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

@@ -17 +17 @@
     private String cover;
     private Boolean isLikedByCurrentUser;
+    private String album;
 
     public MusicalEntityDto(Long id, String title, String genre, String type, String releasedBy, Boolean isLikedByCurrentUser) {
@@ -26 +27 @@
         this.isLikedByCurrentUser = isLikedByCurrentUser;
     }
+
+    public MusicalEntityDto(Long id, String title, String genre, String type, String releasedBy, String cover, Boolean isLikedByCurrentUser) {
+        this.id = id;
+        this.title = title;
+        this.genre = genre;
+        this.type = type;
+        this.releasedBy = releasedBy;
+        this.cover = cover;
+        this.isLikedByCurrentUser = isLikedByCurrentUser;
+    }
 }

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

@@ -49 +49 @@
     @Query("""
         SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
-        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))
+            s.id,
+            s.musicalEntities.title,
+            s.musicalEntities.genre,
+            'SONG',
+            s.musicalEntities.releasedBy.nonAdminUser.user.fullName,
+            s.musicalEntities.cover,
+            (EXISTS (SELECT 1 FROM Like l WHERE l.musicalEntity.id = s.id AND l.listener.id = :currentUserId)),
+            s.album.musicalEntities.title
         )
         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
+        GROUP BY s.id, s.musicalEntities.title, s.musicalEntities.genre,
+            s.musicalEntities.releasedBy.nonAdminUser.user.fullName, s.musicalEntities.cover, s.album.musicalEntities.title
         ORDER BY count(*) desc
     """)
@@ -64 +66 @@
     List<MusicalEntityDto> findTopByListens(@Param("currentUserId")Long currentUserId);
 
-    // todo: fix is liked by user, currently returns hard coded false
     @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,
+            s.musicalEntities.title,
+            s.musicalEntities.genre,
+            'SONG',
+            s.musicalEntities.releasedBy.nonAdminUser.user.fullName,
+            s.musicalEntities.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
-        JOIN me.releasedBy a
-        JOIN a.nonAdminUser nau
-        JOIN nau.user u
-        WHERE me.title ILIKE '%' || :searchTerm || '%'
+        WHERE s.musicalEntities.title ILIKE '%' || :searchTerm || '%'
     """)
     List<MusicalEntityDto> searchSongs(@Param("currentUserId")Long currentUserId, @Param("searchTerm") String searchTerm);

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

@@ -19 +19 @@
     }
 
-    public List<MusicalEntityDto> searchSongs(Long userId, String searchTerm){
+    public List<MusicalEntityDto> searchSongs(String searchTerm){
+        Long userId = authService.getCurrentUserID();
         return songRepository.searchSongs(userId, searchTerm);
     }

frontend/src/pages/LandingPage.tsx

@@ -350 +350 @@
                                                                                                         </h3>
                                                                                                         <p className="text-sm text-gray-400 mb-3 overflow-hidden text-ellipsis whitespace-nowrap">
-                                                                                                                {"<album>"}
+                                                                                                                {song.album}
                                                                                                         </p>
                                                                                                         <p className="text-sm text-gray-400 mb-3 overflow-hidden text-ellipsis whitespace-nowrap">

frontend/src/utils/types.ts

@@ -28 +28 @@
 export interface Song extends MusicalEntity {
         type: "SONG";
+        album?: string;
 }