From 5312f84eb8dcd859fb70d327bb7e9a6a52138c13 Mon Sep 17 00:00:00 2001
From: SlimusMinus <moscow_city231@rambler.ru>
Date: Fri, 19 Jun 2026 00:29:05 +0300
Subject: [PATCH] added lastName on users

---
 src/main/java/com/krylov/refound/dto/UserResponseDto.java | 1 +
 src/main/java/com/krylov/refound/service/UserService.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/krylov/refound/dto/UserResponseDto.java b/src/main/java/com/krylov/refound/dto/UserResponseDto.java
index 832055c..2185727 100644
--- a/src/main/java/com/krylov/refound/dto/UserResponseDto.java
+++ b/src/main/java/com/krylov/refound/dto/UserResponseDto.java
@@ -9,6 +9,7 @@ public class UserResponseDto {
   private Long id;
   private String login;
   private String name;
+  private String lastName;
   private String phone;
   private String email;
   private String avatar;
diff --git a/src/main/java/com/krylov/refound/service/UserService.java b/src/main/java/com/krylov/refound/service/UserService.java
index 3751619..54913ac 100644
--- a/src/main/java/com/krylov/refound/service/UserService.java
+++ b/src/main/java/com/krylov/refound/service/UserService.java
@@ -10,7 +10,6 @@ import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
@@ -48,11 +47,11 @@ public class UserService {
     User user = repository.findById(id)
         .orElseThrow(() -> new EntityNotFoundException("User not found"));
 
+    user.setLogin(dto.getLogin());
     user.setName(dto.getFirstName());
-    user.setLogin(dto.getLastName());
+    user.setLastName(dto.getLastName());
     user.setPhone(dto.getPhone());
     user.setEmail(dto.getEmail());
-    user.setLogin(dto.getLogin());
 
     MultipartFile avatar = dto.getAvatar();
     if (avatar != null && !avatar.isEmpty()) {
@@ -74,6 +73,7 @@ public class UserService {
         .name(user.getName())
         .phone(user.getPhone())
         .email(user.getEmail())
+        .lastName(user.getLastName())
         .avatar(user.getAvatarUrl())
         .build();
   }