Changeset 8675f75

Timestamp:

02/07/26 20:11:09 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

8ccb07e

Parents:

9c1dcc7

Message:

add links to song api responses

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/controller/TestController.java (modified) (2 diffs)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/BasicSongDto.java (modified) (1 diff)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java (modified) (3 diffs)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/SongService.java (modified) (1 diff)
• frontend/src/pages/SongDetail.tsx (modified) (1 diff)

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

@@ -28 +28 @@
 
     @GetMapping("/search")
-    public HttpEntity<List<MusicalEntityDto>> searchSongs(
+    public HttpEntity<List<SongDto>> searchSongs(
             @RequestParam(name = "q") String searchTerm){
         return ResponseEntity.ok(songService.searchSongs(searchTerm));

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

@@ -4 +4 @@
 import com.ukim.finki.develop.finkwave.model.User;
 import com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto;
+import com.ukim.finki.develop.finkwave.model.dto.SongDto;
 import com.ukim.finki.develop.finkwave.repository.SongRepository;
 import com.ukim.finki.develop.finkwave.repository.UserRepository;
@@ -22 +23 @@
 
     @GetMapping("/search/{searchTerm}")
-    public HttpEntity<List<MusicalEntityDto>> searchSongsTest(@PathVariable String searchTerm){
+    public HttpEntity<List<SongDto>> searchSongsTest(@PathVariable String searchTerm){
         return ResponseEntity.ok(songRepository.searchSongs(null, searchTerm));
     }

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

@@ -7 +7 @@
     String title,
     String artist,
+    String link,
     @Nullable String cover
 ){}

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

@@ -69 +69 @@
 
     @Query("""
-        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.MusicalEntityDto(
+        SELECT NEW com.ukim.finki.develop.finkwave.model.dto.SongDto(
             s.id,
             s.musicalEntities.title,
@@ -76 +76 @@
             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))
+            (EXISTS (SELECT 1 FROM Like l WHERE l.musicalEntity.id = s.id AND l.listener.id = :currentUserId)),
+            s.link
         )
         FROM Song s
         WHERE s.musicalEntities.title ILIKE '%' || :searchTerm || '%'
     """)
-    List<MusicalEntityDto> searchSongs(@Param("currentUserId")Long currentUserId, @Param("searchTerm") String searchTerm);
+    List<SongDto> searchSongs(@Param("currentUserId")Long currentUserId, @Param("searchTerm") String searchTerm);
 
 
@@ -89 +90 @@
             me.title,
             u.full_name,
+            s.link,
             me.cover
         FROM LISTENS l
         JOIN MUSICAL_ENTITIES me on me.id = l.song_id
-        JOIN USERS u on u.user_id = l.listener_id
-        WHERE u.user_id = :userId
+        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

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

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

frontend/src/pages/SongDetail.tsx

@@ -452 +452 @@
                                                                                         </div>
                                                                                 </div>
-                                                                                <span className="text-sm text-gray-500 bg-white/5 px-2.5 py-0.5 rounded-full">
-                                                                                        {review.grade}/5
-                                                                                </span>
                                                                         </div>
                                                                         <p className="text-gray-300 text-sm leading-relaxed mt-3 pl-12">