Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -48,6 +48,16 @@ public class UserController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/get/username/{username}")
|
||||||
|
public ResponseEntity<User> getUserByUsername(@PathVariable("username") String username) {
|
||||||
|
User user = userService.getUserByUsernameService(username);
|
||||||
|
if (user != null) {
|
||||||
|
return new ResponseEntity<>(user, HttpStatus.OK);
|
||||||
|
} else {
|
||||||
|
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping("/create/{id}")
|
@PostMapping("/create/{id}")
|
||||||
public ResponseEntity<User> createUser(@RequestBody User user) {
|
public ResponseEntity<User> createUser(@RequestBody User user) {
|
||||||
User createdUser = userService.createUser(user);
|
User createdUser = userService.createUser(user);
|
||||||
|
|||||||
@@ -11,4 +11,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
|
|||||||
|
|
||||||
Optional<User> findUserByName(String name);
|
Optional<User> findUserByName(String name);
|
||||||
|
|
||||||
|
Optional<User> findUserByUsername(String username);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,10 @@ public class UserService {
|
|||||||
return userRepository.findUserByName(name).orElse(null);
|
return userRepository.findUserByName(name).orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public User getUserByUsernameService(String username){
|
||||||
|
return userRepository.findUserByUsername(username).orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
public User createUser(User user) {
|
public User createUser(User user) {
|
||||||
return userRepository.save(user);
|
return userRepository.save(user);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ create table if not exists User
|
|||||||
(
|
(
|
||||||
id int not null auto_increment,
|
id int not null auto_increment,
|
||||||
name varchar(45) not null,
|
name varchar(45) not null,
|
||||||
username varchar(100) not null,
|
username varchar(100) not null unique,
|
||||||
password varchar(100) not null,
|
password varchar(100) not null,
|
||||||
primary key (id)
|
primary key (id)
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user