dev add rest for company, add link for users , update reg users

2026-01-29 19:24:36 +07:00
parent 96acf796b2
commit 6ee7ab4d04
19 changed files with 776 additions and 24 deletions
@@ -61,10 +61,6 @@ public class UserService {
            user.setFullName(request.getFullName());
        }

-        if (request.getCompany() != null) {
-            user.setCompany(request.getCompany());
-        }
-
        if (request.getEmail() != null && !request.getEmail().equals(user.getEmail())) {
            if (userRepository.existsByEmail(request.getEmail())) {
                throw new InvalidUserEmail("Email already exists: " + request.getEmail());
@@ -87,7 +83,7 @@ public class UserService {
        return UserDTO.builder()
                .fullName(user.getFullName())
                .email(user.getEmail())
-                .company(user.getCompany())
+                .company(user.getCompany().getCompanyName())
                .phone(user.getPhone())
                .genderType(user.getGenderType())
                .birthday(user.getBirthday())