admin/nahodka-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from SlimusMinus/add_last-name

Browse Source 
added lastName on users
This commit is contained in:
SlimusMinus
2026-06-19 00:29:47 +03:00
committed by GitHub
parent fcbce215ad 5312f84eb8
commit 194b7efb8a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/krylov/refound/dto/UserResponseDto.java
View File

@@ -9,6 +9,7 @@ public class UserResponseDto {
private Long id; private Long id;
private String login; private String login;
private String name; private String name;
private String lastName;
private String phone; private String phone;
private String email; private String email;
private String avatar; private String avatar;

6
src/main/java/com/krylov/refound/service/UserService.java
View File

@@ -10,7 +10,6 @@ import jakarta.persistence.EntityNotFoundException;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -48,11 +47,11 @@ public class UserService {
User user = repository.findById(id) User user = repository.findById(id)
.orElseThrow(() -> new EntityNotFoundException("User not found")); .orElseThrow(() -> new EntityNotFoundException("User not found"));
user.setLogin(dto.getLogin());
user.setName(dto.getFirstName()); user.setName(dto.getFirstName());
user.setLogin(dto.getLastName()); user.setLastName(dto.getLastName());
user.setPhone(dto.getPhone()); user.setPhone(dto.getPhone());
user.setEmail(dto.getEmail()); user.setEmail(dto.getEmail());
user.setLogin(dto.getLogin());
MultipartFile avatar = dto.getAvatar(); MultipartFile avatar = dto.getAvatar();
if (avatar != null && !avatar.isEmpty()) { if (avatar != null && !avatar.isEmpty()) {
@@ -74,6 +73,7 @@ public class UserService {
.name(user.getName()) .name(user.getName())
.phone(user.getPhone()) .phone(user.getPhone())
.email(user.getEmail()) .email(user.getEmail())
.lastName(user.getLastName())
.avatar(user.getAvatarUrl()) .avatar(user.getAvatarUrl())
.build(); .build();
} }