refactor: [user] role entity 이름 변경

Role -> RoleEntity issue key : #78
zhyun-project · May 1, 2024 · 462811f · 462811f
1 parent 9b68624
commit 462811f
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 29 deletions.
diff --git a/simpleBoard02/b-server-user/src/main/java/kim/zhyun/serveruser/config/model/UserDto.java b/simpleBoard02/b-server-user/src/main/java/kim/zhyun/serveruser/config/model/UserDto.java
@@ -1,6 +1,6 @@
 package kim.zhyun.serveruser.config.model;
 
-import kim.zhyun.serveruser.domain.signup.repository.Role;
+import kim.zhyun.serveruser.domain.signup.repository.RoleEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -19,7 +19,7 @@ public class UserDto {
     private String nickname;
     private String password;
     private boolean withdrawal;
-    private Role role;
+    private RoleEntity role;
     private LocalDateTime modifiedAt;
 
 

diff --git a/...-user/src/main/java/kim/zhyun/serveruser/domain/member/controller/model/UserResponse.java b/...-user/src/main/java/kim/zhyun/serveruser/domain/member/controller/model/UserResponse.java
@@ -1,6 +1,6 @@
 package kim.zhyun.serveruser.domain.member.controller.model;
 
-import kim.zhyun.serveruser.domain.signup.repository.Role;
+import kim.zhyun.serveruser.domain.signup.repository.RoleEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -16,7 +16,7 @@ public class UserResponse {
     private Long id;
     private String email;
     private String nickname;
-    private Role role;
+    private RoleEntity role;
 
 
 

diff --git a/...server-user/src/main/java/kim/zhyun/serveruser/domain/member/converter/UserConverter.java b/...server-user/src/main/java/kim/zhyun/serveruser/domain/member/converter/UserConverter.java
@@ -4,7 +4,7 @@
 import kim.zhyun.serveruser.domain.member.controller.model.UserResponse;
 import kim.zhyun.serveruser.domain.member.repository.UserEntity;
 import kim.zhyun.serveruser.domain.signup.controller.model.SignupRequest;
-import kim.zhyun.serveruser.domain.signup.repository.Role;
+import kim.zhyun.serveruser.domain.signup.repository.RoleEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
@@ -33,12 +33,12 @@ public UserDto toDto(UserEntity source) {
                 .modifiedAt(source.getModifiedAt()).build();
     }
 
-    public UserEntity toEntity(SignupRequest request, Role role) {
+    public UserEntity toEntity(SignupRequest request, RoleEntity roleEntity) {
         return UserEntity.builder()
                 .email(request.getEmail())
                 .nickname(request.getNickname())
                 .password(passwordEncoder.encode(request.getPassword()))
-                .role(role)
+                .roleEntity(roleEntity)
                 .build();
     }
 

diff --git a/...b-server-user/src/main/java/kim/zhyun/serveruser/domain/member/repository/UserEntity.java b/...b-server-user/src/main/java/kim/zhyun/serveruser/domain/member/repository/UserEntity.java
@@ -1,7 +1,7 @@
 package kim.zhyun.serveruser.domain.member.repository;
 
 import jakarta.persistence.*;
-import kim.zhyun.serveruser.domain.signup.repository.Role;
+import kim.zhyun.serveruser.domain.signup.repository.RoleEntity;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
@@ -42,6 +42,7 @@ public class UserEntity {
 
     @ManyToOne
     private Role role;
+    private RoleEntity role;
 
     @Override
     public boolean equals(Object o) {

diff --git a/...b-server-user/src/main/java/kim/zhyun/serveruser/domain/member/service/MemberService.java b/...b-server-user/src/main/java/kim/zhyun/serveruser/domain/member/service/MemberService.java
@@ -9,7 +9,7 @@
 import kim.zhyun.serveruser.domain.member.controller.model.UserUpdateRequest;
 import kim.zhyun.serveruser.domain.member.repository.UserEntity;
 import kim.zhyun.serveruser.domain.member.repository.UserRepository;
-import kim.zhyun.serveruser.domain.signup.repository.Role;
+import kim.zhyun.serveruser.domain.signup.repository.RoleEntity;
 import kim.zhyun.serveruser.domain.signup.repository.RoleRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -152,8 +152,8 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
      * 회원 권한 설정
      */
     private void userSetRole(UserEntity userEntity, String roleType) {
-        Role role = roleRepository.findByGrade(roleType);
-        userEntity.setRole(role);
+        RoleEntity roleEntity = roleRepository.findByGrade(roleType);
+        userEntity.setRole(roleEntity);
         userEntity.setWithdrawal(TYPE_WITHDRAWAL.equals(roleType));
     }
 

diff --git a/...server-user/src/main/java/kim/zhyun/serveruser/domain/signup/business/SignUpBusiness.java b/...server-user/src/main/java/kim/zhyun/serveruser/domain/signup/business/SignUpBusiness.java
@@ -11,7 +11,7 @@
 import kim.zhyun.serveruser.domain.signup.converter.EmailAuthConverter;
 import kim.zhyun.serveruser.domain.signup.converter.NicknameReserveConverter;
 import kim.zhyun.serveruser.domain.signup.converter.SessionUserConverter;
-import kim.zhyun.serveruser.domain.signup.repository.Role;
+import kim.zhyun.serveruser.domain.signup.repository.RoleEntity;
 import kim.zhyun.serveruser.domain.signup.repository.SessionUser;
 import kim.zhyun.serveruser.domain.signup.service.EmailService;
 import kim.zhyun.serveruser.domain.signup.service.NicknameReserveService;
@@ -138,10 +138,10 @@ public String saveMember(String sessionId, SignupRequest request) {
                 || !sessionUser.getNickname().equals(request.getNickname()))
             throw new ApiException(EXCEPTION_REQUIRE_NICKNAME_DUPLICATE_CHECK);
 
-        Role role = signUpService.getGrade(sessionUser.getEmail());
+        RoleEntity roleEntity = signUpService.getGrade(sessionUser.getEmail());
 
         // 신규 user 등록
-        UserEntity savedUser = signUpService.saveUser(userConverter.toEntity(request, role));
+        UserEntity savedUser = signUpService.saveUser(userConverter.toEntity(request, roleEntity));
 
         // redis user info 저장소 업데이트
         signUpService.jwtUserInfoUpdate(savedUser);

diff --git a/...eruser/domain/signup/repository/Role.java → .../domain/signup/repository/RoleEntity.java b/...eruser/domain/signup/repository/Role.java → .../domain/signup/repository/RoleEntity.java
@@ -1,19 +1,16 @@
 package kim.zhyun.serveruser.domain.signup.repository;
 
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.Getter;
 
 import java.util.Objects;
 
 import static jakarta.persistence.GenerationType.IDENTITY;
 
 @Getter
-@Entity
-public class Role {
+@Entity(name = "role")
+public class RoleEntity {
 
     @Id @GeneratedValue(strategy = IDENTITY)
     private Long id;
@@ -25,10 +22,10 @@ public class Role {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof Role role)) return false;
-        return Objects.equals(getId(), role.getId())
-                && Objects.equals(getGrade(), role.getGrade())
-                && Objects.equals(getDescription(), role.getDescription());
+        if (!(o instanceof RoleEntity roleEntity)) return false;
+        return Objects.equals(getId(), roleEntity.getId())
+                && Objects.equals(getGrade(), roleEntity.getGrade())
+                && Objects.equals(getDescription(), roleEntity.getDescription());
     }
 
     @Override

diff --git a/...rver-user/src/main/java/kim/zhyun/serveruser/domain/signup/repository/RoleRepository.java b/...rver-user/src/main/java/kim/zhyun/serveruser/domain/signup/repository/RoleRepository.java
@@ -4,10 +4,10 @@
 
 import java.util.List;
 
-public interface RoleRepository extends Repository<Role, Long> {
+public interface RoleRepository extends Repository<RoleEntity, Long> {
 
-    List<Role> findAll();
-    Role findByGrade(String grade);
+    List<RoleEntity> findAll();
+    RoleEntity findByGrade(String grade);
     boolean existsByGrade(String grade);
 
 }
diff --git a/...b-server-user/src/main/java/kim/zhyun/serveruser/domain/signup/service/SignUpService.java b/...b-server-user/src/main/java/kim/zhyun/serveruser/domain/signup/service/SignUpService.java
@@ -4,7 +4,7 @@
 import kim.zhyun.jwt.domain.repository.JwtUserInfoRepository;
 import kim.zhyun.serveruser.domain.member.repository.UserEntity;
 import kim.zhyun.serveruser.domain.member.repository.UserRepository;
-import kim.zhyun.serveruser.domain.signup.repository.Role;
+import kim.zhyun.serveruser.domain.signup.repository.RoleEntity;
 import kim.zhyun.serveruser.domain.signup.repository.RoleRepository;
 import lombok.RequiredArgsConstructor;
 import org.apache.logging.log4j.util.Strings;
@@ -35,7 +35,7 @@ public boolean isUsedNickname(String nickname) {
         return userRepository.existsByNicknameIgnoreCase(nickname);
     }
 
-    public Role getGrade(String email) {
+    public RoleEntity getGrade(String email) {
         // admin 유저 구분
         String admins = Strings.join(adminEmails, ',');
         String grade  = admins == null || !admins.contains(email)