Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 0598e57d

Přidáno uživatelem Jakub Šmíd před asi 2 roky(ů)

Added batch endpoint for saving multiple catalog items, POST and PUT endpoint for catalog items merged

re #9753

Zobrazit rozdíly:

backend/src/main/java/cz/zcu/kiv/backendapi/user/UserServiceImpl.java
66 66

  
67 67
    @Override
68 68
    public void registerNewUser(UserDto userDto) {
69
        log.info("Registering new user");
69 70
        if (userRepository.findByEmail(userDto.getEmail()).isPresent()) {
70 71
            log.error("Trying to register new user with username that is already taken: " + userDto.getEmail());
71 72
            throw new ApiRequestException(String.format("User with username %s already exists", userDto.getEmail()), HttpStatus.CONFLICT);
......
73 74
        UserEntity userEntity = new UserEntity();
74 75
        convertDtoToEntity(userDto, userEntity);
75 76
        userRepository.save(userEntity);
77
        log.info("New user registered");
76 78
    }
77 79

  
78 80
    @Override
79 81
    public void updatePermissions(String username, PermissionDto permissionDto) {
82
        log.info("Updating permissions to user: " + username);
80 83
        UserEntity userEntity = userRepository.findByEmail(username).orElseThrow(() -> {
81 84
            log.error(String.format(USER_NOT_FOUND, username));
82 85
            throw new UsernameNotFoundException(String.format(USER_NOT_FOUND, username));
......
87 90
        }
88 91
        userEntity.setPermissions(getPermissionsFromDto(permissionDto));
89 92
        userRepository.save(userEntity);
93
        log.info("Permissions to user " + username + " updated");
90 94
    }
91 95

  
92 96
    @Override
93 97
    public void resetPassword(String username, String newPassword) {
98
        log.info("Resetting password to user " + username);
94 99
        if (username.equals(SUPER_ADMIN_NAME)) {
95 100
            log.error("Password for SUPER ADMIN can not be changed");
96 101
            throw new ApiRequestException("Password for SUPER ADMIN can not be changed", HttpStatus.BAD_REQUEST);
......
101 106
        });
102 107
        userEntity.setPassword(bCryptPasswordEncoder.encode(newPassword));
103 108
        userRepository.save(userEntity);
109
        log.info("Password to user " + username + " reset");
104 110
    }
105 111

  
106 112
    @Override
107 113
    public void deleteUser(String username) {
114
        log.info("Deleting user " + username);
108 115
        UserEntity userEntity = userRepository.findByEmail(username).orElseThrow(() -> {
109 116
            log.error(String.format(USER_NOT_FOUND, username));
110 117
            throw new UsernameNotFoundException(String.format(USER_NOT_FOUND, username));
......
114 121
            throw new ApiRequestException("User with ADMIN rights can not be deleted", HttpStatus.BAD_REQUEST);
115 122
        }
116 123
        userRepository.delete(userEntity);
124
        log.info("User " + username + " deleted");
117 125
    }
118 126

  
119 127
    @Override
......
123 131

  
124 132
    @Override
125 133
    public void changePassword(String oldPassword, String newPassword) {
134
        log.info("Changing password to logged user");
126 135
        UserEntity loggedUser = getUserByName((String) SecurityContextHolder.getContext().getAuthentication().getPrincipal());
127 136
        if (loggedUser.getEmail().equals(SUPER_ADMIN_NAME)) {
128 137
            throw new ApiRequestException("Can not change password for SUPER ADMIN", HttpStatus.BAD_REQUEST);
......
132 141
        }
133 142
        loggedUser.setPassword(bCryptPasswordEncoder.encode(newPassword));
134 143
        userRepository.save(loggedUser);
144
        log.info("Password to logged user changed");
135 145
    }
136 146

  
137 147

  

Také k dispozici: Unified diff