Merge pull request #75 from IoTeaTime/refactor/74-kan-130-user-to-member

refactor: User -> Member 키워드 변경
IoTeaTime · Nov 5, 2024 · 3294f7f · 3294f7f
2 parents 62640c6 + 4664426
commit 3294f7f
Show file tree

Hide file tree

Showing 40 changed files with 296 additions and 294 deletions.
diff --git a/src/main/java/org/ioteatime/meonghanyangserver/auth/controller/AuthApi.java b/src/main/java/org/ioteatime/meonghanyangserver/auth/controller/AuthApi.java
@@ -8,7 +8,7 @@
 import org.ioteatime.meonghanyangserver.auth.dto.request.LoginRequest;
 import org.ioteatime.meonghanyangserver.auth.dto.request.VerifyEmailRequest;
 import org.ioteatime.meonghanyangserver.common.api.Api;
-import org.ioteatime.meonghanyangserver.user.dto.request.JoinRequest;
+import org.ioteatime.meonghanyangserver.member.dto.request.JoinRequest;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @Tag(name = "Auth Api", description = "인증 관련 API 목록입니다.")

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/auth/controller/AuthController.java b/src/main/java/org/ioteatime/meonghanyangserver/auth/controller/AuthController.java
@@ -8,7 +8,7 @@
 import org.ioteatime.meonghanyangserver.auth.service.AuthService;
 import org.ioteatime.meonghanyangserver.common.api.Api;
 import org.ioteatime.meonghanyangserver.common.type.AuthSuccessType;
-import org.ioteatime.meonghanyangserver.user.dto.request.JoinRequest;
+import org.ioteatime.meonghanyangserver.member.dto.request.JoinRequest;
 import org.springframework.web.bind.annotation.*;
 
 @RestController

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/auth/dto/reponse/LoginResponse.java b/src/main/java/org/ioteatime/meonghanyangserver/auth/dto/reponse/LoginResponse.java
@@ -1,16 +1,21 @@
 package org.ioteatime.meonghanyangserver.auth.dto.reponse;
 
-import lombok.AllArgsConstructor;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class LoginResponse {
-    private Long userId;
-    private String accessToken;
-    private String refreshToken;
+public record LoginResponse(
+        @NotNull @Schema(description = "회원 ID", example = "1") Long memberId,
+        @NotBlank @Schema(description = "회원 AccessToken", example = "Bearer abcd...")
+                String accessToken,
+        @NotBlank @Schema(description = "회원 RefreshToken", example = "Bearer abcd...")
+                String refreshToken) {
+
+    @Builder
+    public LoginResponse(Long memberId, String accessToken, String refreshToken) {
+        this.memberId = memberId;
+        this.accessToken = accessToken;
+        this.refreshToken = refreshToken;
+    }
 }
diff --git a/src/main/java/org/ioteatime/meonghanyangserver/auth/mapper/AuthEntityMapper.java b/src/main/java/org/ioteatime/meonghanyangserver/auth/mapper/AuthEntityMapper.java
@@ -1,11 +1,11 @@
 package org.ioteatime.meonghanyangserver.auth.mapper;
 
-import org.ioteatime.meonghanyangserver.user.domain.UserEntity;
-import org.ioteatime.meonghanyangserver.user.dto.request.JoinRequest;
+import org.ioteatime.meonghanyangserver.member.domain.MemberEntity;
+import org.ioteatime.meonghanyangserver.member.dto.request.JoinRequest;
 
 public class AuthEntityMapper {
-    public static UserEntity of(JoinRequest userDto, String encodedPassword) {
-        return UserEntity.builder()
+    public static MemberEntity of(JoinRequest userDto, String encodedPassword) {
+        return MemberEntity.builder()
                 .nickname(userDto.getNickname())
                 .email(userDto.getEmail())
                 .password(encodedPassword)

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/auth/mapper/AuthResponseMapper.java b/src/main/java/org/ioteatime/meonghanyangserver/auth/mapper/AuthResponseMapper.java
@@ -2,16 +2,16 @@
 
 import org.ioteatime.meonghanyangserver.auth.dto.reponse.LoginResponse;
 import org.ioteatime.meonghanyangserver.auth.dto.reponse.RefreshResponse;
-import org.ioteatime.meonghanyangserver.user.dto.response.UserSimpleResponse;
+import org.ioteatime.meonghanyangserver.member.dto.response.MemberSimpleResponse;
 
 public class AuthResponseMapper {
-    public static UserSimpleResponse from(Long id, String email) {
-        return new UserSimpleResponse(id, email);
+    public static MemberSimpleResponse from(Long id, String email) {
+        return new MemberSimpleResponse(id, email);
     }
 
     public static LoginResponse from(Long id, String accessToken, String refreshToken) {
         return LoginResponse.builder()
-                .userId(id)
+                .memberId(id)
                 .accessToken(accessToken)
                 .refreshToken(refreshToken)
                 .build();

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/auth/service/AuthService.java b/src/main/java/org/ioteatime/meonghanyangserver/auth/service/AuthService.java
@@ -16,21 +16,21 @@
 import org.ioteatime.meonghanyangserver.common.type.AuthErrorType;
 import org.ioteatime.meonghanyangserver.common.utils.JwtUtils;
 import org.ioteatime.meonghanyangserver.device.repository.DeviceRepository;
+import org.ioteatime.meonghanyangserver.member.domain.MemberEntity;
+import org.ioteatime.meonghanyangserver.member.dto.request.JoinRequest;
+import org.ioteatime.meonghanyangserver.member.dto.response.MemberSimpleResponse;
+import org.ioteatime.meonghanyangserver.member.repository.MemberRepository;
 import org.ioteatime.meonghanyangserver.redis.EmailCode;
 import org.ioteatime.meonghanyangserver.redis.EmailCodeRepository;
 import org.ioteatime.meonghanyangserver.redis.RefreshToken;
 import org.ioteatime.meonghanyangserver.redis.RefreshTokenRepository;
-import org.ioteatime.meonghanyangserver.user.domain.UserEntity;
-import org.ioteatime.meonghanyangserver.user.dto.request.JoinRequest;
-import org.ioteatime.meonghanyangserver.user.dto.response.UserSimpleResponse;
-import org.ioteatime.meonghanyangserver.user.repository.UserRepository;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class AuthService {
-    private final UserRepository userRepository;
+    private final MemberRepository memberRepository;
     private final GoogleMailClient googleMailClient;
     private final BCryptPasswordEncoder bCryptPasswordEncoder;
     private final JwtUtils jwtUtils;
@@ -39,19 +39,19 @@ public class AuthService {
     private final DeviceRepository deviceRepository;
 
     public LoginResponse login(LoginRequest loginRequest) {
-        UserEntity userEntity =
-                userRepository
+        MemberEntity memberEntity =
+                memberRepository
                         .findByEmail(loginRequest.email())
                         .orElseThrow(() -> new NotFoundException(AuthErrorType.NOT_FOUND));
 
         boolean passwordMatch =
-                bCryptPasswordEncoder.matches(loginRequest.password(), userEntity.getPassword());
+                bCryptPasswordEncoder.matches(loginRequest.password(), memberEntity.getPassword());
         if (!passwordMatch) {
             throw new BadRequestException(AuthErrorType.PASSWORD_NOT_MATCH);
         }
 
-        String accessToken = jwtUtils.generateAccessToken(userEntity);
-        String refreshToken = jwtUtils.generateRefreshToken(userEntity);
+        String accessToken = jwtUtils.generateAccessToken(memberEntity);
+        String refreshToken = jwtUtils.generateRefreshToken(memberEntity);
 
         if (accessToken.isEmpty() || refreshToken.isEmpty()) {
             throw new NotFoundException(AuthErrorType.TOKEN_NOT_FOUND);
@@ -62,15 +62,15 @@ public LoginResponse login(LoginRequest loginRequest) {
         accessToken = jwtUtils.includeBearer(accessToken);
         refreshToken = jwtUtils.includeBearer(refreshToken);
 
-        return AuthResponseMapper.from(userEntity.getId(), accessToken, refreshToken);
+        return AuthResponseMapper.from(memberEntity.getId(), accessToken, refreshToken);
     }
 
-    public UserSimpleResponse joinProcess(JoinRequest userDto) {
+    public MemberSimpleResponse joinProcess(JoinRequest userDto) {
         String encodedPassword = bCryptPasswordEncoder.encode(userDto.getPassword());
         verifyEmail(userDto.getEmail());
-        UserEntity user = userRepository.save(AuthEntityMapper.of(userDto, encodedPassword));
+        MemberEntity member = memberRepository.save(AuthEntityMapper.of(userDto, encodedPassword));
 
-        return AuthResponseMapper.from(user.getId(), user.getEmail());
+        return AuthResponseMapper.from(member.getId(), member.getEmail());
     }
 
     public void send(String email) {
@@ -103,7 +103,7 @@ private static String getCode() {
     }
 
     public void verifyEmail(String email) {
-        if (userRepository.findByEmail(email).isPresent()) {
+        if (memberRepository.findByEmail(email).isPresent()) {
             throw new BadRequestException(AuthErrorType.EMAIL_DUPLICATED);
         }
     }

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/common/utils/JwtUtils.java b/src/main/java/org/ioteatime/meonghanyangserver/common/utils/JwtUtils.java
@@ -10,7 +10,7 @@
 import java.util.Objects;
 import javax.crypto.SecretKey;
 import lombok.extern.slf4j.Slf4j;
-import org.ioteatime.meonghanyangserver.user.domain.UserEntity;
+import org.ioteatime.meonghanyangserver.member.domain.MemberEntity;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
@@ -25,14 +25,14 @@ public JwtUtils(Environment env) {
         this.key = Keys.hmacShaKeyFor(decodedKey);
     }
 
-    public String generateAccessToken(UserEntity userEntity) {
+    public String generateAccessToken(MemberEntity memberEntity) {
         Date nowDate = new Date();
         Date expiration = new Date(nowDate.getTime() + Duration.ofHours(2).toMillis());
         String jwtToken =
                 Jwts.builder()
-                        .claim("name", userEntity.getNickname())
+                        .claim("name", memberEntity.getNickname())
                         .claim("sub", "meong-ha-nyang")
-                        .claim("jti", String.valueOf(userEntity.getId()))
+                        .claim("jti", String.valueOf(memberEntity.getId()))
                         .claim("iat", nowDate)
                         .claim("exp", expiration)
                         .signWith(key)
@@ -41,14 +41,14 @@ public String generateAccessToken(UserEntity userEntity) {
         return jwtToken;
     }
 
-    public String generateRefreshToken(UserEntity userEntity) {
+    public String generateRefreshToken(MemberEntity memberEntity) {
         Date nowDate = new Date();
         Date expiration = new Date(nowDate.getTime() + Duration.ofDays(30).toMillis());
         String jwtToken =
                 Jwts.builder()
-                        .claim("name", userEntity.getNickname())
+                        .claim("name", memberEntity.getNickname())
                         .claim("sub", "meong-ha-nyang")
-                        .claim("jti", String.valueOf(userEntity.getId()))
+                        .claim("jti", String.valueOf(memberEntity.getId()))
                         .claim("iat", nowDate)
                         .claim("exp", expiration)
                         .signWith(key)
@@ -81,13 +81,13 @@ private boolean isTokenExpired(String token) {
         return expiration.before(new Date());
     }
 
-    public boolean validateToken(String token, UserEntity userEntity) {
+    public boolean validateToken(String token, MemberEntity memberEntity) {
         if (isTokenExpired(token)) {
             return false;
         }
 
         Long jwtId = getIdFromToken(token);
-        Long id = userEntity.getId();
+        Long id = memberEntity.getId();
 
         return id != null && Objects.equals(jwtId, id);
     }

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/device/doamin/DeviceEntity.java b/src/main/java/org/ioteatime/meonghanyangserver/device/doamin/DeviceEntity.java
@@ -8,7 +8,7 @@
 import org.ioteatime.meonghanyangserver.cctv.domain.CctvEntity;
 import org.ioteatime.meonghanyangserver.device.doamin.enums.DeviceRole;
 import org.ioteatime.meonghanyangserver.group.domain.GroupEntity;
-import org.ioteatime.meonghanyangserver.user.domain.UserEntity;
+import org.ioteatime.meonghanyangserver.member.domain.MemberEntity;
 
 @Data
 @Entity
@@ -33,8 +33,8 @@ public class DeviceEntity {
     private GroupEntity group;
 
     @ManyToOne
-    @JoinColumn(name = "user_id")
-    private UserEntity user;
+    @JoinColumn(name = "member_id", unique = true)
+    private MemberEntity member;
 
     @OneToOne(mappedBy = "device")
     private CctvEntity cctv;

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/device/dto/response/DeviceInfoResponse.java b/src/main/java/org/ioteatime/meonghanyangserver/device/dto/response/DeviceInfoResponse.java
@@ -7,4 +7,4 @@
 
 @Schema(description = "디바이스 정보 응답")
 public record DeviceInfoResponse(
-        @NotNull Long userId, @NotBlank String nickname, @NotBlank DeviceRole role) {}
+        @NotNull Long memberId, @NotBlank String nickname, @NotBlank DeviceRole role) {}
diff --git a/src/main/java/org/ioteatime/meonghanyangserver/device/mapper/DeviceEntityMapper.java b/src/main/java/org/ioteatime/meonghanyangserver/device/mapper/DeviceEntityMapper.java
@@ -3,22 +3,22 @@
 import org.ioteatime.meonghanyangserver.device.doamin.DeviceEntity;
 import org.ioteatime.meonghanyangserver.device.doamin.enums.DeviceRole;
 import org.ioteatime.meonghanyangserver.group.domain.GroupEntity;
-import org.ioteatime.meonghanyangserver.user.domain.UserEntity;
+import org.ioteatime.meonghanyangserver.member.domain.MemberEntity;
 
 public class DeviceEntityMapper {
 
     // master mapper
     public static DeviceEntity from(
             GroupEntity groupEntity,
-            UserEntity userEntity,
+            MemberEntity memberEntity,
             DeviceRole deviceRole,
             String deviceUuid) {
         return DeviceEntity.builder()
                 .id(groupEntity.getId())
-                .user(userEntity)
+                .member(memberEntity)
                 .role(deviceRole)
                 .group(groupEntity)
-                .user(userEntity)
+                .member(memberEntity)
                 .deviceUuid(deviceUuid)
                 .build();
     }

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/device/mapper/DeviceResponseMapper.java b/src/main/java/org/ioteatime/meonghanyangserver/device/mapper/DeviceResponseMapper.java
@@ -6,8 +6,8 @@
 public class DeviceResponseMapper {
     public static DeviceInfoResponse from(DeviceEntity deviceEntity) {
         return new DeviceInfoResponse(
-                deviceEntity.getUser().getId(),
-                deviceEntity.getUser().getNickname(),
+                deviceEntity.getMember().getId(),
+                deviceEntity.getMember().getNickname(),
                 deviceEntity.getRole());
     }
 }
diff --git a/src/main/java/org/ioteatime/meonghanyangserver/device/repository/DeviceRepository.java b/src/main/java/org/ioteatime/meonghanyangserver/device/repository/DeviceRepository.java
@@ -7,11 +7,11 @@
 public interface DeviceRepository {
     DeviceEntity createDevice(DeviceEntity deviceEntity);
 
-    boolean existsDevice(Long userId);
+    boolean existsDevice(Long memberId);
 
-    Optional<DeviceEntity> findByDeviceId(Long userId);
+    Optional<DeviceEntity> findByDeviceId(Long memberId);
 
-    GroupEntity findDevice(Long userId);
+    GroupEntity findDevice(Long memberId);
 
     boolean isParcitipantUserId(Long userId);
 

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/device/repository/DeviceRepositoryImpl.java b/src/main/java/org/ioteatime/meonghanyangserver/device/repository/DeviceRepositoryImpl.java
@@ -23,21 +23,21 @@ public DeviceEntity createDevice(DeviceEntity deviceEntity) {
     }
 
     @Override
-    public boolean existsDevice(Long userId) {
-        return jpaDeviceRepository.existsByUserId(userId);
+    public boolean existsDevice(Long memberId) {
+        return jpaDeviceRepository.existsByMemberId(memberId);
     }
 
     @Override
-    public Optional<DeviceEntity> findByDeviceId(Long userId) {
-        return jpaDeviceRepository.findByUserId(userId);
+    public Optional<DeviceEntity> findByDeviceId(Long memberId) {
+        return jpaDeviceRepository.findByMemberId(memberId);
     }
 
     @Override
-    public GroupEntity findDevice(Long userId) {
+    public GroupEntity findDevice(Long memberId) {
         return jpaQueryFactory
                 .select(deviceEntity.group)
                 .from(deviceEntity)
-                .where(deviceEntity.user.id.eq(userId))
+                .where(deviceEntity.member.id.eq(memberId))
                 .fetchOne();
     }
 
@@ -48,7 +48,7 @@ public boolean isParcitipantUserId(Long userId) {
                 .from(deviceEntity)
                 .where(
                         deviceEntity
-                                .user
+                                .member
                                 .id
                                 .eq(userId)
                                 .and(deviceEntity.role.eq(DeviceRole.ROLE_PARTICIPANT)))

diff --git a/src/main/java/org/ioteatime/meonghanyangserver/device/repository/JpaDeviceRepository.java b/src/main/java/org/ioteatime/meonghanyangserver/device/repository/JpaDeviceRepository.java
@@ -5,7 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface JpaDeviceRepository extends JpaRepository<DeviceEntity, Long> {
-    boolean existsByUserId(Long userId);
+    boolean existsByMemberId(Long memberId);
 
-    Optional<DeviceEntity> findByUserId(Long userId);
+    Optional<DeviceEntity> findByMemberId(Long memberId);
 }