Merge pull request #9 from STUDIO-EYE/feat/EPIC-136]-user

[Feat/epic 136] user
STUDIO-EYE · Apr 27, 2024 · 58f0117 · 58f0117
2 parents 23692c9 + 3efb08f
commit 58f0117
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 41 deletions.
diff --git a/src/main/java/com/example/UserService/config/JwtTokenProvider.java b/src/main/java/com/example/UserService/config/JwtTokenProvider.java
@@ -1,14 +1,12 @@
 package com.example.UserService.config;
 
-import com.example.UserService.domain.Role;
 import com.example.UserService.dto.JWTAuthResponse;
 import com.example.UserService.service.RedisService;
 import io.jsonwebtoken.*;
 import jakarta.annotation.PostConstruct;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -47,14 +45,12 @@ protected void init() {
     }
 
     // generate JWT token
-//    public JWTAuthResponse generateToken(String email, Authentication authentication, Long userId) {
-    public JWTAuthResponse generateToken(String email, Authentication authentication, Long userId, Role role) {
+    public JWTAuthResponse generateToken(String email, Authentication authentication, Long userId) {
         String username = authentication.getName();
 
         Claims claims = Jwts.claims().setSubject(email);
         claims.put("username", username);
         claims.put("userId", userId);
-        claims.put("role", role);
 
         Date currentDate = new Date();
         Date accessTokenExpireDate = new Date(currentDate.getTime() + ACCESS_TOKEN_VALID_TIME);
@@ -81,7 +77,6 @@ public JWTAuthResponse generateToken(String email, Authentication authentication
         response.setRefreshToken(refreshToken);
         response.setTokenType(BEARER);
         response.setAccessTokenExpireDate(ACCESS_TOKEN_VALID_TIME);
-        response.setRole(role);
         response.setId(userId);
         return response;
     }

diff --git a/src/main/java/com/example/UserService/controller/UserController.java b/src/main/java/com/example/UserService/controller/UserController.java
@@ -31,23 +31,23 @@ public class UserController {
     private final JwtTokenProvider jwtTokenProvider;
 
     @GetMapping("/health_check")
-    public String status(){
+    public String status() {
         return "It's Working in User Service";
     }
 
     @GetMapping("/welcome")
-    public String welcome(){
+    public String welcome() {
         return env.getProperty("greeting.message");
     }
 
     @PostMapping("/login")
-    public ResponseEntity<JWTAuthResponse> login(@RequestBody RequestLogin requestLogin){
+    public ResponseEntity<JWTAuthResponse> login(@RequestBody RequestLogin requestLogin) {
         JWTAuthResponse token = userService.login(requestLogin);
         return ResponseEntity.ok(token);
     }
 
     @PostMapping("/register")
-    public ResponseEntity<String> register(@RequestBody RequestUser requestUser){
+    public ResponseEntity<String> register(@RequestBody RequestUser requestUser) {
         String response = userService.register(requestUser);
         return new ResponseEntity<>(response, HttpStatus.CREATED);
     }
@@ -87,7 +87,7 @@ public ResponseEntity<List<Long>> getAllApprovedUserIds() {
     //토큰 재발급
     @PatchMapping("/reissue")
     public ResponseEntity<JWTAuthResponse> reissue(HttpServletRequest request,
-                                  HttpServletResponse response) {
+                                                   HttpServletResponse response) {
 
         String refreshToken = jwtTokenProvider.resolveRefreshToken(request);
         JWTAuthResponse newAccessToken = userService.reissueAccessToken(refreshToken);
@@ -116,5 +116,19 @@ public ResponseEntity verificationEmail(@RequestParam("email") @Valid @Email Str
     public ResponseEntity unregister(@RequestParam("userId") @Valid Long userId) {
         return userService.unregister(userId);
     }
-}
 
+    //모든 회원 정보 반환
+    @GetMapping("/users")
+    public ResponseEntity<List<UserResponse>> getAllUsers() {
+        List<UserResponse> users = userService.getAllUsers();
+        return ResponseEntity.ok(users);
+    }
+
+    //승인 여부 변경
+    @PutMapping("/approve")
+    public ResponseEntity approveUser(@RequestParam("userId") @Valid Long userId,
+                                      @RequestParam("approved") boolean approved) {
+        boolean isApproved = userService.updateApproved(userId, approved);
+        return ResponseEntity.ok().body(isApproved);
+    }
+}
diff --git a/src/main/java/com/example/UserService/domain/Role.java b/src/main/java/com/example/UserService/domain/Role.java
diff --git a/src/main/java/com/example/UserService/domain/UserEntity.java b/src/main/java/com/example/UserService/domain/UserEntity.java
@@ -4,7 +4,9 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.data.annotation.CreatedDate;
 
+import java.time.LocalDate;
 import java.util.Optional;
 
 @Setter
@@ -36,9 +38,9 @@ public class UserEntity {
     @Column(nullable = false)
     private boolean isApproved;
 
-    @Enumerated(EnumType.STRING)
     @Column(nullable = false)
-    private Role role;
+    @CreatedDate
+    private LocalDate createdAt;
 
     private UserEntity(Optional<UserEntity> userEntity) {
         this.id = id;
@@ -48,7 +50,7 @@ private UserEntity(Optional<UserEntity> userEntity) {
         this.phoneNumber = phoneNumber;
         this.encryptedPwd = encryptedPwd;
         this.isApproved = isApproved;
-        this.role = role;
+        this.createdAt = createdAt;
     }
 
     public UserEntity() {

diff --git a/src/main/java/com/example/UserService/dto/JWTAuthResponse.java b/src/main/java/com/example/UserService/dto/JWTAuthResponse.java
@@ -1,6 +1,5 @@
 package com.example.UserService.dto;
 
-import com.example.UserService.domain.Role;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -15,7 +14,5 @@ public class JWTAuthResponse {
     private String accessToken;
     private String refreshToken;
     private Long accessTokenExpireDate;
-    private Role role;
     private Long id;
 }
-
diff --git a/src/main/java/com/example/UserService/dto/UserResponse.java b/src/main/java/com/example/UserService/dto/UserResponse.java
@@ -2,6 +2,8 @@
 
 import lombok.Getter;
 
+import java.time.LocalDate;
+
 //feignClient 응답용
 
 @Getter
@@ -10,14 +12,17 @@ public class UserResponse {
     private String email;
     private String name;
     private String phoneNumber;
+    private LocalDate createdAt;
     private boolean isApproved;
     private String message;
 
-    public UserResponse(Long id, String email, String name, String phoneNumber, boolean isApproved) {
+    public UserResponse(Long id, String email, String name, String phoneNumber,
+                        LocalDate createdAt, boolean isApproved) {
         this.id = id;
         this.email = email;
         this.name = name;
         this.phoneNumber = phoneNumber;
+        this.createdAt = createdAt;
         this.isApproved = isApproved;
     }
 

diff --git a/src/main/java/com/example/UserService/repository/UserRepository.java b/src/main/java/com/example/UserService/repository/UserRepository.java
@@ -5,6 +5,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -24,6 +25,7 @@ default UserResponse findUserResponseByUserId(Long userId) {
                 userEntity.getEmail(),
                 userEntity.getName(),
                 userEntity.getPhoneNumber(),
+                userEntity.getCreatedAt(),
                 userEntity.isApproved());
         }
 
@@ -35,9 +37,25 @@ default UserResponse findUserResponseByEmail(String email) {
                 userEntity.getEmail(),
                 userEntity.getName(),
                 userEntity.getPhoneNumber(),
+                userEntity.getCreatedAt(),
                 userEntity.isApproved());
     }
 
     @Query("SELECT u.id FROM UserEntity u WHERE u.isApproved = true")
     List<Long> getAllApprovedUserIds();
+
+    default List<UserResponse> findAllUsers(){
+        List<UserEntity> userEntityList = findAll();
+        List<UserResponse> userResponseList = new ArrayList<>();
+        for(UserEntity userEntity : userEntityList) {
+            userResponseList.add (new UserResponse(
+                    userEntity.getId(),
+                    userEntity.getEmail(),
+                    userEntity.getName(),
+                    userEntity.getPhoneNumber(),
+                    userEntity.getCreatedAt(),
+                    userEntity.isApproved()));
+        }
+        return userResponseList;
+    }
 }
diff --git a/src/main/java/com/example/UserService/service/UserService.java b/src/main/java/com/example/UserService/service/UserService.java
@@ -33,4 +33,8 @@ public interface UserService{
     List<Long> getAllApprovedUserIds();
 
     ResponseEntity unregister(Long userId);
+
+    List<UserResponse> getAllUsers();
+
+    boolean updateApproved(Long userId, boolean approved);
 }
diff --git a/src/main/java/com/example/UserService/service/UserServiceImpl.java b/src/main/java/com/example/UserService/service/UserServiceImpl.java
@@ -32,6 +32,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
@@ -70,7 +71,7 @@ public JWTAuthResponse login(RequestLogin requestLogin) {
         UserEntity user = userRepository.findById(userId).orElseThrow(); // new ExceptionCode.MEMBER_NOT_FOUND
 
 //        JWTAuthResponse token = jwtTokenProvider.generateToken(requestLogin.getEmail(), authentication, userId);
-        JWTAuthResponse token = jwtTokenProvider.generateToken(requestLogin.getEmail(), authentication, userId, user.getRole());
+        JWTAuthResponse token = jwtTokenProvider.generateToken(requestLogin.getEmail(), authentication, userId);
         return token;
     }
 
@@ -87,6 +88,7 @@ public String register(RequestUser requestUser) {
         UserEntity userEntity = mapper.map(requestUser, UserEntity.class);
         userEntity.setEncryptedPwd(pwdEncoder.encode(requestUser.getPwd()));
         userEntity.setApproved(false);
+        userEntity.setCreatedAt(LocalDate.now());
         userRepository.save(userEntity);
 
         return "User registered successfully!.";
@@ -119,7 +121,7 @@ public JWTAuthResponse reissueAccessToken(String refreshToken) {
         if (redisService.checkExistsValue(redisRefreshToken) && refreshToken.equals(redisRefreshToken)) {
             Optional<UserEntity> findUser = this.findOne(email);
             UserEntity userEntity = UserEntity.of(findUser);
-            JWTAuthResponse tokenDto = jwtTokenProvider.generateToken(email, jwtTokenProvider.getAuthentication(refreshToken), userEntity.getId(), userEntity.getRole());
+            JWTAuthResponse tokenDto = jwtTokenProvider.generateToken(email, jwtTokenProvider.getAuthentication(refreshToken), userEntity.getId());
             String newAccessToken = tokenDto.getAccessToken();
             long refreshTokenExpirationMillis = jwtTokenProvider.getRefreshTokenExpirationMillis();
             return tokenDto;
@@ -198,4 +200,21 @@ public ResponseEntity unregister(Long userId) {
 
         return null;
     }
+
+    @Override
+    public List<UserResponse> getAllUsers() {
+        List<UserResponse> userResponses = userRepository.findAllUsers();
+        if (userResponses == null) {
+            throw new BusinessLogicException(ExceptionCode.MEMBER_NOT_FOUND);
+        }
+        return userResponses;
+    }
+
+    @Override
+    public boolean updateApproved(Long userId, boolean approved) {
+        UserEntity user = userRepository.findById(userId).orElseThrow();
+        user.setApproved(approved);
+        userRepository.save(user);
+        return user.isApproved();
+    }
 }
diff --git a/src/main/java/com/example/UserService/vo/RequestUser.java b/src/main/java/com/example/UserService/vo/RequestUser.java
@@ -1,10 +1,12 @@
 package com.example.UserService.vo;
 
-import com.example.UserService.domain.Role;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -28,7 +30,4 @@ public class RequestUser {
     @Size(min = 10, max = 15, message = "전화번호는 10자에서 15자 사이여야 합니다")
     private String phoneNumber;
 
-    @NotNull(message = "권한을 입력해주세요")
-    private Role role;
-
 }
diff --git a/src/main/java/com/example/UserService/vo/ResponseUser.java b/src/main/java/com/example/UserService/vo/ResponseUser.java
@@ -2,10 +2,13 @@
 
 import lombok.Data;
 
+import java.time.LocalDate;
+
 @Data
 public class ResponseUser {
     private String email;
     private String name;
     private String phoneNumber;
+    private LocalDate createdAt;
     private boolean isApproved;
 }