Changeset c684a6d

Timestamp:

02/09/26 17:21:06 (5 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

8dd3e22

Parents:

2fa6841

Message:

add role flags to user dto;fix bug in song repository

Files:

• finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/UserResponseDto.java (modified) (2 diffs)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java (modified) (1 diff)
• finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java (modified) (1 diff)
• frontend/src/utils/types.ts (modified) (1 diff)

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

@@ -1 +1 @@
 package com.ukim.finki.develop.finkwave.model.dto;
 
-import com.ukim.finki.develop.finkwave.model.Role;
 import jakarta.annotation.Nullable;
 import lombok.Builder;
@@ -10 +9 @@
         String username,
         @Nullable String profilePhoto,
-        Role role){
-}
+        Boolean isAdmin,
+        @Nullable Boolean isArtist
+){}

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

@@ -119 +119 @@
                      JOIN songs s on s.id = l.song_id
                      JOIN users u ON u.user_id = me.released_by
-                     WHERE l.listener_id = 2
+                     WHERE l.listener_id = :userId
                  ORDER BY l.song_id, l.timestamp DESC
              ) t

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

@@ -209 +209 @@
                 .username(user.getUsername())
                 .profilePhoto(user.getProfilePhoto())
-                .role(user.getRole())
+                .isAdmin(user.getRole().equals(Role.ADMIN))
+                .isArtist(user.isArtist())
                 .build();
     }

frontend/src/utils/types.ts

@@ -4 +4 @@
         email?: string;
         profilePhoto?: string | null;
-        role?: "ADMIN" | "NONADMIN";
+        isAdmin: boolean;
+        isArtist: boolean;
 }