[Delete] :: user approval column delete

Team-C0nnect · May 21, 2024 · 22b60e1 · 22b60e1
1 parent 164b2f2
commit 22b60e1
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 91 deletions.
diff --git a/src/main/java/com/project/qvick/domain/user/application/query/UserQueryService.java b/src/main/java/com/project/qvick/domain/user/application/query/UserQueryService.java
@@ -2,16 +2,13 @@
 
 import com.project.qvick.domain.user.client.dto.User;
 import com.project.qvick.domain.user.client.dto.request.SearchRequest;
-import com.project.qvick.domain.user.client.dto.request.UserApprovalPageRequest;
 import com.project.qvick.domain.user.client.dto.response.UserPageResponse;
 import com.project.qvick.global.common.dto.request.PageRequest;
 
 import java.util.List;
 
 public interface UserQueryService {
 
-    List<UserPageResponse> findWaitingUsers(UserApprovalPageRequest request);
-
     List<User> userList(PageRequest pageRequest);
 
     List<User> userSearch(SearchRequest searchRequest);

diff --git a/src/main/java/com/project/qvick/domain/user/application/query/UserQueryServiceImpl.java b/src/main/java/com/project/qvick/domain/user/application/query/UserQueryServiceImpl.java
@@ -2,7 +2,6 @@
 
 import com.project.qvick.domain.user.client.dto.User;
 import com.project.qvick.domain.user.client.dto.request.SearchRequest;
-import com.project.qvick.domain.user.client.dto.request.UserApprovalPageRequest;
 import com.project.qvick.domain.user.domain.repository.query.UserQueryRepository;
 import com.project.qvick.domain.user.client.dto.response.UserPageResponse;
 import com.project.qvick.global.common.dto.request.PageRequest;
@@ -19,11 +18,6 @@ public class UserQueryServiceImpl implements UserQueryService{
 
     private final UserQueryRepository userQueryRepository;
 
-    @Override
-    public List<UserPageResponse> findWaitingUsers(UserApprovalPageRequest request) {
-        return userQueryRepository.findWaitingUsers(request);
-    }
-
     @Override
     public List<User> userList(PageRequest pageRequest){
         return userQueryRepository.userList(pageRequest);

diff --git a/src/main/java/com/project/qvick/domain/user/client/api/UserAdminController.java b/src/main/java/com/project/qvick/domain/user/client/api/UserAdminController.java
@@ -3,7 +3,6 @@
 import com.project.qvick.domain.user.application.query.UserQueryService;
 import com.project.qvick.domain.user.client.dto.User;
 import com.project.qvick.domain.user.client.dto.request.SearchRequest;
-import com.project.qvick.domain.user.client.dto.request.UserApprovalPageRequest;
 import com.project.qvick.domain.user.client.dto.response.UserPageResponse;
 import com.project.qvick.global.common.dto.request.PageRequest;
 import io.swagger.v3.oas.annotations.Operation;
@@ -25,12 +24,6 @@ public class UserAdminController {
 
     private final UserQueryService userQueryService;
 
-    @Operation(summary = "승인 대기 유저 조회", description = "승인 대기 유저를 조회합니다.")
-    @GetMapping("/await-user")
-    public ResponseEntity<List<UserPageResponse>> findWaitingUsers(@ModelAttribute UserApprovalPageRequest request){
-        return ResponseEntity.ok(userQueryService.findWaitingUsers(request));
-    }
-
     @Operation(summary = "전체 유저 조회", description = "전체 유저를 조회합니다.")
     @GetMapping("/find-all")
     public ResponseEntity<List<User>>userList(@ModelAttribute PageRequest pageRequest){

diff --git a/src/main/java/com/project/qvick/domain/user/client/dto/User.java b/src/main/java/com/project/qvick/domain/user/client/dto/User.java
@@ -1,6 +1,5 @@
 package com.project.qvick.domain.user.client.dto;
 
-import com.project.qvick.domain.user.domain.enums.Approval;
 import com.project.qvick.domain.user.domain.enums.UserRole;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -21,7 +20,6 @@ public class User {
     private String password;
     private String stdId;
     private String room;
-    private Approval approval;
     private UserRole userRole;
 
 }
diff --git a/src/main/java/com/project/qvick/domain/user/client/dto/request/UserApprovalPageRequest.java b/src/main/java/com/project/qvick/domain/user/client/dto/request/UserApprovalPageRequest.java
diff --git a/src/main/java/com/project/qvick/domain/user/client/dto/response/UserPageResponse.java b/src/main/java/com/project/qvick/domain/user/client/dto/response/UserPageResponse.java
@@ -1,6 +1,5 @@
 package com.project.qvick.domain.user.client.dto.response;
 
-import com.project.qvick.domain.user.domain.enums.Approval;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -16,6 +15,5 @@ public class UserPageResponse {
 
     private Long id;
     private String name;
-    private Approval approval;
 
 }
diff --git a/src/main/java/com/project/qvick/domain/user/domain/UserEntity.java b/src/main/java/com/project/qvick/domain/user/domain/UserEntity.java
@@ -1,6 +1,5 @@
 package com.project.qvick.domain.user.domain;
 
-import com.project.qvick.domain.user.domain.enums.Approval;
 import com.project.qvick.domain.user.domain.enums.UserRole;
 import com.project.qvick.global.common.entity.BaseTimeEntity;
 import jakarta.persistence.Column;
@@ -47,10 +46,6 @@ public class UserEntity extends BaseTimeEntity {
             length = 3)
     private String room;
 
-    @Column(nullable = false)
-    @Enumerated(EnumType.STRING)
-    private Approval approval;
-
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
     private UserRole userRole;

diff --git a/src/main/java/com/project/qvick/domain/user/domain/enums/Approval.java b/src/main/java/com/project/qvick/domain/user/domain/enums/Approval.java
diff --git a/src/main/java/com/project/qvick/domain/user/domain/mapper/UserMapper.java b/src/main/java/com/project/qvick/domain/user/domain/mapper/UserMapper.java
@@ -2,7 +2,6 @@
 
 import com.project.qvick.domain.auth.client.dto.request.SignUpRequest;
 import com.project.qvick.domain.user.domain.UserEntity;
-import com.project.qvick.domain.user.domain.enums.Approval;
 import com.project.qvick.domain.user.domain.enums.UserRole;
 import com.project.qvick.domain.user.client.dto.User;
 import org.springframework.stereotype.Component;
@@ -18,7 +17,6 @@ public User toUser(UserEntity entity){
                 .email(entity.getEmail())
                 .stdId(entity.getStdId())
                 .room(entity.getRoom())
-                .approval(entity.getApproval())
                 .build();
     }
 
@@ -29,7 +27,6 @@ public UserEntity toCreate(SignUpRequest signUpRequest, String password){
                 .password(password)
                 .stdId(signUpRequest.getStdId())
                 .room(signUpRequest.getRoom())
-                .approval(Approval.ACCEPT)
                 .userRole(UserRole.USER)
                 .build();
     }
@@ -41,7 +38,6 @@ public UserEntity toCreateAdmin(SignUpRequest signUpRequest, String password){
                 .password(password)
                 .stdId(signUpRequest.getStdId())
                 .room(signUpRequest.getRoom())
-                .approval(Approval.ACCEPT)
                 .userRole(UserRole.ADMIN)
                 .build();
     }
@@ -50,7 +46,6 @@ public UserEntity toEdit(User user){
         return UserEntity.builder()
                 .stdId(user.getStdId())
                 .room(user.getRoom())
-                .approval(Approval.ACCEPT)
                 .userRole(UserRole.USER)
                 .build();
     }

diff --git a/src/main/java/com/project/qvick/domain/user/domain/repository/query/UserQueryRepository.java b/src/main/java/com/project/qvick/domain/user/domain/repository/query/UserQueryRepository.java
@@ -3,16 +3,13 @@
 
 import com.project.qvick.domain.user.client.dto.User;
 import com.project.qvick.domain.user.client.dto.request.SearchRequest;
-import com.project.qvick.domain.user.client.dto.request.UserApprovalPageRequest;
 import com.project.qvick.domain.user.client.dto.response.UserPageResponse;
 import com.project.qvick.global.common.dto.request.PageRequest;
 
 import java.util.List;
 
 public interface UserQueryRepository {
 
-    List<UserPageResponse> findWaitingUsers(UserApprovalPageRequest request);
-
     List<User> userList(PageRequest request);
 
     List<User>userSearch(SearchRequest request);

diff --git a/...n/java/com/project/qvick/domain/user/domain/repository/query/UserQueryRepositoryImpl.java b/...n/java/com/project/qvick/domain/user/domain/repository/query/UserQueryRepositoryImpl.java
@@ -1,9 +1,7 @@
 package com.project.qvick.domain.user.domain.repository.query;
 
-import com.project.qvick.domain.user.domain.enums.Approval;
 import com.project.qvick.domain.user.client.dto.User;
 import com.project.qvick.domain.user.client.dto.request.SearchRequest;
-import com.project.qvick.domain.user.client.dto.request.UserApprovalPageRequest;
 import com.project.qvick.domain.user.client.dto.response.UserPageResponse;
 import com.project.qvick.global.common.dto.request.PageRequest;
 import com.querydsl.core.types.ConstructorExpression;
@@ -24,18 +22,6 @@ public class UserQueryRepositoryImpl implements UserQueryRepository{
 
     private final JPAQueryFactory jpaQueryFactory;
 
-    @Override
-    public List<UserPageResponse> findWaitingUsers(UserApprovalPageRequest request) {
-        return jpaQueryFactory
-                .select(userConstructorExpression())
-                .from(userEntity)
-                .where(inApprovals(request.getApproval()))
-                .offset((request.getPage() - 1) * request.getSize())
-                .limit(request.getSize())
-                .orderBy(userEntity.id.asc())
-                .fetch();
-    }
-
     @Override
     public List<User> userList(PageRequest request){
         return jpaQueryFactory
@@ -59,13 +45,6 @@ public List<User> userList(PageRequest request){
                 .fetch();
     }
 
-    private ConstructorExpression<UserPageResponse> userConstructorExpression() {
-        return Projections.constructor(UserPageResponse.class,
-                userEntity.id,
-                userEntity.name,
-                userEntity.approval);
-    }
-
     private ConstructorExpression<User> userListConstructorExpression(){
         return Projections.constructor(User.class,
                 userEntity.id,
@@ -74,15 +53,10 @@ private ConstructorExpression<User> userListConstructorExpression(){
                 userEntity.password,
                 userEntity.stdId,
                 userEntity.room,
-                userEntity.approval,
                 userEntity.userRole
         );
     }
 
-    private BooleanExpression inApprovals(Approval approval){
-        return userEntity.approval.in(approval);
-    }
-
     private BooleanExpression nameLike(String name) {
         return StringUtils.hasText(name) ? userEntity.name.contains(name) : null;
     }