Changeset d85e8e3

Timestamp:

02/12/26 22:18:11 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

f5bc95e

Parents:

db5fb23

Message:

fix bug in song repository and add sequence generator for musical entities

Files:

• finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/MusicalEntity.java (modified) (1 diff)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/User.java (modified) (1 diff)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java (modified) (1 diff)
• frontend/src/pages/MySongs.tsx (modified) (3 diffs)

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

@@ -21 +21 @@
     @Id
     @Column(name = "id", nullable = false)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "musical_entity_id_gen")
+    @SequenceGenerator(name = "musical_entity_id_gen", sequenceName = "musical_entities_id_seq", allocationSize = 1)
     private Long id;
 

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

@@ -4 +4 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -162 +162 @@
           me.title,
           me.genre,
-          (CASE WHEN EXISTS (SELECT 1 from Song s where me.id = s.id and s.album is null) THEN 'SONG' ELSE 'ALBUM' END),
+          (CASE
+            WHEN EXISTS (SELECT 1 FROM Song s WHERE me.id = s.id AND s.album IS NULL) THEN 'SONG'
+            WHEN EXISTS (SELECT 1 FROM Album a WHERE a.id = me.id) THEN 'ALBUM'
+            ELSE NULL
+           END),
           me.cover,
           me.releaseDate

frontend/src/pages/MySongs.tsx

@@ -1 +1 @@
 import { useEffect, useState } from "react";
 import { Link, useNavigate } from "react-router-dom";
-import axiosInstance from "../api/axiosInstance";
+import axiosInstance, { baseURL } from "../api/axiosInstance";
 import { useAuth } from "../context/authContext";
 import type { CatalogItem } from "../utils/types";
@@ -155 +155 @@
                                                                                 </span>
                                                                                 <img
-                                                                                        src={song.cover || "/favicon.png"}
+                                                                                        src={
+                                                                                                song.cover ? `${baseURL}/${song.cover}` : "/favicon.png"
+                                                                                        }
                                                                                         alt={song.title}
                                                                                         className="w-12 h-12 rounded object-cover"
@@ -215 +217 @@
                                                                                 <div className="relative w-full pt-[100%] rounded-lg overflow-hidden mb-4 bg-[#282828]">
                                                                                         <img
-                                                                                                src={album.cover || "/favicon.png"}
+                                                                                                src={
+                                                                                                        album.cover
+                                                                                                                ? `${baseURL}/${album.cover}`
+                                                                                                                : "/favicon.png"
+                                                                                                }
                                                                                                 alt={album.title}
                                                                                                 className="absolute inset-0 w-full h-full object-cover"