Skip to content

Commit 8c780cb

Browse files
committed
Merge branch 'CLAP-256-팀-작업-현황-에러-재수정' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop
2 parents e857375 + 244f408 commit 8c780cb

File tree

49 files changed

+265
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+265
-104
lines changed

src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.springframework.web.bind.annotation.RequestBody;
1717
import org.springframework.web.bind.annotation.RequestMapping;
1818

19-
@Tag(name = "05. Admin")
19+
@Tag(name = "05. Admin [작업 관리]")
2020
@WebAdapter
2121
@RequiredArgsConstructor
2222
@RequestMapping("/api/managements")

src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.web.bind.annotation.PathVariable;
1313
import org.springframework.web.bind.annotation.RequestMapping;
1414

15-
@Tag(name = "05. Admin")
15+
@Tag(name = "05. Admin [작업 관리]")
1616
@WebAdapter
1717
@RequiredArgsConstructor
1818
@RequestMapping("/api/managements")

src/main/java/clap/server/adapter/inbound/web/admin/DeleteMemberController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.springframework.web.bind.annotation.RequestBody;
1515
import org.springframework.web.bind.annotation.RequestMapping;
1616

17-
@Tag(name = "05. Admin")
17+
@Tag(name = "05. Admin [회원 관리]")
1818
@WebAdapter
1919
@RequiredArgsConstructor
2020
@RequestMapping("/api/managements")

src/main/java/clap/server/adapter/inbound/web/admin/FindDepartmentController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import java.util.List;
1515

16-
@Tag(name = "05. Admin")
16+
@Tag(name = "05. Admin [회원 관리]")
1717
@WebAdapter
1818
@RequiredArgsConstructor
1919
@RequestMapping("/api/managements")

src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import clap.server.adapter.inbound.web.dto.common.PageResponse;
66
import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase;
77

8+
import clap.server.common.annotation.architecture.WebAdapter;
89
import io.swagger.v3.oas.annotations.Operation;
910
import io.swagger.v3.oas.annotations.Parameter;
1011
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,7 +17,8 @@
1617
import org.springframework.security.access.annotation.Secured;
1718
import org.springframework.web.bind.annotation.*;
1819

19-
@RestController
20+
@Tag(name = "05. Admin [회원 관리]")
21+
@WebAdapter
2022
@RequestMapping("/api/managements")
2123
@RequiredArgsConstructor
2224
public class FindMemberController {

src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,41 @@
22

33
import clap.server.adapter.inbound.security.service.SecurityUserDetails;
44
import clap.server.adapter.inbound.web.dto.admin.request.UpdateMemberRequest;
5+
import clap.server.adapter.inbound.web.dto.admin.response.MemberDetailsResponse;
6+
import clap.server.application.port.inbound.admin.MemberDetailUsecase;
57
import clap.server.application.port.inbound.admin.UpdateMemberUsecase;
68
import clap.server.common.annotation.architecture.WebAdapter;
79
import io.swagger.v3.oas.annotations.Operation;
810
import io.swagger.v3.oas.annotations.tags.Tag;
911
import jakarta.validation.Valid;
1012
import lombok.RequiredArgsConstructor;
13+
import org.springframework.http.ResponseEntity;
1114
import org.springframework.security.access.annotation.Secured;
1215
import org.springframework.security.core.annotation.AuthenticationPrincipal;
13-
import org.springframework.web.bind.annotation.PathVariable;
14-
import org.springframework.web.bind.annotation.PostMapping;
15-
import org.springframework.web.bind.annotation.RequestBody;
16-
import org.springframework.web.bind.annotation.RequestMapping;
16+
import org.springframework.web.bind.annotation.*;
1717

18-
@Tag(name = "05. Admin")
18+
@Tag(name = "05. Admin [회원 관리]")
1919
@WebAdapter
2020
@RequiredArgsConstructor
2121
@RequestMapping("/api/managements/members")
2222
public class ManageMemberController {
2323
private final UpdateMemberUsecase updateMemberUsecase;
24+
private final MemberDetailUsecase memberDetailUsecase;
2425

2526
@Operation(summary = "회원 정보 수정 API")
2627
@PostMapping("/{memberId}")
2728
@Secured("ROLE_ADMIN")
2829
public void registerMember(@AuthenticationPrincipal SecurityUserDetails userInfo,
2930
@PathVariable Long memberId,
30-
@RequestBody @Valid UpdateMemberRequest request){
31+
@RequestBody @Valid UpdateMemberRequest request) {
3132
updateMemberUsecase.updateMemberInfo(userInfo.getUserId(), memberId, request);
3233
}
34+
35+
@Operation(summary = "회원 상세 정보 조회 API")
36+
@GetMapping("/{memberId}/details")
37+
@Secured("ROLE_ADMIN")
38+
public ResponseEntity<MemberDetailsResponse> getMemberDetail(@AuthenticationPrincipal SecurityUserDetails userInfo,
39+
@PathVariable Long memberId) {
40+
return ResponseEntity.ok(memberDetailUsecase.getMemberDetail(memberId));
41+
}
3342
}

src/main/java/clap/server/adapter/inbound/web/admin/ManagementLabelController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.springframework.security.core.annotation.AuthenticationPrincipal;
1818
import org.springframework.web.bind.annotation.*;
1919

20-
@Tag(name = "05. Admin")
20+
@Tag(name = "05. Admin [작업 관리]")
2121
@WebAdapter
2222
@RequiredArgsConstructor
2323
@RequestMapping("/api/managements/labels")

src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.springframework.web.bind.annotation.RequestBody;
1515
import org.springframework.web.bind.annotation.RequestMapping;
1616

17-
@Tag(name = "05. Admin")
17+
@Tag(name = "05. Admin [회원 관리]")
1818
@WebAdapter
1919
@RequestMapping("/api/managements")
2020
@RequiredArgsConstructor

src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberCsvController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import java.io.IOException;
2121

22-
@Tag(name = "05. Admin")
22+
@Tag(name = "05. Admin [회원 관리]")
2323
@WebAdapter
2424
@RequestMapping("/api/managements")
2525
public class RegisterMemberCsvController {

src/main/java/clap/server/adapter/inbound/web/admin/SendInvitationController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.springframework.security.access.annotation.Secured;
1111
import org.springframework.web.bind.annotation.*;
1212

13-
@Tag(name = "05. Admin")
13+
@Tag(name = "05. Admin [회원 관리]")
1414
@WebAdapter
1515
@RequiredArgsConstructor
1616
@RequestMapping("/api/managements")

0 commit comments

Comments
 (0)