Changeset c6e1892

Timestamp:

01/26/26 21:59:38 (6 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

0f71490

Parents:

d47e225

Message:

move dto-s to model/dto

Location:

finkwave/src/main/java/com/ukim/finki/develop/finkwave

Files:

• controller/AuthController.java (modified) (1 diff)
• dto/LoginRequestDto.java (deleted)
• model/dto/AuthRequestDto.java (moved) (moved from finkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/AuthRequestDto.java ) (2 diffs)
• model/dto/LoginRequestDto.java (added)
• model/dto/UserResponseDto.java (moved) (moved from finkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/UserResponseDto.java ) (1 diff)
• service/AuthService.java (modified) (2 diffs)
• service/CustomUserDetailsService.java (modified) (1 diff)

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

@@ -13 +13 @@
 import org.springframework.web.server.ResponseStatusException;
 
-import com.ukim.finki.develop.finkwave.dto.AuthRequestDto;
-import com.ukim.finki.develop.finkwave.dto.LoginRequestDto;
-import com.ukim.finki.develop.finkwave.dto.UserResponseDto;
+import com.ukim.finki.develop.finkwave.model.dto.AuthRequestDto;
+import com.ukim.finki.develop.finkwave.model.dto.LoginRequestDto;
+import com.ukim.finki.develop.finkwave.model.dto.UserResponseDto;
 import com.ukim.finki.develop.finkwave.service.AuthService;
 

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

@@ -1 @@
-package com.ukim.finki.develop.finkwave.dto;
+package com.ukim.finki.develop.finkwave.model.dto;
 
 import jakarta.annotation.Nullable;
@@ -9 +9 @@
         String email,
         String password,
-        @Nullable MultipartFile profilePhoto
-){
+        @Nullable MultipartFile profilePhoto){
 }

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

@@ -1 @@
-package com.ukim.finki.develop.finkwave.dto;
+package com.ukim.finki.develop.finkwave.model.dto;
 
 import com.ukim.finki.develop.finkwave.model.Role;

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

@@ -5 +5 @@
 
 import com.ukim.finki.develop.finkwave.config.AuthProperties;
-import com.ukim.finki.develop.finkwave.dto.AuthRequestDto;
-import com.ukim.finki.develop.finkwave.dto.LoginRequestDto;
-import com.ukim.finki.develop.finkwave.dto.UserResponseDto;
+import com.ukim.finki.develop.finkwave.model.dto.AuthRequestDto;
+import com.ukim.finki.develop.finkwave.model.dto.LoginRequestDto;
+import com.ukim.finki.develop.finkwave.model.dto.UserResponseDto;
 import com.ukim.finki.develop.finkwave.model.NonAdminUser;
 import com.ukim.finki.develop.finkwave.model.RefreshToken;
@@ -100 +100 @@
     private User createNonAdminUser(AuthRequestDto authRequestDto) throws IOException {
         User.UserBuilder userBuilder = User.builder()
+                .username(authRequestDto.username())
                 .fullName(authRequestDto.fullname())
-                .username(authRequestDto.username())
                 .email(authRequestDto.email())
                 .password(passwordEncoder.encode(authRequestDto.password()))

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

@@ -22 +22 @@
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("user not found"));
-         List<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole().name()));
+        List<GrantedAuthority> authorities = List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole().name()));
         return new org.springframework.security.core.userdetails.User(
                 user.getUsername(),