Skip to content

Refactor : 회원가입 승인 response 변경 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2ralumin merged 1 commit into from
Feb 26, 2024
Merged

Refactor : 회원가입 승인 response 변경 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions run/src/main/java/com/guide/run/admin/controller/AdminUserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

import com.guide.run.admin.dto.request.ApproveRequest;
import com.guide.run.admin.dto.response.GuideApplyResponse;
import com.guide.run.admin.dto.response.UserApprovalResponse;
import com.guide.run.admin.dto.response.UserListResponse;
import com.guide.run.admin.dto.response.UserRoleResponse;
import com.guide.run.admin.dto.response.ViApplyResponse;
import com.guide.run.admin.service.AdminUserService;
import com.guide.run.event.entity.dto.response.search.Count;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand Down Expand Up @@ -44,8 +43,8 @@ public ResponseEntity<GuideApplyResponse> getApplyGuide(@PathVariable String use
}

@PostMapping("/approval-user/{userId}")
public ResponseEntity<UserRoleResponse> approveUser(@PathVariable String userId, @RequestBody ApproveRequest request){
UserRoleResponse response = adminUserService.approveUser(userId, request);
public ResponseEntity<UserApprovalResponse> approveUser(@PathVariable String userId, @RequestBody ApproveRequest request){
UserApprovalResponse response = adminUserService.approveUser(userId, request);
return ResponseEntity.ok().body(response);
}
}
8 changes: 6 additions & 2 deletions .../admin/dto/response/UserRoleResponse.java → ...in/dto/response/UserApprovalResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

import com.guide.run.user.entity.type.Role;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@AllArgsConstructor
@NoArgsConstructor
public class UserRoleResponse {
private Role role;
@Builder
public class UserApprovalResponse {
private String userId;
private Boolean isApprove;
private String recordDegree;
}
10 changes: 8 additions & 2 deletions run/src/main/java/com/guide/run/admin/service/AdminUserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,20 @@ public GuideApplyResponse getApplyGuide(String userId){
}

@Transactional
public UserRoleResponse approveUser(String userId, ApproveRequest request){
public UserApprovalResponse approveUser(String userId, ApproveRequest request){
User user = userRepository.findUserByUserId(userId).orElseThrow(NotExistUserException::new);
Boolean isApprove = false;
if(request.getIsApprove()){
user.editUserRole(Role.USER);
isApprove = true;
}else{
user.editUserRole(Role.REJECT);
}
UserRoleResponse response = new UserRoleResponse(user.getRole());
UserApprovalResponse response = UserApprovalResponse.builder()
.userId(user.getUserId())
.isApprove(isApprove)
.recordDegree(user.getRecordDegree())
.build();
return response;
}

Expand Down