[250406] User : 빌더 패턴으로 객체생성 통일 / userId기준으로 토큰 생성 / Users 엔티티네임 변경 / users 데이터 저장 오류 수정

HJjung1234 · HJjung1234 · commit fce81e9fb35b · 2025-04-06T15:57:52.000+09:00
diff --git a/src/main/java/com/ecommerce/member/dto/requset/RegisterRequest.java b/src/main/java/com/ecommerce/member/dto/requset/RegisterRequest.java
@@ -1,5 +1,11 @@
 package com.ecommerce.member.dto.requset;
 
+import io.micrometer.common.util.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@AllArgsConstructor
 public class RegisterRequest {
 
     public String email;
@@ -13,14 +19,7 @@ public class RegisterRequest {
     public String password;
 
     public boolean hasNotPassword() {
-        return password == null || password.isBlank();
+        return StringUtils.isBlank(password) || StringUtils.isEmpty(password);
     }
 
-    public RegisterRequest(String email, String userName, String phoneNumber, String role, String password) {
-        this.email = email;
-        this.userName = userName;
-        this.phoneNumber = phoneNumber;
-        this.role = role;
-        this.password = password;
-    }
 }
diff --git a/src/main/java/com/ecommerce/member/memberController/MemberController.java b/src/main/java/com/ecommerce/member/memberController/MemberController.java
@@ -4,9 +4,9 @@
 import com.ecommerce.member.dto.requset.ModifyUserRequest;
 import com.ecommerce.member.dto.requset.RegisterRequest;
 import com.ecommerce.member.dto.response.LoginResponse;
-import com.ecommerce.member.memberEntity.UserEntity;
+import com.ecommerce.member.memberEntity.Users;
 import com.ecommerce.member.memberService.UserService;
-import com.ecommerce.util.JwtUtil;
+import com.ecommerce.util.JwtService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -21,17 +21,17 @@
 @RequiredArgsConstructor
 public class MemberController {
 
-    private final JwtUtil jwtUtil;
+    private final JwtService jwtService;
     private final UserService userService;
 
     @PostMapping("/member/users/registration")
-    public UserEntity register(@RequestBody RegisterRequest registerRequest) throws NoSuchAlgorithmException {
+    public Users register(@RequestBody RegisterRequest registerRequest) throws NoSuchAlgorithmException {
         return userService.registerUser(registerRequest);
     }
 
     @PostMapping("/member/users/modify")
-    public UserEntity modifyUser(@RequestBody ModifyUserRequest dto, @RequestHeader("Authorization") String token) {
-        String email = jwtUtil.extractEmail(token);
+    public Users modifyUser(@RequestBody ModifyUserRequest dto, @RequestHeader("Authorization") String token) {
+        String email = jwtService.generateToken(token);
         return userService.modifyUser(email, dto);
     }
 
diff --git a/src/main/java/com/ecommerce/member/memberEntity/UserEntity.java b/src/main/java/com/ecommerce/member/memberEntity/UserEntity.java
diff --git a/src/main/java/com/ecommerce/member/memberEntity/Users.java b/src/main/java/com/ecommerce/member/memberEntity/Users.java
@@ -0,0 +1,44 @@
+package com.ecommerce.member.memberEntity;
+
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Table(name = "users")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Users {
+
+    @Id
+    @Column(name = "user_id", nullable = false)
+    public String userId;
+
+    @Column(unique = true)
+    public String email;
+
+    public String password;
+
+    public String salt;
+
+    @Column(name = "user_name")
+    public String userName;
+
+    @Column(name = "phone_number", unique = true)
+    public String phoneNumber;
+
+    public String role;
+
+    public static Users of(String userId, String email, String password, String salt, String userName, String phoneNumber, String role) {
+        return Users.builder()
+                .userId(userId).email(email).password(password).salt(salt).userName(userName).phoneNumber(phoneNumber).role(role)
+                .build();
+    }
+
+}
diff --git a/src/main/java/com/ecommerce/member/memberRepository/UserRepository.java b/src/main/java/com/ecommerce/member/memberRepository/UserRepository.java
@@ -1,12 +1,12 @@
 package com.ecommerce.member.memberRepository;
 
-import com.ecommerce.member.memberEntity.UserEntity;
+import com.ecommerce.member.memberEntity.Users;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
-public interface UserRepository extends JpaRepository<UserEntity, Long> {
+public interface UserRepository extends JpaRepository<Users, Long> {
 
-    Optional<UserEntity> findByEmail(String email);
+    Optional<Users> findByEmail(String email);
 
 }
diff --git a/src/main/java/com/ecommerce/member/memberService/UserService.java b/src/main/java/com/ecommerce/member/memberService/UserService.java
@@ -4,36 +4,38 @@
 import com.ecommerce.member.dto.requset.ModifyUserRequest;
 import com.ecommerce.member.dto.requset.RegisterRequest;
 import com.ecommerce.member.dto.response.LoginResponse;
-import com.ecommerce.member.memberEntity.UserEntity;
+import com.ecommerce.member.memberEntity.Users;
 import com.ecommerce.member.memberRepository.UserRepository;
-import com.ecommerce.util.JwtUtil;
+import com.ecommerce.util.JwtService;
 import com.ecommerce.util.PasswordUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.security.NoSuchAlgorithmException;
+import java.util.UUID;
 
 @Service
 @RequiredArgsConstructor
 public class UserService {
 
-    private final JwtUtil jwtUtil;
+    private final JwtService jwtService;
     private final UserRepository userRepository;
 
-    public UserEntity registerUser(RegisterRequest registerRequest) throws NoSuchAlgorithmException {
+    public Users registerUser(RegisterRequest registerRequest) throws NoSuchAlgorithmException {
         if (registerRequest.hasNotPassword()) {
             throw new IllegalArgumentException("Entering password is necessary");
         }
 
         String salt = PasswordUtil.generateSalt();
         String hashWithSalt = PasswordUtil.hashWithSalt(registerRequest.password, salt);
+        String userId = UUID.randomUUID().toString();
 
-        var user = new UserEntity(registerRequest.email, registerRequest.userName, hashWithSalt, salt, registerRequest.phoneNumber, registerRequest.role);
+        var user = Users.of(userId, registerRequest.email, hashWithSalt, salt, registerRequest.userName, registerRequest.phoneNumber, registerRequest.role);
 
         return userRepository.save(user);
     }
 
-    public UserEntity modifyUser(String email, ModifyUserRequest dto) {
+    public Users modifyUser(String email, ModifyUserRequest dto) {
         var user = userRepository.findByEmail(email)
                 .orElseThrow(() -> new IllegalArgumentException("User not found"));
 
@@ -45,14 +47,14 @@ public UserEntity modifyUser(String email, ModifyUserRequest dto) {
 
 
     public LoginResponse responseToken(LoginRequest loginRequest) throws NoSuchAlgorithmException {
-        UserEntity loginUser = checkValidPasswd(loginRequest);
-        String token = jwtUtil.generateToken(loginUser.email);
+        Users loginUser = checkValidPasswd(loginRequest);
+        String token = jwtService.generateToken(loginUser.userId);
 
         return new LoginResponse(token);
     }
 
-    public UserEntity checkValidPasswd(LoginRequest loginRequest) throws NoSuchAlgorithmException {
-        UserEntity user = getUserByEmail(loginRequest);
+    public Users checkValidPasswd(LoginRequest loginRequest) throws NoSuchAlgorithmException {
+        Users user = getUserByEmail(loginRequest);
         String hashWithSalt = PasswordUtil.hashWithSalt(loginRequest.password, user.salt);
 
         if (!hashWithSalt.equals(user.password)) {
@@ -62,7 +64,7 @@ public UserEntity checkValidPasswd(LoginRequest loginRequest) throws NoSuchAlgor
         return user;
     }
 
-    private UserEntity getUserByEmail(LoginRequest loginRequest) {
+    private Users getUserByEmail(LoginRequest loginRequest) {
         return userRepository.findByEmail(loginRequest.email)
                 .orElseThrow(() -> new IllegalArgumentException("User not found"));
     }
diff --git a/src/main/java/com/ecommerce/util/JsonUtilsDeco.java b/src/main/java/com/ecommerce/util/JsonUtilsDeco.java
@@ -3,9 +3,6 @@
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-
-import java.util.Map;
 
 public interface JsonUtilsDeco {
     Gson prettyGson = new GsonBuilder()
@@ -23,9 +20,4 @@ public interface JsonUtilsDeco {
             .serializeNulls()
             .create();
 
-    static String convertMapToJsonString(Map<String, String> payload) {
-        JsonObject obj = new JsonObject();
-        payload.forEach(obj::addProperty);
-        return prettyGson.toJson(obj);
-    }
 }
diff --git a/src/main/java/com/ecommerce/util/JwtService.java b/src/main/java/com/ecommerce/util/JwtService.java
@@ -10,7 +10,7 @@
 
 @Component
 @RequiredArgsConstructor
-public class JwtUtil {
+public class JwtService {
 
     private final JwtKeyProvider keyProvider;
 
@@ -25,7 +25,7 @@ public String generateToken(String id) {
 
     }
 
-    public String extractEmail(String token) {
+    public String extractUserId(String token) {
         Jws<Claims> claimsJws = Jwts.parser().verifyWith(keyProvider.getKey()).build().parseSignedClaims(token);
         return replacePrefix(claimsJws.getPayload().getSubject());
     }
diff --git a/src/test/java/com/ecommerce/member/memberService/UserServiceTest.java b/src/test/java/com/ecommerce/member/memberService/UserServiceTest.java
@@ -4,8 +4,7 @@
 import com.ecommerce.member.dto.requset.ModifyUserRequest;
 import com.ecommerce.member.dto.requset.RegisterRequest;
 import com.ecommerce.member.dto.response.LoginResponse;
-import com.ecommerce.member.memberEntity.UserEntity;
-import com.ecommerce.member.memberRepository.UserRepository;
+import com.ecommerce.member.memberEntity.Users;
 import com.ecommerce.util.JsonUtilsDeco;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -16,20 +15,10 @@
 
 import static org.assertj.core.api.BDDAssertions.then;
 
-//@SpringBootTest(classes ={
-//          UserEntity.class
-//        , UserService.class
-//        , JwtUtil.class
-//        , JwtKeyProvider.class
-//        , PasswordUtil.class})
-//@EnableJpaRepositories(basePackages ="com.ecommerce.member.memberRepository")
-//@EntityScan(basePackages ="com.ecommerce.member.UserEntity")
-//@DataJpaTest
 @SpringBootTest
 class UserServiceTest {
 
     @Autowired private UserService sut;
-    @Autowired private UserRepository userRepository;
 
 
     @Test
@@ -44,10 +33,10 @@ void isBeanNotEmpty() {
     void registerTest() throws NoSuchAlgorithmException {
 
         // Given
-        RegisterRequest registerRequest = new RegisterRequest("abcd@mail.com", "tempuser", "010-0000-0000", "CUSTOMER", "passwordTest");
+        var registerRequest = new RegisterRequest("abcd@mail.com", "tempuser", "010-0000-0000", "CUSTOMER", "passwordTest");
 
         // When
-        UserEntity userEntity = sut.registerUser(registerRequest);
+        Users userEntity = sut.registerUser(registerRequest);
 
         // Then
         then(userEntity).isNotNull();
diff --git a/src/test/java/com/ecommerce/util/JwtServiceTest.java b/src/test/java/com/ecommerce/util/JwtServiceTest.java
@@ -3,22 +3,20 @@
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import static org.assertj.core.api.BDDAssertions.then;
 
 @Slf4j
 @SpringBootTest
-class JwtUtilTest {
+class JwtServiceTest {
 
-    @Autowired private JwtUtil jwtUtil;
+    @Autowired private JwtService jwtService;
 
     @Test
     void isBeanNotNull() {
-        then(jwtUtil).isNotNull();
+        then(jwtService).isNotNull();
     }
 
 
@@ -27,10 +25,10 @@ void isBeanNotNull() {
     void generateTokenTest() {
 
         // Given
-        String email = "abcd@mail.com";
+        String userId = "e7a96106-c4bb-457e-9e86-c859e93b21a9";
 
         // When
-        String token = jwtUtil.generateToken(email);
+        String token = jwtService.generateToken(userId);
 
         // Then
         then(token).isNotNull();
@@ -39,16 +37,17 @@ void generateTokenTest() {
     }
 
     @Test
-    void extractEmail() {
+    void extractUserId() {
+
         // Given
-        String email = "abcd@mail.com";
+        String userId = "e7a96106-c4bb-457e-9e86-c859e93b21a9";
 
         // When
-        String token = jwtUtil.generateToken(email);
-        String extractEmail = jwtUtil.extractEmail(token);
+        String token = jwtService.generateToken(userId);
+        String extractEmail = jwtService.extractUserId(token);
 
         // Then
         then(extractEmail).isNotNull();
-        log.info("extractEmail >> {}", extractEmail);
+        log.info("extractUserId >> {}", extractEmail);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`@Component`
`12`	`12`	`@RequiredArgsConstructor`
`13`		`-public class JwtUtil {`
	`13`	`+public class JwtService {`
`14`	`14`
`15`	`15`	`private final JwtKeyProvider keyProvider;`
`16`	`16`
`@@ -25,7 +25,7 @@ public String generateToken(String id) {`
`25`	`25`
`26`	`26`	`}`
`27`	`27`
`28`		`- public String extractEmail(String token) {`
	`28`	`+ public String extractUserId(String token) {`
`29`	`29`	`Jws<Claims> claimsJws = Jwts.parser().verifyWith(keyProvider.getKey()).build().parseSignedClaims(token);`
`30`	`30`	`return replacePrefix(claimsJws.getPayload().getSubject());`
`31`	`31`	`}`