Skip to content
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

fix url path and name convention #384

Merged
merged 1 commit into from
Dec 4, 2023
Merged

fix url path and name convention #384

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
10 changes: 5 additions & 5 deletions mashup-admin/src/main/java/kr/mashup/branding/ui/adminmember/AdminMemberController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public ApiResponse<EmptyResponse> deleteAdminMembers(
return ApiResponse.success();
}

@PostMapping("/{adminId}/password/change")
@PostMapping("/password/change")
public ApiResponse<EmptyResponse> changePassword(
@ApiIgnore @ModelAttribute("adminId") Long adminMemberId,
@RequestBody AdminPasswordChangeRequest request
Expand All @@ -79,18 +79,18 @@ public ApiResponse<EmptyResponse> changePassword(
@ApiOperation("어드민 멤버 리스트 조회")
@GetMapping
public ApiResponse<List<AdminMemberResponse>> readAdminMembers() {
List<AdminMemberVo> data = adminMemberFacadeService.readAdminMembers();
final List<AdminMemberVo> adminMemberVos = adminMemberFacadeService.readAdminMembers();

return ApiResponse.success(data.stream().map(AdminMemberResponse::from).collect(Collectors.toList()));
return ApiResponse.success(adminMemberVos.stream().map(AdminMemberResponse::from).collect(Collectors.toList()));
}

/** 어드민 멤버 생성 */
@ApiOperation("어드민 멤버 생성")
@PreAuthorize("hasAnyAuthority('MASHUP_LEADER', 'MASHUP_SUBLEADER')")
@PostMapping
public ApiResponse<AdminMemberResponse> createAdminMember(@RequestBody AdminMemberSignUpCommand signUpCommand) {
AdminMemberVo data = adminMemberFacadeService.createAdminMember(signUpCommand);
final AdminMemberVo adminMemberVo = adminMemberFacadeService.createAdminMember(signUpCommand);

return ApiResponse.success(AdminMemberResponse.from(data));
return ApiResponse.success(AdminMemberResponse.from(adminMemberVo));
}
}
Loading