Skip to content
Merged
Prev Previous commit
Next Next commit
Simplify Controller
  • Loading branch information
MangKyu committed Mar 18, 2021
commit 096201ee0180b2f30040b14d417c386aa64196d6
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package com.mang.example.security.app.user.controller;

import com.mang.example.security.app.user.domain.User;
import com.mang.example.security.app.user.dto.SignUpDTO;
import com.mang.example.security.app.user.dto.UserListResponseDTO;
import com.mang.example.security.app.user.service.UserService;
import com.mang.example.security.enums.role.UserRole;
import com.mang.example.security.utils.TokenUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.http.ResponseEntity;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.web.bind.annotation.*;

@RequiredArgsConstructor
Expand All @@ -18,20 +15,13 @@
@Log4j2
public class UserController {

private final BCryptPasswordEncoder passwordEncoder;
private final UserService userService;

@PostMapping(value = "/signUp")
public ResponseEntity<String> signUp(@RequestBody SignUpDTO signUpDTO) {
User user = User.builder()
.email(signUpDTO.getEmail())
.pw(passwordEncoder.encode(signUpDTO.getPw()))
.role(UserRole.ROLE_USER)
.build();

return userService.findByEmail(user.getEmail()).isPresent()
return userService.findByEmail(signUpDTO.getEmail()).isPresent()
? ResponseEntity.badRequest().build()
: ResponseEntity.ok(TokenUtils.generateJwtToken(userService.signUp(user)));
: ResponseEntity.ok(TokenUtils.generateJwtToken(userService.signUp(signUpDTO)));
}

@GetMapping(value = "/list")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package com.mang.example.security.app.user.service;

import com.mang.example.security.app.user.domain.User;
import com.mang.example.security.app.user.dto.SignUpDTO;

import java.util.List;
import java.util.Optional;

public interface UserService {

User signUp(final User user);
User signUp(SignUpDTO signUpDTO);

Optional<User> findByEmail(final String email);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
package com.mang.example.security.app.user.service;

import com.mang.example.security.app.user.domain.User;
import com.mang.example.security.app.user.dto.SignUpDTO;
import com.mang.example.security.app.user.repository.UserRepository;
import com.mang.example.security.enums.role.UserRole;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Optional;

@RequiredArgsConstructor
@Service("userService")
@Service
public class UserServiceImpl implements UserService {

private final UserRepository userRepository;
private final BCryptPasswordEncoder passwordEncoder;

@Override
public User signUp(User user) {
public User signUp(SignUpDTO signUpDTO) {
User user = User.builder()
.email(signUpDTO.getEmail())
.pw(passwordEncoder.encode(signUpDTO.getPw()))
.role(UserRole.ROLE_USER)
.build();

return userRepository.save(user);
}

Expand All @@ -28,5 +38,4 @@ public Optional<User> findByEmail(final String email) {
public List<User> findAll() {
return userRepository.findAll();
}

}