Changeset 8dd3e22

Timestamp:

02/09/26 20:44:24 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

27660af

Parents:

c684a6d

Message:

add client side form for publishing new music with mock data and api calls

Files:

• finkwave/.gitignore (modified) (1 diff)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/SongController.java (modified) (2 diffs)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/MusicalEntitesByArtistDto.java (added)
• 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/App.tsx (modified) (3 diffs)
• frontend/src/pages/MySongs.tsx (added)
• frontend/src/pages/Nav.tsx (modified) (2 diffs)
• frontend/src/pages/PublishSong.tsx (added)
• frontend/src/utils/types.ts (modified) (1 diff)

finkwave/.gitignore

@@ -32 +32 @@
 ### VS Code ###
 .vscode/
-application.properties
+application*.properties
 
 uploads/profile-pictures/*

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

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.controller;
 
-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.SongDetailsDto;
-import com.ukim.finki.develop.finkwave.model.dto.SongDto;
+import com.ukim.finki.develop.finkwave.model.dto.*;
 import com.ukim.finki.develop.finkwave.repository.SongRepository;
 import com.ukim.finki.develop.finkwave.service.AuthService;
@@ -42 +39 @@
         return ResponseEntity.ok(songService.getSongDetails(songId));
     }
+
+    @GetMapping("/catalog")
+    public HttpEntity<List<MusicalEntitesByArtistDto>> getArtistCatalog(){
+        List<MusicalEntitesByArtistDto> artistCatalog = songService.getArtistCatalog();
+        return ResponseEntity.ok(artistCatalog);
+    }
 }

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

@@ -3 +3 @@
 import java.util.List;
 
+import com.ukim.finki.develop.finkwave.model.dto.MusicalEntitesByArtistDto;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -155 +156 @@
     """)
     SongDto getSongById(@Param("songId") Long songId, @Param("userId") Long userId);
+
+    @Query("""
+        SELECT new com.ukim.finki.develop.finkwave.model.dto.MusicalEntitesByArtistDto(
+          me.id,
+          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),
+          me.cover,
+          me.releaseDate
+        )
+        FROM MusicalEntity me
+        WHERE me.releasedBy.id = :artistId
+        ORDER BY me.releaseDate DESC
+    """)
+    List<MusicalEntitesByArtistDto> getMusicalEntitiesReleasedByArtist(@Param("artistId")Long artistId);
 }

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

@@ -54 +54 @@
         return songDetailsMapper.toSongDetailsDto(songDto, contributionsBySongId, reviewsForSongId);
     }
+
+    public List<MusicalEntitesByArtistDto> getArtistCatalog(){
+        Long userId = authService.getCurrentUserID();
+        return songRepository.getMusicalEntitiesReleasedByArtist(userId);
+    }
 }

frontend/src/App.tsx

@@ -17 +17 @@
 import Login from "./pages/Login";
 import MusicalCollection from "./pages/MusicalCollection";
+import MySongs from "./pages/MySongs";
 import Nav from "./pages/Nav";
+import PublishSong from "./pages/PublishSong";
 import Register from "./pages/Register";
 import SongDetail from "./pages/SongDetail";
@@ -28 +30 @@
         // show sidebar only if user is logged in and is on the landing page
         const isLandingPage = location.pathname === "/";
-        const [isSidebarOpen, setIsSidebarOpen] = useState(!!user && isLandingPage);
+        const [isSidebarOpen, setIsSidebarOpen] = useState(
+                !!user && isLandingPage && !user?.isArtist && !user?.isAdmin,
+        );
 
         // Open sidebar when user logs in and navigates to landing page
         useEffect(() => {
-                if (user && isLandingPage) {
+                if (user && isLandingPage && !user.isArtist && !user.isAdmin) {
                         setIsSidebarOpen(true);
                 }
@@ -104 +108 @@
                         },
                         {
+                                path: "/my-songs",
+                                element: <MySongs />,
+                        },
+                        {
+                                path: "/publish",
+                                element: <PublishSong />,
+                        },
+                        {
                                 path: "/songs/:id",
                                 element: <SongDetail />,

frontend/src/pages/Nav.tsx

@@ -22 +22 @@
                         setUser(undefined);
                         setIsDropdownOpen(false);
-                        toast.success("Logout successful!");
+                        window.location.href = "/";
+                        // toast.success("Logout successful!");
                 } catch (error) {
                         console.error("Logout failed:", error);
@@ -81 +82 @@
                                 {!isAuthLoading && (
                                         <div className="flex items-center space-x-3">
+                                                {user?.isArtist && (
+                                                        <Link
+                                                                to="/my-songs"
+                                                                className="text-white hover:text-[#1db954] px-4 py-2 text-sm font-medium transition-colors"
+                                                        >
+                                                                My Songs
+                                                        </Link>
+                                                )}
                                                 {user ? (
                                                         <div className="relative" ref={dropdownRef}>

frontend/src/utils/types.ts

@@ -108 +108 @@
         songCount: number;
 }
+
+export interface CatalogItem {
+        id: number;
+        title: string;
+        genre: string;
+        cover: string | null;
+        type: "SONG" | "ALBUM";
+        releaseDate: string;
+}