Skip to content

Commit 6baedf6

Browse files
dong3058dong3058
authored
Merge pull request #355 from MT-TEAM-Org/refacCode
epic:refac Admin DashBoard
2 parents 27a606c + f0c8d01 commit 6baedf6

File tree

56 files changed

+439
-704
lines changed

Some content is hidden

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

56 files changed

+439
-704
lines changed

‎src/main/java/org/myteam/server/admin/controller/AdminContentSearchController.java‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33

44
import io.swagger.v3.oas.annotations.Operation;
5+
import io.swagger.v3.oas.annotations.Parameter;
56
import io.swagger.v3.oas.annotations.media.Content;
67
import io.swagger.v3.oas.annotations.media.Schema;
78
import io.swagger.v3.oas.annotations.responses.ApiResponse;
89
import io.swagger.v3.oas.annotations.responses.ApiResponses;
910
import io.swagger.v3.oas.annotations.tags.Tag;
1011
import jakarta.validation.Valid;
12+
import jakarta.validation.constraints.Size;
1113
import lombok.RequiredArgsConstructor;
1214
import org.myteam.server.admin.service.ContentSearchService;
15+
import org.myteam.server.admin.utill.enums.StaticDataType;
1316
import org.myteam.server.global.exception.ErrorResponse;
1417
import org.myteam.server.global.web.response.ResponseDto;
1518
import org.myteam.server.global.web.response.ResponseStatus;
1619
import org.springframework.data.domain.Page;
1720
import org.springframework.http.ResponseEntity;
1821
import org.springframework.validation.BindingResult;
19-
import org.springframework.web.bind.annotation.PostMapping;
20-
import org.springframework.web.bind.annotation.RequestBody;
21-
import org.springframework.web.bind.annotation.RequestMapping;
22-
import org.springframework.web.bind.annotation.RestController;
22+
import org.springframework.web.bind.annotation.*;
2323

2424
import static org.myteam.server.admin.dto.request.AdminMemoRequestDto.*;
2525
import static org.myteam.server.admin.dto.request.ContentRequestDto.*;
@@ -39,10 +39,15 @@ public class AdminContentSearchController {
3939
@ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true),
4040
@ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
4141
})
42-
@PostMapping("/detail")
43-
public ResponseEntity<ResponseDto<ResponseDetail>> getResponseDetail(@RequestBody @Valid RequestDetail requestDetail){
42+
@GetMapping("/detail")
43+
public ResponseEntity<ResponseDto<ResponseDetail>> getResponseDetail(
44+
@Parameter(description = "조회 하고자 하는 contentId입니다 필수입니다.") @RequestParam(name = "contentId",required = true)Long contentId,
45+
@Parameter(description = "조회 하고자 하는 신고의타입입니다. COMMENT,BOARD 중 1개택.")@RequestParam(name = "staticDateType",required = true) StaticDataType staticDataType,
46+
@Parameter(description = "reportId입니다. 관리자단 대시보드의 알림,최신 데이터에서 넘어올때 넣어주세요")@RequestParam(name = "reportId",required = false)Long reportId,
47+
@Parameter(description = "읽었는지 안읽었는지 체크하는 값입니다.관리자단 대시보드의 알림,최신데이터에서 넘어올때 넣어주세요")@RequestParam(name = "readCheck",required = false)String readCheck
48+
){
4449
return ResponseEntity.ok(new ResponseDto<>(ResponseStatus.SUCCESS.name(),"ok",
45-
contentSearchService.getContentDetail(requestDetail)));
50+
contentSearchService.getContentDetail(contentId,staticDataType,reportId,readCheck)));
4651
}
4752
@Operation(summary = "댓글,게시글 리스트 조회",
4853
description = "관리자가 제공한 조건에따라 댓,게시글의 리스트를 가져옵니다.")
@@ -62,11 +67,15 @@ public ResponseEntity<ResponseDto<Page<ResponseContentSearch>>> getContentData(@
6267
@ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true),
6368
@ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
6469
})
65-
@PostMapping("/reportList")
66-
public ResponseEntity<ResponseDto<Page<ResponseReportList>>> getContentDetail(@RequestBody @Valid RequestReportList requestReportList){
70+
@GetMapping("/reportList")
71+
public ResponseEntity<ResponseDto<Page<ResponseReportList>>> getContentDetail(
72+
@Parameter(description = "조회 하고자 하는 contentId입니다 필수입니다.") @RequestParam(name = "contentId",required = true)Long contentId,
73+
@Parameter(description = "조회 하고자 하는 신고의타입입니다. COMMENT,BOARD 중 1개택.")@RequestParam(name = "staticDateType",required = true) StaticDataType staticDataType,
74+
@Parameter(description = "offset값입니다. 처음은 1부터 시작해주세요.")@RequestParam(name = "page",required = true)@Size(min=1,message = "page값은 1부터 시작입니다.")Integer page
75+
,BindingResult bindingResult){
6776

6877
return ResponseEntity.ok(new ResponseDto<>(ResponseStatus.SUCCESS.name(),"ok",
69-
contentSearchService.getReportList(requestReportList)));
78+
contentSearchService.getReportList(contentId,staticDataType,page)));
7079
}
7180
@Operation(summary = "관리자 메모 추가",
7281
description = "댓글,게시글에 대한 관리자 메모를 추가합니다.")

‎src/main/java/org/myteam/server/admin/controller/AdminDashBoardController.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import io.swagger.v3.oas.annotations.tags.Tag;
1010
import lombok.RequiredArgsConstructor;
1111
import org.myteam.server.admin.service.AdminDashBoardService;
12-
import org.myteam.server.admin.utill.DateType;
13-
import org.myteam.server.admin.utill.StaticDataType;
12+
import org.myteam.server.admin.utill.enums.AdminDashBoardType;
13+
import org.myteam.server.admin.utill.enums.DateType;
1414
import org.myteam.server.global.exception.ErrorResponse;
1515
import org.myteam.server.global.web.response.ResponseDto;
1616
import org.myteam.server.global.web.response.ResponseStatus;
@@ -38,12 +38,13 @@ public class AdminDashBoardController {
3838
})
3939
@GetMapping("/static")
4040
public ResponseEntity<ResponseDto<List<ResponseStatic>>>
41-
getStaticData(@Parameter(description = "통계를 불러올 탭과 일치해서 사용하는 쿼리 스트링입니다.",example = "DashBoard,MemberBoard,ContentBoard,Inquiry,Improvement 중택1")
42-
@RequestParam(name ="staticType",required = true) StaticDataType staticDataType,
43-
@Parameter(description = "쿼리 스트링값입니다.",example ="Day,WeekEnd,OneMonth,ThreeMonth,SixMonth,Year 중택1" )@RequestParam(name="dateType",required = true) DateType dateType) {
41+
getStaticData(@Parameter(description = "통계를 불러올 탭과 일치해서 사용하는 쿼리 스트링입니다.")
42+
@RequestParam(name ="staticType",required = true)AdminDashBoardType
43+
adminDashBoardType,
44+
@Parameter(description = "쿼리 스트링값입니다." )@RequestParam(name="dateType",required = true) DateType dateType) {
4445
return ResponseEntity.ok(
4546
new ResponseDto<>(ResponseStatus.SUCCESS.name(), "조회 성공",
46-
adminDashBoardService.getStaticData(staticDataType,dateType))
47+
adminDashBoardService.getStaticData(adminDashBoardType,dateType))
4748
);
4849
}
4950

@@ -58,7 +59,6 @@ public class AdminDashBoardController {
5859
@GetMapping("/latest")
5960
public ResponseEntity<ResponseDto<Map<String,List<ResponseLatestData>>>>
6061
getLatestData() {
61-
6262
return ResponseEntity.ok(
6363
new ResponseDto<>(ResponseStatus.SUCCESS.name(), "조회 성공",
6464
adminDashBoardService.getLatestData()));

‎src/main/java/org/myteam/server/admin/controller/AdminImprovementController.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33

44
import io.swagger.v3.oas.annotations.Operation;
5+
import io.swagger.v3.oas.annotations.Parameter;
56
import io.swagger.v3.oas.annotations.media.Content;
67
import io.swagger.v3.oas.annotations.media.Schema;
78
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -16,10 +17,9 @@
1617
import org.springframework.data.domain.Page;
1718
import org.springframework.http.ResponseEntity;
1819
import org.springframework.validation.BindingResult;
19-
import org.springframework.web.bind.annotation.PostMapping;
20-
import org.springframework.web.bind.annotation.RequestBody;
21-
import org.springframework.web.bind.annotation.RequestMapping;
22-
import org.springframework.web.bind.annotation.RestController;
20+
import org.springframework.web.bind.annotation.*;
21+
22+
import javax.swing.*;
2323

2424
import static org.myteam.server.admin.dto.request.AdminMemoRequestDto.AdminMemoImprovementRequest;
2525
import static org.myteam.server.admin.dto.response.ImprovementResponseDto.*;
@@ -66,11 +66,12 @@ public ResponseEntity<ResponseDto<Page<ResponseMemberImproveList>>> getImproveLi
6666
@ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true),
6767
@ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
6868
})
69-
@PostMapping("/detail")
69+
@GetMapping("/detail")
7070
public ResponseEntity<ResponseDto<ResponseImprovementDetail>> getImproveDetail(
71-
@RequestBody @Valid RequestImprovementDetail requestImprovementDetail, BindingResult bindingResult) {
71+
@Parameter(description = "improvementId입니다 필수입니다.") @RequestParam(name = "improvementId",required = true)Long improvementId,
72+
@Parameter(description = "관리자단 대시보드에서 알람 혹은 최신데이터에서 넘어올떄 넣어주세요.") @RequestParam(name = "readCheck",required = false)String readCheck) {
7273
return ResponseEntity.ok(new ResponseDto<>(ResponseStatus.SUCCESS.name(),
73-
"ok", improvementService.getImproveDetail(requestImprovementDetail)));
74+
"ok", improvementService.getImproveDetail(improvementId,readCheck)));
7475
}
7576

7677
@Operation(summary = "관리자 메모 추가.",

‎src/main/java/org/myteam/server/admin/controller/AdminInquiryController.java‎

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

33

44
import io.swagger.v3.oas.annotations.Operation;
5+
import io.swagger.v3.oas.annotations.Parameter;
56
import io.swagger.v3.oas.annotations.media.Content;
67
import io.swagger.v3.oas.annotations.media.Schema;
78
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -16,10 +17,8 @@
1617
import org.springframework.data.domain.Page;
1718
import org.springframework.http.ResponseEntity;
1819
import org.springframework.validation.BindingResult;
19-
import org.springframework.web.bind.annotation.PostMapping;
20-
import org.springframework.web.bind.annotation.RequestBody;
21-
import org.springframework.web.bind.annotation.RequestMapping;
22-
import org.springframework.web.bind.annotation.RestController;
20+
import org.springframework.web.bind.annotation.*;
21+
2322
import static org.myteam.server.admin.dto.request.AdminMemoRequestDto.AdminMemoInquiryRequest;
2423
import static org.myteam.server.admin.dto.response.InquiryResponseDto.*;
2524
import static org.myteam.server.admin.dto.response.InquiryResponseDto.ResponseInquiryList;
@@ -70,12 +69,13 @@ public ResponseEntity<ResponseDto<Page<ResponseInquiryList>>> getInquiryListMemb
7069
@ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true),
7170
@ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
7271
})
73-
@PostMapping("/detail")
72+
@GetMapping("/detail")
7473
public ResponseEntity<ResponseDto<ResponseInquiryDetail>> getInquiryDetail(
75-
@RequestBody @Valid RequestInquiryDetail requestInquiryDetail, BindingResult bindingResult) {
74+
@Parameter(description = "inquiryId입니다 필수입니다.") @RequestParam(name = "inquiryId",required = true)Long inquiryId,
75+
@Parameter(description = "관리자단 대시보드에서 알람 혹은 최신데이터에서 넘어올떄 넣어주세요.") @RequestParam(name = "readCheck",required = false)String readCheck) {
7676

7777
return ResponseEntity.ok(new ResponseDto<>(ResponseStatus.SUCCESS.name(), "ok",
78-
adminInquiryService.getInquiryDetail(requestInquiryDetail)
78+
adminInquiryService.getInquiryDetail(inquiryId,readCheck)
7979
));
8080
}
8181

src/main/java/org/myteam/server/admin/dto/ctes/BoardCountCte.java renamed to src/main/java/org/myteam/server/admin/dto/ctes/BoardRecommendCountCte.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package org.myteam.server.admin.dto.ctes;
22

3+
34
import com.blazebit.persistence.CTE;
45
import jakarta.persistence.Entity;
56
import jakarta.persistence.Id;
67
import lombok.Getter;
78

89
import java.util.UUID;
910

10-
11-
@Entity
1211
@Getter
1312
@CTE
14-
public class BoardCountCte {
13+
@Entity
14+
public class BoardRecommendCountCte {
1515
@Id
1616
private UUID publicId;
1717
private Long count;

src/main/java/org/myteam/server/admin/dto/ctes/CommentCountCte.java renamed to src/main/java/org/myteam/server/admin/dto/ctes/CommentRecommendCountCte.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
import java.util.UUID;
99

10-
@Entity
1110
@Getter
1211
@CTE
13-
public class CommentCountCte {
12+
@Entity
13+
public class CommentRecommendCountCte {
1414
@Id
15-
private UUID publicID;
15+
private UUID publicId;
1616
private Long count;
1717
private Integer recommendCount;
1818
}

src/main/java/org/myteam/server/admin/dto/ctes/ContentCountCte.java renamed to src/main/java/org/myteam/server/admin/dto/ctes/ContentIdCte.java

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

88
@Entity
99
@CTE
10-
public class ContentCountCte {
10+
public class ContentIdCte {
1111
@Id
1212
private Long contentId;
1313

src/main/java/org/myteam/server/admin/dto/ctes/ContentCte.java renamed to src/main/java/org/myteam/server/admin/dto/ctes/ContentTotInfoCte.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
import jakarta.persistence.Enumerated;
88
import jakarta.persistence.Id;
99
import lombok.Getter;
10-
import org.myteam.server.admin.utill.AdminControlType;
11-
import org.myteam.server.admin.utill.StaticDataType;
10+
import org.myteam.server.admin.utill.enums.AdminControlType;
11+
import org.myteam.server.admin.utill.enums.StaticDataType;
1212
import org.myteam.server.member.domain.MemberStatus;
1313

1414
import java.time.LocalDateTime;
1515

1616
@CTE
1717
@Getter
1818
@Entity
19-
public class ContentCte {
19+
public class ContentTotInfoCte {
2020

2121
@Id
2222
private Long contentId;

‎src/main/java/org/myteam/server/admin/dto/ctes/MemberContentCountCte.java‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/main/java/org/myteam/server/admin/dto/ctes/MemberReportCte.java renamed to src/main/java/org/myteam/server/admin/dto/ctes/MemberReportCountCte.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@Entity
1313
@Getter
1414
@CTE
15-
public class MemberReportCte {
15+
public class MemberReportCountCte {
1616

1717
@Id
1818
private Long reportedId;

0 commit comments

Comments
 (0)