[api] AdminUserController.java 이쪽 컨벤션 맞춰 변경

This commit is contained in:
2026-05-21 17:17:59 +09:00
parent 05cf8281f2
commit bdaaec4f97
5 changed files with 47 additions and 49 deletions
@@ -2,9 +2,9 @@ package com.alist.api.modules.admin.user;
import com.alist.api.common.response.ApiResponse; import com.alist.api.common.response.ApiResponse;
import com.alist.api.common.response.ApiResponseCode; import com.alist.api.common.response.ApiResponseCode;
import com.alist.api.modules.admin.user.form.AdminUserSignupForm; import com.alist.api.modules.admin.user.form.AdminUserAddForm;
import com.alist.api.modules.admin.user.service.AdminUserService; import com.alist.api.modules.admin.user.service.AdminUserService;
import com.alist.api.modules.admin.user.vo.AdminUserVo; import com.alist.api.modules.admin.user.vo.AdminUserAddVo;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid; import jakarta.validation.Valid;
@@ -27,18 +27,18 @@ public class AdminUserController {
} }
@Operation( @Operation(
summary = "사용자 회원가입", summary = "관리자 회원가입"
description = "새로운 사용자를 등록합니다. 아이디 중복 시 오류를 반환합니다." , description = "새로운 사용자를 등록합니다. 아이디 중복 시 오류를 반환합니다."
) )
@PostMapping("/signup") @PostMapping("/add")
public ResponseEntity<ApiResponse<AdminUserVo>> signup(@Valid @RequestBody AdminUserSignupForm adminUserSignupForm) { public ResponseEntity<ApiResponse<AdminUserAddVo>> adminUserAdd(@Valid @RequestBody AdminUserAddForm adminUserAddForm) {
AdminUserVo result = adminUserService.adminInsertUser(adminUserSignupForm.toAdminUserDto()); AdminUserAddVo adminUserAddVo = adminUserService.insertAdminUserAdd(adminUserAddForm.toDto());
if (result.getResultCode() == 2004) { if (adminUserAddVo.getResultCode() == 2004) {
return ApiResponse.entity(result, ApiResponseCode.CODE_2004, "아이디"); return ApiResponse.entity(adminUserAddVo, ApiResponseCode.CODE_2004, "아이디");
} }
return ApiResponse.entity(result, ApiResponseCode.CODE_2002, "아이디"); return ApiResponse.entity(adminUserAddVo, ApiResponseCode.CODE_2002, "아이디");
} }
} }
@@ -7,7 +7,7 @@ import lombok.Setter;
@Setter @Setter
@Getter @Getter
public class AdminUserDto { public class AdminUserAddDto {
private Integer userIdx; private Integer userIdx;
private String id; private String id;
private String userRole; private String userRole;
@@ -1,6 +1,6 @@
package com.alist.api.modules.admin.user.form; package com.alist.api.modules.admin.user.form;
import com.alist.api.modules.admin.user.dto.AdminUserDto; import com.alist.api.modules.admin.user.dto.AdminUserAddDto;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Pattern;
@@ -11,51 +11,51 @@ import lombok.Setter;
@Setter @Setter
@Getter @Getter
@Schema(description = "회원 가입 요청 폼") @Schema(description = "회원 가입 요청 폼")
public class AdminUserSignupForm { public class AdminUserAddForm {
@Schema( @Schema(
description = "사용자 아이디 (공백 불가)", description = "사용자 아이디 (공백 불가)"
example = "test" , example = "test"
) )
@NotBlank(message = "아이디를 입력해주세요.") @NotBlank(message = "아이디를 입력해주세요.")
private String id; private String id;
@Schema( @Schema(
description = "비밀번호 (8~64자, 영문 + 숫자 조합, 공백 불가)", description = "비밀번호 (8~64자, 영문 + 숫자 조합, 공백 불가)"
example = "pass1234" , example = "pass1234"
) )
@NotBlank(message = "비밀번호를 입력해주세요.") @NotBlank(message = "비밀번호를 입력해주세요.")
@Size(min = 8, max = 64, message = "비밀번호는 8~64자여야 합니다.") @Size(min = 8, max = 64, message = "비밀번호는 8~64자여야 합니다.")
@Pattern( @Pattern(
regexp = "^(?=.*[A-Za-z])(?=.*\\d)\\S+$", regexp = "^(?=.*[A-Za-z])(?=.*\\d)\\S+$"
message = "비밀번호는 영문과 숫자를 포함하고 공백이 없어야 합니다." , message = "비밀번호는 영문과 숫자를 포함하고 공백이 없어야 합니다."
) )
private String password; private String password;
@NotBlank(message = "사용자 권한(관리자{A:관리자}") @NotBlank(message = "사용자 권한(관리자{A:관리자}")
@Pattern( @Pattern(
regexp = "^A$", regexp = "^A$"
message = "사용자 권한(관리자{A:관리자})" , message = "사용자 권한(관리자{A:관리자})"
) )
@Schema( @Schema(
description = "사용자 권한(관리자{A:관리자})", description = "사용자 권한(관리자{A:관리자})"
example = "A" , example = "A"
) )
private String userRole; private String userRole;
@NotBlank(message = "사용자 구분(A:관리자)") @NotBlank(message = "사용자 구분(A:관리자)")
@Pattern(regexp = "^A$", message = "관리자 사용자 구분은 A만 가능합니다.") @Pattern(regexp = "^A$", message = "관리자 사용자 구분은 A만 가능합니다.")
@Schema( @Schema(
description = "사용자 타입(A:관리자)", description = "사용자 타입(A:관리자)"
example = "A" , example = "A"
) )
private String userType; private String userType;
public AdminUserDto toAdminUserDto() { public AdminUserAddDto toDto() {
AdminUserDto adminUserDto = new AdminUserDto(); AdminUserAddDto adminUserAddDto = new AdminUserAddDto();
adminUserDto.setId(id.trim()); adminUserAddDto.setId(id.trim());
adminUserDto.setPassword(password); adminUserAddDto.setPassword(password);
adminUserDto.setUserRole(userRole); adminUserAddDto.setUserRole(userRole);
adminUserDto.setUserType(userType); adminUserAddDto.setUserType(userType);
return adminUserDto; return adminUserAddDto;
} }
} }
@@ -1,13 +1,11 @@
package com.alist.api.modules.admin.user.service; package com.alist.api.modules.admin.user.service;
import com.alist.api.modules.admin.user.dto.AdminUserDto; import com.alist.api.modules.admin.user.dto.AdminUserAddDto;
import com.alist.api.modules.admin.user.vo.AdminUserVo; import com.alist.api.modules.admin.user.vo.AdminUserAddVo;
import com.alist.api.modules.user.dto.UserDto; import com.alist.api.modules.user.dto.UserDto;
import com.alist.api.modules.user.dto.UserTokenDto;
import com.alist.api.modules.user.service.UserService; import com.alist.api.modules.user.service.UserService;
import com.alist.api.modules.user.vo.UserVo; import com.alist.api.modules.user.vo.UserVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -21,24 +19,24 @@ public class AdminUserService {
} }
@Transactional @Transactional
public AdminUserVo adminInsertUser(AdminUserDto adminUserDto) { public AdminUserAddVo insertAdminUserAdd(AdminUserAddDto adminUserAddDto) {
UserDto userDto = new UserDto(); UserDto userDto = new UserDto();
userDto.setId(adminUserDto.getId()); userDto.setId(adminUserAddDto.getId());
userDto.setPassword(adminUserDto.getPassword()); userDto.setPassword(adminUserAddDto.getPassword());
userDto.setUserRole(adminUserDto.getUserRole()); userDto.setUserRole(adminUserAddDto.getUserRole());
userDto.setUserType(adminUserDto.getUserType()); userDto.setUserType(adminUserAddDto.getUserType());
UserVo userVo = userService.insertUser(userDto); UserVo userVo = userService.insertUser(userDto);
AdminUserVo result = new AdminUserVo(); AdminUserAddVo adminUserAddVo = new AdminUserAddVo();
result.setResultCode(userVo.getResultCode()); adminUserAddVo.setResultCode(userVo.getResultCode());
result.setUserIdx(userVo.getUserIdx()); adminUserAddVo.setUserIdx(userVo.getUserIdx());
result.setId(userVo.getId()); adminUserAddVo.setId(userVo.getId());
result.setUserRole(userVo.getUserRole()); adminUserAddVo.setUserRole(userVo.getUserRole());
result.setUserType(userVo.getUserType()); adminUserAddVo.setUserType(userVo.getUserType());
return result; return adminUserAddVo;
} }
} }
@@ -8,7 +8,7 @@ import lombok.Setter;
@Schema(description = "Admin 사용자 회원가입 응답") @Schema(description = "Admin 사용자 회원가입 응답")
@Setter @Setter
@Getter @Getter
public class AdminUserVo { public class AdminUserAddVo {
@Schema(description = "회원 PK", example = "14") @Schema(description = "회원 PK", example = "14")
private Integer userIdx; private Integer userIdx;