feat admin project user

Author: kwonhee1

src/main/java/NextLevel/demo/admin/project/AdminProjectController.java

@@ -1,14 +1,18 @@
 package NextLevel.demo.admin.project;
 
 import NextLevel.demo.common.SuccessResponse;
+import NextLevel.demo.project.ProjectStatus;
 import NextLevel.demo.project.project.service.ProjectDeleteService;
 import NextLevel.demo.util.jwt.JWTUtil;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 @RequiredArgsConstructor
@@ -22,8 +26,10 @@ public ResponseEntity getProjectList() {
         return null;
     }
 
-    public ResponseEntity updateProjectStatus() {
-        return null;
+    @PostMapping("/status/{projectId}")
+    public ResponseEntity updateProjectStatus(@RequestParam("status") ProjectStatus status, @PathVariable("projectId") Long projectId) {
+        adminProjectService.updateProjectStatus(projectId, status);
+        return ResponseEntity.ok().body(new SuccessResponse("success", null));
     }
 
     public ResponseEntity updateProject() {

src/main/java/NextLevel/demo/admin/user/AdminUserController.java

@@ -1,19 +1,28 @@
 package NextLevel.demo.admin.user;
 
 import NextLevel.demo.common.SuccessResponse;
+import NextLevel.demo.user.dto.user.request.RequestUpdateUserInfoDto;
+import NextLevel.demo.util.jwt.JWTUtil;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
 @RequiredArgsConstructor
-@RequestMapping("/admin")
+@RequestMapping("/admin/user")
 public class AdminUserController {
 
     private final AdminUserService adminUserService;
 
+    @GetMapping("/list")
     public ResponseEntity getUserList(Pageable pageable) {
         return ResponseEntity.ok().body(new SuccessResponse("success", adminUserService.getUserList(pageable)));
     }
@@ -22,12 +31,16 @@ public ResponseEntity stopUser() {
         return null;
     }
 
-    public ResponseEntity updateUser() {
-        return null;
+    @PutMapping("/update")
+    public ResponseEntity updateUser(@RequestBody @Valid RequestUpdateUserInfoDto dto) {
+        adminUserService.updateUser(dto);
+        return ResponseEntity.ok().body(new SuccessResponse("success", null));
     }
 
-    public ResponseEntity removeUser() {
-        return null;
+    @DeleteMapping("/{userId}")
+    public ResponseEntity removeUser(@PathVariable("userId") Long userId) {
+        adminUserService.removeUser(userId);
+        return ResponseEntity.ok().body(new SuccessResponse("success", null));
     }
 
 }

src/main/java/NextLevel/demo/admin/user/AdminUserService.java

@@ -6,6 +6,7 @@
 import NextLevel.demo.user.dto.user.response.ResponseUserInfoDetailDto;
 import NextLevel.demo.user.entity.UserEntity;
 import NextLevel.demo.user.repository.UserRepository;
+import NextLevel.demo.user.service.UserDeleteService;
 import NextLevel.demo.user.service.UserService;
 import NextLevel.demo.user.service.UserValidateService;
 import lombok.RequiredArgsConstructor;
@@ -22,6 +23,7 @@ public class AdminUserService {
     private final UserValidateService userValidateService;
     private final UserService userService;
     private final UserRepository userRepository;
+    private final UserDeleteService userDeleteService;
 
     public List<ResponseUserInfoDetailDto> getUserList(Pageable pageable) {
         return userRepository.findAll(pageable).stream().map(ResponseUserInfoDetailDto::of).toList();
@@ -33,16 +35,21 @@ public void stopUser() {
 
     @Transactional
     public void updateUser(RequestUpdateUserInfoDto dto) {
-        UserEntity oldUser = userValidateService.getUserInfoWithAccessToken(dto.getId());
+        UserEntity oldUser = userValidateService.findUserWithUserId(dto.getId());
+
+        if(dto.getName().equals("point")) {
+            oldUser.updatePoint(Integer.parseInt(dto.getValue()));
+            return;
+        }
 
         if(dto.getName().equals("nickName") && !userValidateService.checkNickNameIsNotExist(dto.getValue()))
             throw new CustomException(ErrorCode.ALREADY_EXISTS_NICKNAME);
 
         oldUser.updateUserInfo(dto.getName(), dto.getValue());
     }
 
-    public void removeUser() {
-        // userService. ; // delete 어디감?
+    public void removeUser(Long targetId) {
+        userDeleteService.deleteUser(targetId, null);
     }
 
 }

src/main/java/NextLevel/demo/exception/ErrorCode.java

@@ -10,6 +10,7 @@ public enum ErrorCode {
     NOT_AUTHOR(HttpStatus.BAD_REQUEST, "00001","작성자가 아닙니다"),
     ACCESS_TOKEN_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "00002", "access, refresh token을 다시 발급해 주세요"),
     NOT_FOUND(HttpStatus.NOT_FOUND, "00003", "not found %s"),
+    NOT_ADMIN(HttpStatus.UNAUTHORIZED, "10001", "not admin"),
 
     //register
     ALREADY_EXISTS_EMAIL(HttpStatus.BAD_REQUEST, "01001","email already exists"),

src/main/java/NextLevel/demo/user/entity/UserEntity.java

@@ -100,6 +100,9 @@ public UserEntity(Long id, String name,String nickName, int point, String addres
     }
 
     public void checkRole() {
+        if(role.equals(UserRole.ADMIN.name()))
+            return;
+
         if(name != null && !name.isEmpty() &&
                 nickName != null && !nickName.isEmpty() &&
                 address != null && !address.isEmpty() &&

src/main/java/NextLevel/demo/user/service/UserService.java

@@ -51,6 +51,9 @@ public UserEntity updateUserInfo(RequestUpdateUserInfoDto dto, HttpServletReques
         if(dto.getName().equals("nickName") && !userValidateService.checkNickNameIsNotExist(dto.getValue()))
             throw new CustomException(ErrorCode.ALREADY_EXISTS_NICKNAME);
 
+        if(dto.getName().equals("role"))
+            throw new CustomException(ErrorCode.CAN_NOT_INVOKE, "role");
+
         oldUser.updateUserInfo(dto.getName(), dto.getValue());
 
         // userRepository.save(oldUser);