Changeset 2fa6841

Timestamp:

02/08/26 20:00:21 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

c684a6d

Parents:

821dc0e

Message:

fix song repository bugs; minor ui change

Files:

• finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java (modified) (4 diffs)
• frontend/src/components/search/UserResult.tsx (modified) (1 diff)
• frontend/src/pages/SongDetail.tsx (modified) (1 diff)

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

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.repository;
 
-import com.ukim.finki.develop.finkwave.model.dto.BasicSongDto;
-import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto;
-import com.ukim.finki.develop.finkwave.model.dto.SongDto;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -10 +9 @@
 
 import com.ukim.finki.develop.finkwave.model.Song;
-
-import java.util.List;
+import com.ukim.finki.develop.finkwave.model.dto.BasicSongDto;
+import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto;
+import com.ukim.finki.develop.finkwave.model.dto.SongDto;
 
 @Repository
@@ -63 +63 @@
         )
         FROM Song s
+        JOIN Listen l on l.id.songId = s.id
         GROUP BY
             s.id,
@@ -98 +99 @@
 
     @Query(value = """
-        SELECT DISTINCT on (l.song_id)
-            l.song_id,
-            me.title,
-            u.full_name,
-            u.username,
-            s.link,
-            me.cover
-        FROM LISTENS l
-        JOIN MUSICAL_ENTITIES me on me.id = l.song_id
-        JOIN USERS u on u.user_id = me.released_by
-        JOIN SONGS s on s.id = me.id
-        WHERE l.listener_id = :userId
-        ORDER BY l.song_id, l.timestamp DESC
-        LIMIT 5
+        SELECT
+            t.song_id,
+            t.title,
+            t.full_name,
+            t.username,
+            t.link,
+            t.cover
+        FROM (
+                 SELECT DISTINCT ON (l.song_id)
+                     l.song_id,
+                     me.title,
+                     u.full_name,
+                     u.username,
+                     me.cover,
+                     s.link,
+                     l.timestamp
+                 FROM listens l
+                     JOIN musical_entities me ON me.id = l.song_id
+                     JOIN songs s on s.id = l.song_id
+                     JOIN users u ON u.user_id = me.released_by
+                     WHERE l.listener_id = 2
+                 ORDER BY l.song_id, l.timestamp DESC
+             ) t
+        ORDER BY t.timestamp DESC
+        LIMIT 5;
     """, nativeQuery = true)
     List<BasicSongDto> getRecentlyListened(@Param("userId")Long userId);

frontend/src/components/search/UserResult.tsx

@@ -35 +35 @@
                                 </p>
                         </div>
-                        <div className="text-right text-xs text-gray-500">
-                                <p>{user.followers} followers</p>
-                        </div>
                 </div>
         );

frontend/src/pages/SongDetail.tsx

@@ -137 +137 @@
                         setSong(response.data);
                 } catch (err) {
+                        // todo :add toast
                         console.error("Error deleting review:", err);
                 }