diff --git a/src/main/java/com/alist/api/modules/admin/user/service/AdminUserService.java b/src/main/java/com/alist/api/modules/admin/user/service/AdminUserService.java index cfb1619..c5e2138 100644 --- a/src/main/java/com/alist/api/modules/admin/user/service/AdminUserService.java +++ b/src/main/java/com/alist/api/modules/admin/user/service/AdminUserService.java @@ -28,7 +28,7 @@ public class AdminUserService { userDto.setUserRole(adminUserAddDto.getUserRole()); userDto.setUserType(adminUserAddDto.getUserType()); - UserVo userVo = userService.insertUser(userDto); + UserVo userVo = userService.insertUserAdd(userDto); AdminUserAddVo adminUserAddVo = new AdminUserAddVo(); adminUserAddVo.setResultCode(userVo.getResultCode()); diff --git a/src/main/java/com/alist/api/modules/user/UserController.java b/src/main/java/com/alist/api/modules/user/UserController.java index 03c1d7f..50a3e20 100644 --- a/src/main/java/com/alist/api/modules/user/UserController.java +++ b/src/main/java/com/alist/api/modules/user/UserController.java @@ -25,13 +25,14 @@ public class UserController { } @Operation( - summary = "사용자 회원가입", - description = "새로운 사용자를 등록합니다. 아이디 중복 시 오류를 반환합니다." + summary = "사용자 회원가입" + , description = "새로운 사용자를 등록합니다. 아이디 중복 시 오류를 반환합니다." ) - @PostMapping("/signup") - public ResponseEntity> signup(@Valid @RequestBody UserSignupForm userSignupForm) { - - UserVo userVo = userService.insertUser(userSignupForm.toUserDto()); + @PostMapping("/add") + public ResponseEntity> userAdd( + @Valid @RequestBody UserAddForm userAddForm + ) { + UserVo userVo = userService.insertUserAdd(userAddForm.toDto()); if (userVo.getResultCode() == 2004) { return ApiResponse.entity(userVo, ApiResponseCode.CODE_2004, "아이디"); @@ -41,125 +42,142 @@ public class UserController { } @Operation( - summary = "이전 회원 정보 조회", - description = "이전 사이트의 회원 정보를 조회 후 list로 리턴합니다." + summary = "이전 회원 정보 조회" + , description = "이전 사이트의 회원 정보를 조회 후 list로 리턴합니다." ) - @PostMapping("/migrationUserList") - public ResponseEntity> migrationUserList(@Valid @RequestBody MigrationUserForm migrationUserForm) { + @PostMapping("/migration/list") + public ResponseEntity> userMigrationList( + @Valid @RequestBody UserMigrationListForm userMigrationListForm + ) { + UserMigrationListVo userMigrationListVo = userService.selectUserMigrationList(userMigrationListForm.toDto()); - MigrationUserVo result = userService.selectMigrationUserList(migrationUserForm.toUserDto()); - - boolean empty = (result.getAlistUserList() == null || result.getAlistUserList().isEmpty()) && (result.getEltownUserList() == null || result.getEltownUserList().isEmpty()); + boolean empty = (userMigrationListVo.getAlistUserList() == null || userMigrationListVo.getAlistUserList().isEmpty()) && (userMigrationListVo.getEltownUserList() == null || userMigrationListVo.getEltownUserList().isEmpty()); if (empty) { - return ApiResponse.entity(result, ApiResponseCode.CODE_2003); + return ApiResponse.entity(userMigrationListVo, ApiResponseCode.CODE_2003); } - return ApiResponse.entity(result, ApiResponseCode.CODE_2001, "이전 회원"); + return ApiResponse.entity(userMigrationListVo, ApiResponseCode.CODE_2001, "이전 회원"); } @Operation( - summary = "사용자 비밀번호 확인", - description = "로그인한 사용자의 현재 비밀번호가 일치하는지 확인합니다." + summary = "사용자 개인정보 조회" + , description = "로그인한 사용자의 개인정보를 조회합니다." + ) + @GetMapping("/profile/view") + public ResponseEntity> userProfileView() { + UserProfileViewVo userProfileViewVo = userService.selectUserProfileView(); + + if (userProfileViewVo == null) { + UserProfileViewVo userProfileViewVo1 = new UserProfileViewVo(); + return ApiResponse.entity(userProfileViewVo1, ApiResponseCode.CODE_2003); + } + + return ApiResponse.entity(userProfileViewVo, ApiResponseCode.CODE_2001, "개인정보"); + } + + @Operation( + summary = "사용자 비밀번호 확인" + , description = "로그인한 사용자의 현재 비밀번호가 일치하는지 확인합니다." ) @PostMapping("/password/check") - public ResponseEntity> passwordCheck( + public ResponseEntity> userPasswordCheck( @Valid @RequestBody UserPasswordCheckForm userPasswordCheckForm ) { - UserPasswordCheckVo result = userService.selectPasswordCheck(userPasswordCheckForm.toUserPasswordCheckDto()); + UserPasswordCheckVo userPasswordCheckVo = userService.selectUserPasswordCheck(userPasswordCheckForm.toDto()); - if (!result.isPasswordMatched()) { - if (result.getResultCode() == 4003) { - return ApiResponse.entity(result, ApiResponseCode.CODE_4001); - } else if (result.getResultCode() == 2003) { - return ApiResponse.entity(result, ApiResponseCode.CODE_2003); + if (!userPasswordCheckVo.isPasswordMatched()) { + if (userPasswordCheckVo.getResultCode() == 4003) { + return ApiResponse.entity(userPasswordCheckVo, ApiResponseCode.CODE_4001); + } else if (userPasswordCheckVo.getResultCode() == 2003) { + return ApiResponse.entity(userPasswordCheckVo, ApiResponseCode.CODE_2003); } } - return ApiResponse.entity(result, ApiResponseCode.CODE_200); + return ApiResponse.entity(userPasswordCheckVo, ApiResponseCode.CODE_200); } @Operation( - summary = "사용자 비밀번호 수정", - description = "로그인한 사용자의 현재 비밀번호를 확인한 뒤 새 비밀번호로 변경합니다." + summary = "사용자 비밀번호 수정" + , description = "로그인한 사용자의 현재 비밀번호를 확인한 뒤 새 비밀번호로 변경합니다." ) - @PatchMapping("/password") - public ResponseEntity> updatePassword( - @Valid @RequestBody UserPasswordChangeForm userPasswordChangeForm + @PatchMapping("/password/modify") + public ResponseEntity> userPasswordModify( + @Valid @RequestBody UserPasswordModifyForm userPasswordModifyForm ) { - UserPasswordChangeVo result = userService.updatePassword(userPasswordChangeForm.toUserPasswordChangeDto()); + UserPasswordModifyVo userPasswordModifyVo = userService.updateUserPasswordModify(userPasswordModifyForm.toDto()); - if (!result.isPasswordChanged()) { - if (result.getResultCode() == 4003 || result.getResultCode() == 4001) { - return ApiResponse.entity(result, ApiResponseCode.CODE_4001); + if (!userPasswordModifyVo.isPasswordChanged()) { + if (userPasswordModifyVo.getResultCode() == 4003 || userPasswordModifyVo.getResultCode() == 4001) { + return ApiResponse.entity(userPasswordModifyVo, ApiResponseCode.CODE_4001); } - return ApiResponse.entity(result, ApiResponseCode.CODE_2003); + return ApiResponse.entity(userPasswordModifyVo, ApiResponseCode.CODE_2003); } - return ApiResponse.entity(result, ApiResponseCode.CODE_2005, "비밀번호 변경"); + return ApiResponse.entity(userPasswordModifyVo, ApiResponseCode.CODE_2005, "비밀번호 변경"); } @Operation( - summary = "사용자 개인정보 수정", - description = "로그인한 사용자의 현재 비밀번호를 확인한 뒤 이메일과 휴대폰 번호를 수정합니다." + summary = "사용자 개인정보 수정" + , description = "로그인한 사용자의 현재 비밀번호를 확인한 뒤 이메일과 휴대폰 번호를 수정합니다." ) - @PatchMapping("/profile") - public ResponseEntity> updateProfile( - @Valid @RequestBody UserProfileUpdateForm userProfileUpdateForm + @PatchMapping("/profile/modify") + public ResponseEntity> userProfileModify( + @Valid @RequestBody UserProfileModifyForm userProfileModifyForm ) { - UserProfileUpdateVo result = userService.updateProfile(userProfileUpdateForm.toUserProfileUpdateDto()); + UserProfileModifyVo userProfileModifyVo = userService.updateUserProfileModify(userProfileModifyForm.toDto()); - if (!result.isProfileUpdated()) { - if (result.getResultCode() == 4003 || result.getResultCode() == 4001) { - return ApiResponse.entity(result, ApiResponseCode.CODE_4001); + if (!userProfileModifyVo.isProfileUpdated()) { + if (userProfileModifyVo.getResultCode() == 4003 || userProfileModifyVo.getResultCode() == 4001) { + return ApiResponse.entity(userProfileModifyVo, ApiResponseCode.CODE_4001); } - return ApiResponse.entity(result, ApiResponseCode.CODE_2003); + return ApiResponse.entity(userProfileModifyVo, ApiResponseCode.CODE_2003); } - return ApiResponse.entity(result, ApiResponseCode.CODE_2005, "개인정보 수정"); + return ApiResponse.entity(userProfileModifyVo, ApiResponseCode.CODE_2005, "개인정보 수정"); } @Operation( - summary = "사용자 탈퇴 상태 변경", - description = "로그인한 사용자의 탈퇴 요청 또는 탈퇴 요청 철회를 처리합니다. P: 탈퇴대기, N: 탈퇴요청 철회" + summary = "사용자 탈퇴 상태 변경" + , description = "로그인한 사용자의 탈퇴 요청 또는 탈퇴 요청 철회를 처리합니다. P: 탈퇴대기, N: 탈퇴요청 철회" ) - @PatchMapping("/withdraw") - public ResponseEntity> updateWithdrawStatus( - @Valid @RequestBody UserWithdrawStatusForm userWithdrawStatusForm + @PatchMapping("/withdraw/modify") + public ResponseEntity> userWithdrawModify( + @Valid @RequestBody UserWithdrawModifyForm userWithdrawModifyForm ) { - UserWithdrawStatusVo result = userService.updateWithdrawStatus(userWithdrawStatusForm.toUserWithdrawStatusUpdateDto()); + UserWithdrawModifyVo userWithdrawModifyVo = userService.updateUserWithdrawModify(userWithdrawModifyForm.toDto()); - if (!result.isWithdrawStatusUpdated()) { - if (result.getResultCode() == 4003 || result.getResultCode() == 4001) { - return ApiResponse.entity(result, ApiResponseCode.CODE_4001); + if (!userWithdrawModifyVo.isWithdrawStatusUpdated()) { + if (userWithdrawModifyVo.getResultCode() == 4003 || userWithdrawModifyVo.getResultCode() == 4001) { + return ApiResponse.entity(userWithdrawModifyVo, ApiResponseCode.CODE_4001); } - return ApiResponse.entity(result, ApiResponseCode.CODE_2003); + return ApiResponse.entity(userWithdrawModifyVo, ApiResponseCode.CODE_2003); } - return ApiResponse.entity(result, ApiResponseCode.CODE_2005, "탈퇴 상태 변경"); + return ApiResponse.entity(userWithdrawModifyVo, ApiResponseCode.CODE_2005, "탈퇴 상태 변경"); } @Operation( - summary = "사용자 휴면 상태 변경", - description = "로그인한 사용자의 휴면 처리 또는 휴면 해지를 처리합니다. Y: 휴면 회원, N: 휴면 해지" + summary = "사용자 휴면 상태 변경" + , description = "로그인한 사용자의 휴면 처리 또는 휴면 해지를 처리합니다. Y: 휴면 회원, N: 휴면 해지" ) - @PatchMapping("/dormant") - public ResponseEntity> updateDormantStatus( - @Valid @RequestBody UserDormantStatusForm userDormantStatusForm + @PatchMapping("/dormant/modify") + public ResponseEntity> userDormantModify( + @Valid @RequestBody UserDormantModifyForm userDormantModifyForm ) { - UserDormantStatusVo result = userService.updateDormantStatus(userDormantStatusForm.toUserDormantStatusUpdateDto()); + UserDormantModifyVo userDormantModifyVo = userService.updateUserDormantModify(userDormantModifyForm.toDto()); - if (!result.isDormantStatusUpdated()) { - if (result.getResultCode() == 4003 || result.getResultCode() == 4001) { - return ApiResponse.entity(result, ApiResponseCode.CODE_4001); + if (!userDormantModifyVo.isDormantStatusUpdated()) { + if (userDormantModifyVo.getResultCode() == 4003 || userDormantModifyVo.getResultCode() == 4001) { + return ApiResponse.entity(userDormantModifyVo, ApiResponseCode.CODE_4001); } - return ApiResponse.entity(result, ApiResponseCode.CODE_2003); + return ApiResponse.entity(userDormantModifyVo, ApiResponseCode.CODE_2003); } - return ApiResponse.entity(result, ApiResponseCode.CODE_2005, "휴면 상태 변경"); + return ApiResponse.entity(userDormantModifyVo, ApiResponseCode.CODE_2005, "휴면 상태 변경"); } } \ No newline at end of file diff --git a/src/main/java/com/alist/api/modules/user/dto/UserDormantStatusDto.java b/src/main/java/com/alist/api/modules/user/dto/UserDormantModifyDto.java similarity index 82% rename from src/main/java/com/alist/api/modules/user/dto/UserDormantStatusDto.java rename to src/main/java/com/alist/api/modules/user/dto/UserDormantModifyDto.java index 00ec939..d50b3cc 100644 --- a/src/main/java/com/alist/api/modules/user/dto/UserDormantStatusDto.java +++ b/src/main/java/com/alist/api/modules/user/dto/UserDormantModifyDto.java @@ -5,7 +5,7 @@ import lombok.Setter; @Getter @Setter -public class UserDormantStatusDto { +public class UserDormantModifyDto { private Integer userTokenIdx; private String dormantYn; } diff --git a/src/main/java/com/alist/api/modules/user/dto/UserPasswordChangeDto.java b/src/main/java/com/alist/api/modules/user/dto/UserPasswordModifyDto.java similarity index 84% rename from src/main/java/com/alist/api/modules/user/dto/UserPasswordChangeDto.java rename to src/main/java/com/alist/api/modules/user/dto/UserPasswordModifyDto.java index 24c11a8..52490ff 100644 --- a/src/main/java/com/alist/api/modules/user/dto/UserPasswordChangeDto.java +++ b/src/main/java/com/alist/api/modules/user/dto/UserPasswordModifyDto.java @@ -5,7 +5,7 @@ import lombok.Setter; @Getter @Setter -public class UserPasswordChangeDto { +public class UserPasswordModifyDto { private Integer userTokenIdx; private String currentPassword; private String newPassword; diff --git a/src/main/java/com/alist/api/modules/user/dto/UserProfileUpdateDto.java b/src/main/java/com/alist/api/modules/user/dto/UserProfileModifyDto.java similarity index 86% rename from src/main/java/com/alist/api/modules/user/dto/UserProfileUpdateDto.java rename to src/main/java/com/alist/api/modules/user/dto/UserProfileModifyDto.java index f6b14f3..12dc836 100644 --- a/src/main/java/com/alist/api/modules/user/dto/UserProfileUpdateDto.java +++ b/src/main/java/com/alist/api/modules/user/dto/UserProfileModifyDto.java @@ -5,7 +5,7 @@ import lombok.Setter; @Getter @Setter -public class UserProfileUpdateDto { +public class UserProfileModifyDto { private Integer userTokenIdx; private String currentPassword; private String email; diff --git a/src/main/java/com/alist/api/modules/user/dto/UserWithdrawStatusDto.java b/src/main/java/com/alist/api/modules/user/dto/UserWithdrawModifyDto.java similarity index 82% rename from src/main/java/com/alist/api/modules/user/dto/UserWithdrawStatusDto.java rename to src/main/java/com/alist/api/modules/user/dto/UserWithdrawModifyDto.java index ce6f2f8..b02a11f 100644 --- a/src/main/java/com/alist/api/modules/user/dto/UserWithdrawStatusDto.java +++ b/src/main/java/com/alist/api/modules/user/dto/UserWithdrawModifyDto.java @@ -5,7 +5,7 @@ import lombok.Setter; @Getter @Setter -public class UserWithdrawStatusDto { +public class UserWithdrawModifyDto { private Integer userTokenIdx; private String withdrawStatus; } diff --git a/src/main/java/com/alist/api/modules/user/form/UserSignupForm.java b/src/main/java/com/alist/api/modules/user/form/UserAddForm.java similarity index 65% rename from src/main/java/com/alist/api/modules/user/form/UserSignupForm.java rename to src/main/java/com/alist/api/modules/user/form/UserAddForm.java index 0e5efad..fbf382b 100644 --- a/src/main/java/com/alist/api/modules/user/form/UserSignupForm.java +++ b/src/main/java/com/alist/api/modules/user/form/UserAddForm.java @@ -11,49 +11,49 @@ import lombok.Setter; @Setter @Getter @Schema(description = "회원 가입 요청 폼") -public class UserSignupForm { +public class UserAddForm { @Schema( - description = "사용자 아이디 (공백 불가)", - example = "test" + description = "사용자 아이디 (공백 불가)" + , example = "test" ) @NotBlank(message = "아이디를 입력해주세요.") private String id; @Schema( - description = "비밀번호 (8~64자, 영문 + 숫자 조합, 공백 불가)", - example = "pass1234" + description = "비밀번호 (8~64자, 영문 + 숫자 조합, 공백 불가)" + , example = "pass1234" ) @NotBlank(message = "비밀번호를 입력해주세요.") @Size(min = 8, max = 64, message = "비밀번호는 8~64자여야 합니다.") @Pattern( - regexp = "^(?=.*[A-Za-z])(?=.*\\d)\\S+$", - message = "비밀번호는 영문과 숫자를 포함하고 공백이 없어야 합니다." + regexp = "^(?=.*[A-Za-z])(?=.*\\d)\\S+$" + , message = "비밀번호는 영문과 숫자를 포함하고 공백이 없어야 합니다." ) private String password; @NotBlank(message = "사용자 권한(교사{CCM: 복합 캠퍼스 마스터, SCM:단일 캠퍼스 마스터, I: 교사}, 학생{R:정회원, E:수강생}") @Pattern( - regexp = "^(CCM|SCM|I|R|E)$", - message = "사용자 권한(교사{CCM: 복합 캠퍼스 마스터, SCM:단일 캠퍼스 마스터, I: 교사}, 학생{R:정회원, E:수강생})" + regexp = "^(CCM|SCM|I|R|E)$" + , message = "사용자 권한(교사{CCM: 복합 캠퍼스 마스터, SCM:단일 캠퍼스 마스터, I: 교사}, 학생{R:정회원, E:수강생})" ) @Schema( - description = "사용자 권한(사용자 권한(교사{CCM: 복합 캠퍼스 마스터, SCM:단일 캠퍼스 마스터, I: 교사}, 학생{R:정회원, E:수강생})", - example = "I" + description = "사용자 권한(사용자 권한(교사{CCM: 복합 캠퍼스 마스터, SCM:단일 캠퍼스 마스터, I: 교사}, 학생{R:정회원, E:수강생})" + , example = "I" ) private String userRole; @NotBlank(message = "사용자 타입(T:교사, S: 학생)") @Pattern( - regexp = "^(S|T)$", - message = "사용자 타입 S(학생), T(교사)만 가능합니다." + regexp = "^(S|T)$" + , message = "사용자 타입 S(학생), T(교사)만 가능합니다." ) @Schema( - description = "사용자 타입(T:교사, S: 학생)", - example = "T" + description = "사용자 타입(T:교사, S: 학생)" + , example = "T" ) private String userType; - public UserDto toUserDto() { + public UserDto toDto() { UserDto userDto = new UserDto(); userDto.setId(id.trim()); userDto.setPassword(password); diff --git a/src/main/java/com/alist/api/modules/user/form/UserDormantStatusForm.java b/src/main/java/com/alist/api/modules/user/form/UserDormantModifyForm.java similarity index 57% rename from src/main/java/com/alist/api/modules/user/form/UserDormantStatusForm.java rename to src/main/java/com/alist/api/modules/user/form/UserDormantModifyForm.java index 04039cd..11c9c11 100644 --- a/src/main/java/com/alist/api/modules/user/form/UserDormantStatusForm.java +++ b/src/main/java/com/alist/api/modules/user/form/UserDormantModifyForm.java @@ -1,6 +1,6 @@ package com.alist.api.modules.user.form; -import com.alist.api.modules.user.dto.UserDormantStatusDto; +import com.alist.api.modules.user.dto.UserDormantModifyDto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; @@ -10,19 +10,19 @@ import lombok.Setter; @Schema(description = "사용자 휴면 상태 변경 요청 폼") @Getter @Setter -public class UserDormantStatusForm { +public class UserDormantModifyForm { @Schema( - description = "휴면 여부. Y: 휴면 회원, N: 휴면 해지", - example = "Y", - requiredMode = Schema.RequiredMode.REQUIRED + description = "휴면 여부. Y: 휴면 회원, N: 휴면 해지" + , example = "Y" + , requiredMode = Schema.RequiredMode.REQUIRED ) @NotBlank(message = "휴면 여부는 필수입니다.") @Pattern(regexp = "^[YN]$", message = "휴면 여부는 Y 또는 N만 가능합니다.") private String dormantYn; - public UserDormantStatusDto toUserDormantStatusUpdateDto() { - UserDormantStatusDto userDormantStatusDto = new UserDormantStatusDto(); - userDormantStatusDto.setDormantYn(dormantYn); - return userDormantStatusDto; + public UserDormantModifyDto toDto() { + UserDormantModifyDto userDormantModifyDto = new UserDormantModifyDto(); + userDormantModifyDto.setDormantYn(dormantYn); + return userDormantModifyDto; } } diff --git a/src/main/java/com/alist/api/modules/user/form/MigrationUserForm.java b/src/main/java/com/alist/api/modules/user/form/UserMigrationListForm.java similarity index 81% rename from src/main/java/com/alist/api/modules/user/form/MigrationUserForm.java rename to src/main/java/com/alist/api/modules/user/form/UserMigrationListForm.java index 11fc404..11cca7f 100644 --- a/src/main/java/com/alist/api/modules/user/form/MigrationUserForm.java +++ b/src/main/java/com/alist/api/modules/user/form/UserMigrationListForm.java @@ -9,10 +9,10 @@ import lombok.Setter; @Setter @Getter @Schema(description = "이전회원 정보 조회") -public class MigrationUserForm { +public class UserMigrationListForm { @Schema( - description = "사용자 아이디 (공백 불가)", - example = "test" + description = "사용자 아이디 (공백 불가)" + , example = "test" ) @NotBlank(message = "아이디를 입력해주세요.") private String id; @@ -20,7 +20,7 @@ public class MigrationUserForm { @NotBlank(message = "비밀번호를 입력해주세요.") private String password; - public UserDto toUserDto() { + public UserDto toDto() { UserDto userDto = new UserDto(); userDto.setId(id.trim()); userDto.setPassword(password); diff --git a/src/main/java/com/alist/api/modules/user/form/UserPasswordChangeForm.java b/src/main/java/com/alist/api/modules/user/form/UserPasswordChangeForm.java deleted file mode 100644 index 65ebd24..0000000 --- a/src/main/java/com/alist/api/modules/user/form/UserPasswordChangeForm.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.alist.api.modules.user.form; - -import com.alist.api.modules.user.dto.UserPasswordChangeDto; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import lombok.Getter; -import lombok.Setter; - -@Schema(description = "사용자 비밀번호 수정 요청 폼") -@Getter -@Setter -public class UserPasswordChangeForm { - @Schema( - description = "현재 비밀번호", - example = "password1234", - requiredMode = Schema.RequiredMode.REQUIRED - ) - @NotBlank(message = "현재 비밀번호는 필수입니다.") - private String currentPassword; - - @Schema( - description = "새 비밀번호", - example = "newPassword1234", - requiredMode = Schema.RequiredMode.REQUIRED - ) - @NotBlank(message = "새 비밀번호는 필수입니다.") - private String newPassword; - - public UserPasswordChangeDto toUserPasswordChangeDto() { - UserPasswordChangeDto userPasswordChangeDto = new UserPasswordChangeDto(); - userPasswordChangeDto.setCurrentPassword(currentPassword); - userPasswordChangeDto.setNewPassword(newPassword); - return userPasswordChangeDto; - } -} diff --git a/src/main/java/com/alist/api/modules/user/form/UserPasswordCheckForm.java b/src/main/java/com/alist/api/modules/user/form/UserPasswordCheckForm.java index 149a7bd..cfd06c3 100644 --- a/src/main/java/com/alist/api/modules/user/form/UserPasswordCheckForm.java +++ b/src/main/java/com/alist/api/modules/user/form/UserPasswordCheckForm.java @@ -11,14 +11,14 @@ import lombok.Setter; @Setter public class UserPasswordCheckForm { @Schema( - description = "현재 비밀번호", - example = "password1234", - requiredMode = Schema.RequiredMode.REQUIRED + description = "현재 비밀번호" + , example = "password1234" + , requiredMode = Schema.RequiredMode.REQUIRED ) @NotBlank(message = "비밀번호는 필수입니다.") private String password; - public UserPasswordCheckDto toUserPasswordCheckDto() { + public UserPasswordCheckDto toDto() { UserPasswordCheckDto userPasswordCheckDto = new UserPasswordCheckDto(); userPasswordCheckDto.setPassword(password); return userPasswordCheckDto; diff --git a/src/main/java/com/alist/api/modules/user/form/UserPasswordModifyForm.java b/src/main/java/com/alist/api/modules/user/form/UserPasswordModifyForm.java new file mode 100644 index 0000000..5f70344 --- /dev/null +++ b/src/main/java/com/alist/api/modules/user/form/UserPasswordModifyForm.java @@ -0,0 +1,35 @@ +package com.alist.api.modules.user.form; + +import com.alist.api.modules.user.dto.UserPasswordModifyDto; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Schema(description = "사용자 비밀번호 수정 요청 폼") +@Getter +@Setter +public class UserPasswordModifyForm { + @Schema( + description = "현재 비밀번호" + , example = "password1234" + , requiredMode = Schema.RequiredMode.REQUIRED + ) + @NotBlank(message = "현재 비밀번호는 필수입니다.") + private String currentPassword; + + @Schema( + description = "새 비밀번호" + , example = "newPassword1234" + , requiredMode = Schema.RequiredMode.REQUIRED + ) + @NotBlank(message = "새 비밀번호는 필수입니다.") + private String newPassword; + + public UserPasswordModifyDto toDto() { + UserPasswordModifyDto userPasswordModifyDto = new UserPasswordModifyDto(); + userPasswordModifyDto.setCurrentPassword(currentPassword); + userPasswordModifyDto.setNewPassword(newPassword); + return userPasswordModifyDto; + } +} diff --git a/src/main/java/com/alist/api/modules/user/form/UserProfileUpdateForm.java b/src/main/java/com/alist/api/modules/user/form/UserProfileModifyForm.java similarity index 57% rename from src/main/java/com/alist/api/modules/user/form/UserProfileUpdateForm.java rename to src/main/java/com/alist/api/modules/user/form/UserProfileModifyForm.java index 6d0ffdd..5b17752 100644 --- a/src/main/java/com/alist/api/modules/user/form/UserProfileUpdateForm.java +++ b/src/main/java/com/alist/api/modules/user/form/UserProfileModifyForm.java @@ -1,6 +1,6 @@ package com.alist.api.modules.user.form; -import com.alist.api.modules.user.dto.UserProfileUpdateDto; +import com.alist.api.modules.user.dto.UserProfileModifyDto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; @@ -10,11 +10,11 @@ import lombok.Setter; @Schema(description = "사용자 개인정보 수정 요청 폼") @Getter @Setter -public class UserProfileUpdateForm { +public class UserProfileModifyForm { @Schema( - description = "현재 비밀번호", - example = "password1234", - requiredMode = Schema.RequiredMode.REQUIRED + description = "현재 비밀번호" + , example = "password1234" + , requiredMode = Schema.RequiredMode.REQUIRED ) @NotBlank(message = "현재 비밀번호는 필수입니다.") private String currentPassword; @@ -26,11 +26,11 @@ public class UserProfileUpdateForm { @Schema(description = "휴대폰 번호. 수정할 때만 전달합니다.", example = "01012345678") private String hp; - public UserProfileUpdateDto toUserProfileUpdateDto() { - UserProfileUpdateDto userProfileUpdateDto = new UserProfileUpdateDto(); - userProfileUpdateDto.setCurrentPassword(currentPassword); - userProfileUpdateDto.setEmail(email); - userProfileUpdateDto.setHp(hp); - return userProfileUpdateDto; + public UserProfileModifyDto toDto() { + UserProfileModifyDto userProfileModifyDto = new UserProfileModifyDto(); + userProfileModifyDto.setCurrentPassword(currentPassword); + userProfileModifyDto.setEmail(email); + userProfileModifyDto.setHp(hp); + return userProfileModifyDto; } } diff --git a/src/main/java/com/alist/api/modules/user/form/UserWithdrawStatusForm.java b/src/main/java/com/alist/api/modules/user/form/UserWithdrawModifyForm.java similarity index 56% rename from src/main/java/com/alist/api/modules/user/form/UserWithdrawStatusForm.java rename to src/main/java/com/alist/api/modules/user/form/UserWithdrawModifyForm.java index 2d88aa8..8a2d9a7 100644 --- a/src/main/java/com/alist/api/modules/user/form/UserWithdrawStatusForm.java +++ b/src/main/java/com/alist/api/modules/user/form/UserWithdrawModifyForm.java @@ -1,6 +1,6 @@ package com.alist.api.modules.user.form; -import com.alist.api.modules.user.dto.UserWithdrawStatusDto; +import com.alist.api.modules.user.dto.UserWithdrawModifyDto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; @@ -10,19 +10,19 @@ import lombok.Setter; @Schema(description = "사용자 탈퇴 상태 변경 요청 폼") @Getter @Setter -public class UserWithdrawStatusForm { +public class UserWithdrawModifyForm { @Schema( - description = "탈퇴 상태. P: 탈퇴대기, N: 탈퇴요청 철회", - example = "P", - requiredMode = Schema.RequiredMode.REQUIRED + description = "탈퇴 상태. P: 탈퇴대기, N: 탈퇴요청 철회" + , example = "P" + , requiredMode = Schema.RequiredMode.REQUIRED ) @NotBlank(message = "탈퇴 상태는 필수입니다.") @Pattern(regexp = "^[PN]$", message = "탈퇴 상태는 P 또는 N만 가능합니다.") private String withdrawStatus; - public UserWithdrawStatusDto toUserWithdrawStatusUpdateDto() { - UserWithdrawStatusDto userWithdrawStatusDto = new UserWithdrawStatusDto(); - userWithdrawStatusDto.setWithdrawStatus(withdrawStatus); - return userWithdrawStatusDto; + public UserWithdrawModifyDto toDto() { + UserWithdrawModifyDto userWithdrawModifyDto = new UserWithdrawModifyDto(); + userWithdrawModifyDto.setWithdrawStatus(withdrawStatus); + return userWithdrawModifyDto; } } diff --git a/src/main/java/com/alist/api/modules/user/mapper/UserMapper.java b/src/main/java/com/alist/api/modules/user/mapper/UserMapper.java index 2f630e6..c4dab03 100644 --- a/src/main/java/com/alist/api/modules/user/mapper/UserMapper.java +++ b/src/main/java/com/alist/api/modules/user/mapper/UserMapper.java @@ -1,6 +1,7 @@ package com.alist.api.modules.user.mapper; import com.alist.api.modules.user.dto.*; +import com.alist.api.modules.user.vo.UserProfileViewVo; import com.alist.api.modules.user.vo.UserVo; import org.apache.ibatis.annotations.Mapper; @@ -8,17 +9,19 @@ import org.apache.ibatis.annotations.Mapper; public interface UserMapper { int selectDuplicateUserCount(UserDto userDto); - int insertUserSignup(UserDto userDto); + int insertUserAdd(UserDto userDto); - int insertUserTokenSignup(UserTokenDto userTokenDto); + int insertUserToken(UserTokenDto userTokenDto); UserVo selectUserByUserTokenIdx(Integer userTokenIdx); - int updateUserPassword(UserPasswordChangeDto userPasswordChangeDto); + int updateUserPasswordModify(UserPasswordModifyDto userPasswordModifyDto); - int updateUserProfile(UserProfileUpdateDto userProfileUpdateDto); + int updateUserProfileModify(UserProfileModifyDto userProfileModifyDto); - int updateWithdrawStatus(UserWithdrawStatusDto userWithdrawStatusDto); + int updateUserWithdrawModify(UserWithdrawModifyDto userWithdrawModifyDto); - int updateDormantStatus(UserDormantStatusDto userDormantStatusDto); + int updateUserDormantModify(UserDormantModifyDto userDormantModifyDto); + + UserProfileViewVo selectUserProfileView(Integer userTokenIdx); } diff --git a/src/main/java/com/alist/api/modules/user/service/UserService.java b/src/main/java/com/alist/api/modules/user/service/UserService.java index 29bd023..2719191 100644 --- a/src/main/java/com/alist/api/modules/user/service/UserService.java +++ b/src/main/java/com/alist/api/modules/user/service/UserService.java @@ -36,23 +36,23 @@ public class UserService { } @Transactional - public UserVo insertUser(UserDto userDto) { - UserVo result = new UserVo(); - result.setId(userDto.getId()); - result.setUserRole(userDto.getUserRole()); - result.setUserType(userDto.getUserType()); + public UserVo insertUserAdd(UserDto userDto) { + UserVo userVo = new UserVo(); + userVo.setId(userDto.getId()); + userVo.setUserRole(userDto.getUserRole()); + userVo.setUserType(userDto.getUserType()); // 중복체크 if (userMapper.selectDuplicateUserCount(userDto) > 0) { - result.setResultCode(2004); - return result; + userVo.setResultCode(2004); + return userVo; } // 비밀번호 생성 userDto.setNewPassword(passwordEncoder.encode(userDto.getPassword())); // 회원정보 입력 - int resultCount = userMapper.insertUserSignup(userDto); + int resultCount = userMapper.insertUserAdd(userDto); if (resultCount > 0) { // user_api_key 생성 @@ -61,12 +61,12 @@ public class UserService { userTokenDto.setUserRole(userDto.getUserRole()); userTokenDto.setUserType(userDto.getUserType()); - result.setUserIdx(userDto.getUserIdx()); + userVo.setUserIdx(userDto.getUserIdx()); apiKeyWithRetry(userTokenDto); } - return result; + return userVo; } @Transactional @@ -74,7 +74,7 @@ public class UserService { for (int i = 0; i < 5; i++) { userTokenDto.setUserApiKey(ApiKeyGenerator.userApiKeyProc()); try { - return userMapper.insertUserTokenSignup(userTokenDto); + return userMapper.insertUserToken(userTokenDto); } catch (DuplicateKeyException e) { // 충돌이면 다시 생성 log.warn("Duplicate API key. retrying... userId={}", userTokenDto.getUserIdx()); @@ -84,7 +84,7 @@ public class UserService { } @Transactional(readOnly = true) - public MigrationUserVo selectMigrationUserList(UserDto userDto) { + public UserMigrationListVo selectUserMigrationList(UserDto userDto) { AlistUserDto alistUserDto = new AlistUserDto(); alistUserDto.setId(userDto.getId()); alistUserDto.setPassword(userDto.getPassword()); @@ -99,190 +99,201 @@ public class UserService { // eltown 조회 List eltownUserList = eltownUserService.selectEltownUserList(eltownUserDto); - MigrationUserVo result = new MigrationUserVo(); + UserMigrationListVo userMigrationListVo = new UserMigrationListVo(); - result.setAlistUserList(alistUserList); - result.setEltownUserList(eltownUserList); + userMigrationListVo.setAlistUserList(alistUserList); + userMigrationListVo.setEltownUserList(eltownUserList); - return result; + return userMigrationListVo; } @Transactional(readOnly = true) - public UserPasswordCheckVo selectPasswordCheck(UserPasswordCheckDto userPasswordCheckDto) { - UserPasswordCheckVo result = new UserPasswordCheckVo(); + public UserProfileViewVo selectUserProfileView() { + Integer userTokenIdx = SecurityUtil.getLoginUserTokenIdx(); + + if (userTokenIdx == null) { + return null; + } + + return userMapper.selectUserProfileView(userTokenIdx); + } + + @Transactional(readOnly = true) + public UserPasswordCheckVo selectUserPasswordCheck(UserPasswordCheckDto userPasswordCheckDto) { + UserPasswordCheckVo userPasswordCheckVo = new UserPasswordCheckVo(); Integer userTokenIdx = SecurityUtil.getLoginUserTokenIdx(); userPasswordCheckDto.setUserTokenIdx(userTokenIdx); if (userTokenIdx == null || userPasswordCheckDto.getPassword() == null) { - result.setPasswordMatched(false); - result.setResultCode(4003); - return result; + userPasswordCheckVo.setPasswordMatched(false); + userPasswordCheckVo.setResultCode(4003); + return userPasswordCheckVo; } UserVo userVo = userMapper.selectUserByUserTokenIdx(userPasswordCheckDto.getUserTokenIdx()); if (userVo == null || userVo.getPassword() == null) { - result.setPasswordMatched(false); - result.setResultCode(2003); - return result; + userPasswordCheckVo.setPasswordMatched(false); + userPasswordCheckVo.setResultCode(2003); + return userPasswordCheckVo; } boolean matched = passwordEncoder.matches(userPasswordCheckDto.getPassword(), userVo.getPassword()); if (!matched) { - result.setPasswordMatched(false); - result.setResultCode(2003); - return result; + userPasswordCheckVo.setPasswordMatched(false); + userPasswordCheckVo.setResultCode(2003); + return userPasswordCheckVo; } - result.setPasswordMatched(true); - result.setResultCode(200); + userPasswordCheckVo.setPasswordMatched(true); + userPasswordCheckVo.setResultCode(200); - return result; - } + return userPasswordCheckVo; + } @Transactional - public UserPasswordChangeVo updatePassword(UserPasswordChangeDto userPasswordChangeDto) { - UserPasswordChangeVo result = new UserPasswordChangeVo(); + public UserPasswordModifyVo updateUserPasswordModify(UserPasswordModifyDto userPasswordModifyDto) { + UserPasswordModifyVo userPasswordModifyVo = new UserPasswordModifyVo(); Integer userTokenIdx = SecurityUtil.getLoginUserTokenIdx(); - userPasswordChangeDto.setUserTokenIdx(userTokenIdx); + userPasswordModifyDto.setUserTokenIdx(userTokenIdx); if (userTokenIdx == null - || userPasswordChangeDto.getCurrentPassword() == null - || userPasswordChangeDto.getNewPassword() == null) { - result.setPasswordChanged(false); - result.setResultCode(4003); - return result; + || userPasswordModifyDto.getCurrentPassword() == null + || userPasswordModifyDto.getNewPassword() == null) { + userPasswordModifyVo.setPasswordChanged(false); + userPasswordModifyVo.setResultCode(4003); + return userPasswordModifyVo; } UserVo userVo = userMapper.selectUserByUserTokenIdx(userTokenIdx); if (userVo == null || userVo.getPassword() == null) { - result.setPasswordChanged(false); - result.setResultCode(2003); - return result; + userPasswordModifyVo.setPasswordChanged(false); + userPasswordModifyVo.setResultCode(2003); + return userPasswordModifyVo; } boolean matched = passwordEncoder.matches( - userPasswordChangeDto.getCurrentPassword(), + userPasswordModifyDto.getCurrentPassword(), userVo.getPassword() ); if (!matched) { - result.setPasswordChanged(false); - result.setResultCode(4001); - return result; + userPasswordModifyVo.setPasswordChanged(false); + userPasswordModifyVo.setResultCode(4001); + return userPasswordModifyVo; } - userPasswordChangeDto.setNewPassword(passwordEncoder.encode(userPasswordChangeDto.getNewPassword())); + userPasswordModifyDto.setNewPassword(passwordEncoder.encode(userPasswordModifyDto.getNewPassword())); - int updateCount = userMapper.updateUserPassword(userPasswordChangeDto); + int updateCount = userMapper.updateUserPasswordModify(userPasswordModifyDto); - result.setPasswordChanged(updateCount > 0); - result.setResultCode(updateCount > 0 ? 2005 : 2003); + userPasswordModifyVo.setPasswordChanged(updateCount > 0); + userPasswordModifyVo.setResultCode(updateCount > 0 ? 2005 : 2003); - return result; + return userPasswordModifyVo; } @Transactional - public UserProfileUpdateVo updateProfile(UserProfileUpdateDto userProfileUpdateDto) { - UserProfileUpdateVo result = new UserProfileUpdateVo(); + public UserProfileModifyVo updateUserProfileModify(UserProfileModifyDto userProfileModifyDto) { + UserProfileModifyVo userProfileModifyVo = new UserProfileModifyVo(); Integer userTokenIdx = SecurityUtil.getLoginUserTokenIdx(); - userProfileUpdateDto.setUserTokenIdx(userTokenIdx); + userProfileModifyDto.setUserTokenIdx(userTokenIdx); if (userTokenIdx == null - || userProfileUpdateDto.getCurrentPassword() == null - || (userProfileUpdateDto.getEmail() == null && userProfileUpdateDto.getHp() == null)) { - result.setProfileUpdated(false); - result.setResultCode(4003); - return result; + || userProfileModifyDto.getCurrentPassword() == null + || (userProfileModifyDto.getEmail() == null && userProfileModifyDto.getHp() == null)) { + userProfileModifyVo.setProfileUpdated(false); + userProfileModifyVo.setResultCode(4003); + return userProfileModifyVo; } UserVo userVo = userMapper.selectUserByUserTokenIdx(userTokenIdx); if (userVo == null || userVo.getPassword() == null) { - result.setProfileUpdated(false); - result.setResultCode(2003); - return result; + userProfileModifyVo.setProfileUpdated(false); + userProfileModifyVo.setResultCode(2003); + return userProfileModifyVo; } boolean matched = passwordEncoder.matches( - userProfileUpdateDto.getCurrentPassword(), + userProfileModifyDto.getCurrentPassword(), userVo.getPassword() ); if (!matched) { - result.setProfileUpdated(false); - result.setResultCode(4001); - return result; + userProfileModifyVo.setProfileUpdated(false); + userProfileModifyVo.setResultCode(4001); + return userProfileModifyVo; } - int updateCount = userMapper.updateUserProfile(userProfileUpdateDto); + int updateCount = userMapper.updateUserProfileModify(userProfileModifyDto); - result.setProfileUpdated(updateCount > 0); - result.setResultCode(updateCount > 0 ? 2005 : 2003); + userProfileModifyVo.setProfileUpdated(updateCount > 0); + userProfileModifyVo.setResultCode(updateCount > 0 ? 2005 : 2003); - return result; + return userProfileModifyVo; } @Transactional - public UserWithdrawStatusVo updateWithdrawStatus(UserWithdrawStatusDto userWithdrawStatusDto) { - UserWithdrawStatusVo result = new UserWithdrawStatusVo(); + public UserWithdrawModifyVo updateUserWithdrawModify(UserWithdrawModifyDto userWithdrawModifyDto) { + UserWithdrawModifyVo userWithdrawModifyVo = new UserWithdrawModifyVo(); Integer userTokenIdx = SecurityUtil.getLoginUserTokenIdx(); - userWithdrawStatusDto.setUserTokenIdx(userTokenIdx); + userWithdrawModifyDto.setUserTokenIdx(userTokenIdx); - if (userTokenIdx == null || userWithdrawStatusDto.getWithdrawStatus() == null) { - result.setWithdrawStatusUpdated(false); - result.setResultCode(4003); - return result; + if (userTokenIdx == null || userWithdrawModifyDto.getWithdrawStatus() == null) { + userWithdrawModifyVo.setWithdrawStatusUpdated(false); + userWithdrawModifyVo.setResultCode(4003); + return userWithdrawModifyVo; } - String withdrawStatus = userWithdrawStatusDto.getWithdrawStatus(); + String withdrawStatus = userWithdrawModifyDto.getWithdrawStatus(); if (!"P".equals(withdrawStatus) && !"N".equals(withdrawStatus)) { - result.setWithdrawStatusUpdated(false); - result.setResultCode(4001); - return result; + userWithdrawModifyVo.setWithdrawStatusUpdated(false); + userWithdrawModifyVo.setResultCode(4001); + return userWithdrawModifyVo; } - int updateCount = userMapper.updateWithdrawStatus(userWithdrawStatusDto); + int updateCount = userMapper.updateUserWithdrawModify(userWithdrawModifyDto); - result.setWithdrawStatusUpdated(updateCount > 0); - result.setResultCode(updateCount > 0 ? 2005 : 2003); + userWithdrawModifyVo.setWithdrawStatusUpdated(updateCount > 0); + userWithdrawModifyVo.setResultCode(updateCount > 0 ? 2005 : 2003); - return result; - } + return userWithdrawModifyVo; + } @Transactional - public UserDormantStatusVo updateDormantStatus(UserDormantStatusDto userDormantStatusDto) { - UserDormantStatusVo result = new UserDormantStatusVo(); + public UserDormantModifyVo updateUserDormantModify(UserDormantModifyDto userDormantModifyDto) { + UserDormantModifyVo userDormantModifyVo = new UserDormantModifyVo(); Integer userTokenIdx = SecurityUtil.getLoginUserTokenIdx(); - userDormantStatusDto.setUserTokenIdx(userTokenIdx); + userDormantModifyDto.setUserTokenIdx(userTokenIdx); - if (userTokenIdx == null || userDormantStatusDto.getDormantYn() == null) { - result.setDormantStatusUpdated(false); - result.setResultCode(4003); - return result; + if (userTokenIdx == null || userDormantModifyDto.getDormantYn() == null) { + userDormantModifyVo.setDormantStatusUpdated(false); + userDormantModifyVo.setResultCode(4003); + return userDormantModifyVo; } - String dormantYn = userDormantStatusDto.getDormantYn(); + String dormantYn = userDormantModifyDto.getDormantYn(); if (!"Y".equals(dormantYn) && !"N".equals(dormantYn)) { - result.setDormantStatusUpdated(false); - result.setResultCode(4001); - return result; + userDormantModifyVo.setDormantStatusUpdated(false); + userDormantModifyVo.setResultCode(4001); + return userDormantModifyVo; } - int updateCount = userMapper.updateDormantStatus(userDormantStatusDto); + int updateCount = userMapper.updateUserDormantModify(userDormantModifyDto); - result.setDormantStatusUpdated(updateCount > 0); - result.setResultCode(updateCount > 0 ? 2005 : 2003); + userDormantModifyVo.setDormantStatusUpdated(updateCount > 0); + userDormantModifyVo.setResultCode(updateCount > 0 ? 2005 : 2003); - return result; + return userDormantModifyVo; } } diff --git a/src/main/java/com/alist/api/modules/user/vo/UserDormantStatusVo.java b/src/main/java/com/alist/api/modules/user/vo/UserDormantModifyVo.java similarity index 92% rename from src/main/java/com/alist/api/modules/user/vo/UserDormantStatusVo.java rename to src/main/java/com/alist/api/modules/user/vo/UserDormantModifyVo.java index 2f2c37b..5521676 100644 --- a/src/main/java/com/alist/api/modules/user/vo/UserDormantStatusVo.java +++ b/src/main/java/com/alist/api/modules/user/vo/UserDormantModifyVo.java @@ -8,7 +8,7 @@ import lombok.Setter; @Schema(description = "사용자 휴면 상태 변경 응답") @Getter @Setter -public class UserDormantStatusVo { +public class UserDormantModifyVo { @Schema(description = "휴면 상태 변경 여부", example = "true") private boolean dormantStatusUpdated; diff --git a/src/main/java/com/alist/api/modules/user/vo/MigrationUserVo.java b/src/main/java/com/alist/api/modules/user/vo/UserMigrationListVo.java similarity index 93% rename from src/main/java/com/alist/api/modules/user/vo/MigrationUserVo.java rename to src/main/java/com/alist/api/modules/user/vo/UserMigrationListVo.java index f0557ae..502a241 100644 --- a/src/main/java/com/alist/api/modules/user/vo/MigrationUserVo.java +++ b/src/main/java/com/alist/api/modules/user/vo/UserMigrationListVo.java @@ -11,7 +11,7 @@ import java.util.List; @Schema(description = "이전 회원 조회 응답") @Getter @Setter -public class MigrationUserVo { +public class UserMigrationListVo { @Schema(description = "ALIST 이전 회원 목록") List alistUserList; diff --git a/src/main/java/com/alist/api/modules/user/vo/UserPasswordChangeVo.java b/src/main/java/com/alist/api/modules/user/vo/UserPasswordModifyVo.java similarity index 92% rename from src/main/java/com/alist/api/modules/user/vo/UserPasswordChangeVo.java rename to src/main/java/com/alist/api/modules/user/vo/UserPasswordModifyVo.java index 27476df..34b2f36 100644 --- a/src/main/java/com/alist/api/modules/user/vo/UserPasswordChangeVo.java +++ b/src/main/java/com/alist/api/modules/user/vo/UserPasswordModifyVo.java @@ -8,7 +8,7 @@ import lombok.Setter; @Schema(description = "사용자 비밀번호 수정 응답") @Getter @Setter -public class UserPasswordChangeVo { +public class UserPasswordModifyVo { @Schema(description = "비밀번호 수정 여부", example = "true") private boolean passwordChanged; diff --git a/src/main/java/com/alist/api/modules/user/vo/UserProfileUpdateVo.java b/src/main/java/com/alist/api/modules/user/vo/UserProfileModifyVo.java similarity index 92% rename from src/main/java/com/alist/api/modules/user/vo/UserProfileUpdateVo.java rename to src/main/java/com/alist/api/modules/user/vo/UserProfileModifyVo.java index f333d10..f40dcc3 100644 --- a/src/main/java/com/alist/api/modules/user/vo/UserProfileUpdateVo.java +++ b/src/main/java/com/alist/api/modules/user/vo/UserProfileModifyVo.java @@ -8,7 +8,7 @@ import lombok.Setter; @Schema(description = "사용자 개인정보 수정 응답") @Getter @Setter -public class UserProfileUpdateVo { +public class UserProfileModifyVo { @Schema(description = "개인정보 수정 여부", example = "true") private boolean profileUpdated; diff --git a/src/main/java/com/alist/api/modules/user/vo/UserProfileViewVo.java b/src/main/java/com/alist/api/modules/user/vo/UserProfileViewVo.java new file mode 100644 index 0000000..09624a7 --- /dev/null +++ b/src/main/java/com/alist/api/modules/user/vo/UserProfileViewVo.java @@ -0,0 +1,28 @@ +package com.alist.api.modules.user.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Schema(description = "사용자 개인정보 조회 응답") +@Getter +@Setter +public class UserProfileViewVo { + @Schema(description = "회원 PK", example = "1") + private Integer userIdx; + + @Schema(description = "회원 아이디", example = "test") + private String id; + + @Schema(description = "이메일", example = "user@example.com") + private String email; + + @Schema(description = "휴대폰 번호", example = "01012345678") + private String hp; + + @Schema(description = "회원 권한 코드", example = "SCM") + private String userRole; + + @Schema(description = "회원 유형 코드. T: 교사, S: 학생", example = "S") + private String userType; +} diff --git a/src/main/java/com/alist/api/modules/user/vo/UserWithdrawStatusVo.java b/src/main/java/com/alist/api/modules/user/vo/UserWithdrawModifyVo.java similarity index 92% rename from src/main/java/com/alist/api/modules/user/vo/UserWithdrawStatusVo.java rename to src/main/java/com/alist/api/modules/user/vo/UserWithdrawModifyVo.java index bee4e08..6c16677 100644 --- a/src/main/java/com/alist/api/modules/user/vo/UserWithdrawStatusVo.java +++ b/src/main/java/com/alist/api/modules/user/vo/UserWithdrawModifyVo.java @@ -8,7 +8,7 @@ import lombok.Setter; @Schema(description = "사용자 탈퇴 상태 변경 응답") @Getter @Setter -public class UserWithdrawStatusVo { +public class UserWithdrawModifyVo { @Schema(description = "탈퇴 상태 변경 여부", example = "true") private boolean withdrawStatusUpdated; diff --git a/src/main/resources/mapper/User/UserMapper.xml b/src/main/resources/mapper/User/UserMapper.xml index 4142c49..aee52b3 100644 --- a/src/main/resources/mapper/User/UserMapper.xml +++ b/src/main/resources/mapper/User/UserMapper.xml @@ -2,18 +2,53 @@ - - /*UserMapper.insertUserSignup*/ + + + + + + + + + /*UserMapper.insertUserAdd*/ insert into ALISTLMS.test_user (id, password, del_yn, create_at, update_at) value (#{id}, #{newPassword}, 1, now(), now()) - - /*UserMapper.insertUserTokenSignup*/ + + + /*UserMapper.insertUserToken*/ insert into ALISTLMS.test_user_token (user_idx, user_api_key, user_role, user_type, created_at, updated_at) value (#{userIdx}, #{userApiKey}, #{userRole}, #{userType}, now(), now()) - - /*UserMapper.updateUserPassword*/ + + + /*UserMapper.updateUserPasswordModify*/ UPDATE ALISTLMS.test_user ATU INNER JOIN ALISTLMS.test_user_token ATUT ON ATUT.user_idx = ATU.user_idx SET ATU.password = #{newPassword} @@ -21,8 +56,9 @@ WHERE ATUT.user_token_idx = #{userTokenIdx} AND ATU.del_yn = 1 - - /*UserMapper.updateUserProfile*/ + + + /*UserMapper.updateUserProfileModify*/ UPDATE ALISTLMS.test_user ATU INNER JOIN ALISTLMS.test_user_token ATUT ON ATUT.user_idx = ATU.user_idx SET ATU.update_at = now() @@ -35,8 +71,9 @@ WHERE ATUT.user_token_idx = #{userTokenIdx} AND ATU.del_yn = 1 - - /*UserMapper.updateWithdrawStatus*/ + + + /*UserMapper.updateUserWithdrawModify*/ UPDATE ALISTLMS.test_user ATU INNER JOIN ALISTLMS.test_user_token ATUT ON ATUT.user_idx = ATU.user_idx SET ATU.withdraw_status = #{withdrawStatus} @@ -52,25 +89,8 @@ AND ATU.withdraw_status != 'Y' - - - - - - /*UserMapper.updateDormantStatus*/ + + /*UserMapper.updateUserDormantModify*/ UPDATE ALISTLMS.test_user ATU INNER JOIN ALISTLMS.test_user_token ATUT ON ATUT.user_idx = ATU.user_idx SET ATU.dormant_yn = #{dormantYn}