epic:refac Admin DashBoard

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

@@ -2,24 +2,24 @@
 
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.Size;
 import lombok.RequiredArgsConstructor;
 import org.myteam.server.admin.service.ContentSearchService;
+import org.myteam.server.admin.utill.enums.StaticDataType;
 import org.myteam.server.global.exception.ErrorResponse;
 import org.myteam.server.global.web.response.ResponseDto;
 import org.myteam.server.global.web.response.ResponseStatus;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import static org.myteam.server.admin.dto.request.AdminMemoRequestDto.*;
 import static org.myteam.server.admin.dto.request.ContentRequestDto.*;
@@ -39,10 +39,15 @@ public class AdminContentSearchController {
             @ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true),
             @ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
     })
-    @PostMapping("/detail")
-    public ResponseEntity<ResponseDto<ResponseDetail>> getResponseDetail(@RequestBody @Valid RequestDetail requestDetail){
+    @GetMapping("/detail")
+    public ResponseEntity<ResponseDto<ResponseDetail>> getResponseDetail(
+            @Parameter(description = "조회 하고자 하는 contentId입니다 필수입니다.") @RequestParam(name = "contentId",required = true)Long contentId,
+            @Parameter(description = "조회 하고자 하는 신고의타입입니다. COMMENT,BOARD 중 1개택.")@RequestParam(name = "staticDateType",required = true) StaticDataType staticDataType,
+            @Parameter(description = "reportId입니다. 관리자단 대시보드의 알림,최신 데이터에서 넘어올때 넣어주세요")@RequestParam(name = "reportId",required = false)Long reportId,
+            @Parameter(description = "읽었는지 안읽었는지 체크하는 값입니다.관리자단 대시보드의 알림,최신데이터에서 넘어올때 넣어주세요")@RequestParam(name = "readCheck",required = false)String readCheck
+    ){
         return ResponseEntity.ok(new ResponseDto<>(ResponseStatus.SUCCESS.name(),"ok",
-                contentSearchService.getContentDetail(requestDetail)));
+                contentSearchService.getContentDetail(contentId,staticDataType,reportId,readCheck)));
     }
     @Operation(summary = "댓글,게시글 리스트 조회",
             description = "관리자가 제공한 조건에따라 댓,게시글의 리스트를 가져옵니다.")
@@ -62,11 +67,15 @@ public ResponseEntity<ResponseDto<Page<ResponseContentSearch>>> getContentData(@
             @ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true),
             @ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
     })
-    @PostMapping("/reportList")
-    public ResponseEntity<ResponseDto<Page<ResponseReportList>>> getContentDetail(@RequestBody @Valid RequestReportList requestReportList){
+    @GetMapping("/reportList")
+    public ResponseEntity<ResponseDto<Page<ResponseReportList>>> getContentDetail(
+            @Parameter(description = "조회 하고자 하는 contentId입니다 필수입니다.") @RequestParam(name = "contentId",required = true)Long contentId,
+            @Parameter(description = "조회 하고자 하는 신고의타입입니다. COMMENT,BOARD 중 1개택.")@RequestParam(name = "staticDateType",required = true) StaticDataType staticDataType,
+            @Parameter(description = "offset값입니다. 처음은 1부터 시작해주세요.")@RequestParam(name = "page",required = true)@Size(min=1,message = "page값은 1부터 시작입니다.")Integer page
+    ,BindingResult bindingResult){
 
         return ResponseEntity.ok(new ResponseDto<>(ResponseStatus.SUCCESS.name(),"ok",
-                contentSearchService.getReportList(requestReportList)));
+                contentSearchService.getReportList(contentId,staticDataType,page)));
     }
     @Operation(summary = "관리자 메모 추가",
             description = "댓글,게시글에 대한 관리자 메모를 추가합니다.")

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

@@ -9,8 +9,8 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.myteam.server.admin.service.AdminDashBoardService;
-import org.myteam.server.admin.utill.DateType;
-import org.myteam.server.admin.utill.StaticDataType;
+import org.myteam.server.admin.utill.enums.AdminDashBoardType;
+import org.myteam.server.admin.utill.enums.DateType;
 import org.myteam.server.global.exception.ErrorResponse;
 import org.myteam.server.global.web.response.ResponseDto;
 import org.myteam.server.global.web.response.ResponseStatus;
@@ -38,12 +38,13 @@ public class AdminDashBoardController {
     })
     @GetMapping("/static")
     public ResponseEntity<ResponseDto<List<ResponseStatic>>>
-    getStaticData(@Parameter(description = "통계를 불러올 탭과 일치해서 사용하는 쿼리 스트링입니다.",example = "DashBoard,MemberBoard,ContentBoard,Inquiry,Improvement 중택1")
-                  @RequestParam(name ="staticType",required = true) StaticDataType staticDataType,
-                  @Parameter(description = "쿼리 스트링값입니다.",example ="Day,WeekEnd,OneMonth,ThreeMonth,SixMonth,Year 중택1" )@RequestParam(name="dateType",required = true) DateType dateType) {
+    getStaticData(@Parameter(description = "통계를 불러올 탭과 일치해서 사용하는 쿼리 스트링입니다.")
+                  @RequestParam(name ="staticType",required = true)AdminDashBoardType
+            adminDashBoardType,
+                  @Parameter(description = "쿼리 스트링값입니다." )@RequestParam(name="dateType",required = true) DateType dateType) {
         return ResponseEntity.ok(
                 new ResponseDto<>(ResponseStatus.SUCCESS.name(), "조회 성공",
-                        adminDashBoardService.getStaticData(staticDataType,dateType))
+                        adminDashBoardService.getStaticData(adminDashBoardType,dateType))
         );
     }
 
@@ -58,7 +59,6 @@ public class AdminDashBoardController {
     @GetMapping("/latest")
     public ResponseEntity<ResponseDto<Map<String,List<ResponseLatestData>>>>
     getLatestData() {
-
         return ResponseEntity.ok(
                 new ResponseDto<>(ResponseStatus.SUCCESS.name(), "조회 성공",
                         adminDashBoardService.getLatestData()));

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

@@ -2,6 +2,7 @@
 
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -16,10 +17,9 @@
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.swing.*;
 
 import static org.myteam.server.admin.dto.request.AdminMemoRequestDto.AdminMemoImprovementRequest;
 import static org.myteam.server.admin.dto.response.ImprovementResponseDto.*;
@@ -66,11 +66,12 @@ public ResponseEntity<ResponseDto<Page<ResponseMemberImproveList>>> getImproveLi
             @ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true),
             @ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
     })
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     public ResponseEntity<ResponseDto<ResponseImprovementDetail>> getImproveDetail(
-            @RequestBody @Valid RequestImprovementDetail requestImprovementDetail, BindingResult bindingResult) {
+            @Parameter(description = "improvementId입니다 필수입니다.") @RequestParam(name = "improvementId",required = true)Long improvementId,
+            @Parameter(description = "관리자단 대시보드에서 알람 혹은 최신데이터에서 넘어올떄 넣어주세요.") @RequestParam(name = "readCheck",required = false)String readCheck) {
         return ResponseEntity.ok(new ResponseDto<>(ResponseStatus.SUCCESS.name(),
-                "ok", improvementService.getImproveDetail(requestImprovementDetail)));
+                "ok", improvementService.getImproveDetail(improvementId,readCheck)));
     }
 
     @Operation(summary = "관리자 메모 추가.",

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

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

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

@@ -1,17 +1,17 @@
 package org.myteam.server.admin.dto.ctes;
 
+
 import com.blazebit.persistence.CTE;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import lombok.Getter;
 
 import java.util.UUID;
 
-
-@Entity
 @Getter
 @CTE
-public class BoardCountCte {
+@Entity
+public class BoardRecommendCountCte {
     @Id
     private UUID publicId;
     private Long count;

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

@@ -7,12 +7,12 @@
 
 import java.util.UUID;
 
-@Entity
 @Getter
 @CTE
-public class CommentCountCte {
+@Entity
+public class CommentRecommendCountCte {
     @Id
-    private UUID publicID;
+    private UUID publicId;
     private Long count;
     private Integer recommendCount;
 }

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

@@ -7,7 +7,7 @@
 
 @Entity
 @CTE
-public class ContentCountCte {
+public class ContentIdCte {
     @Id
     private Long contentId;
 

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

@@ -7,16 +7,16 @@
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.Id;
 import lombok.Getter;
-import org.myteam.server.admin.utill.AdminControlType;
-import org.myteam.server.admin.utill.StaticDataType;
+import org.myteam.server.admin.utill.enums.AdminControlType;
+import org.myteam.server.admin.utill.enums.StaticDataType;
 import org.myteam.server.member.domain.MemberStatus;
 
 import java.time.LocalDateTime;
 
 @CTE
 @Getter
 @Entity
-public class ContentCte {
+public class ContentTotInfoCte {
 
     @Id
     private Long contentId;

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

@@ -12,7 +12,7 @@
 @Entity
 @Getter
 @CTE
-public class MemberReportCte {
+public class MemberReportCountCte {
 
     @Id
     private Long reportedId;

src/main/java/org/myteam/server/admin/dto/ctes/ReportCountCte.java → src/main/java/org/myteam/server/admin/dto/ctes/MemberReportedCountCte.java

@@ -11,7 +11,7 @@
 @Entity
 @Getter
 @CTE
-public class ReportCountCte {
+public class MemberReportedCountCte {
     @Id
     private UUID publicId;
     private Long count;

src/main/java/org/myteam/server/admin/dto/request/AdminMemoRequestDto.java

@@ -6,36 +6,12 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.myteam.server.admin.utill.AdminControlType;
-import org.myteam.server.admin.utill.StaticDataType;
+import org.myteam.server.admin.utill.enums.AdminControlType;
+import org.myteam.server.admin.utill.enums.StaticDataType;
 import org.myteam.server.improvement.domain.ImportantStatus;
 import org.myteam.server.improvement.domain.ImprovementStatus;
-import org.myteam.server.member.domain.MemberStatus;
-
-import java.util.UUID;
 
 public record AdminMemoRequestDto() {
-
-    @Getter
-    @NoArgsConstructor
-    @Schema(description = "회원에 대한 메모 작성을 요청시에 쓰이는 값입니다")
-    public static class AdminMemoMemberRequest{
-        @NotNull(message = "memberId는 비어있으면 안됩니다")
-        private UUID memberId;
-        @NotNull(message = "회원 상태값이 비어있습니다.")
-        @Schema(description = "수정이 없다면 기존값을 수정했다면 수정값을 주세요", example = "INACTIVE, ACTIVE, PENDING,WARNED")
-        private MemberStatus memberStatus;
-        @Schema(description = "내용이 없다면 null로 주세요")
-        private String content;
-        @Builder
-        public AdminMemoMemberRequest(UUID memberId,MemberStatus memberStatus, String content){
-            this.memberId=memberId;
-            this.memberStatus=memberStatus;
-            this.content = content;
-        }
-
-    }
-
     @Getter
     @NoArgsConstructor
     @Schema(description = "개선 요청 메모 작성 요청시 쓰이는 값입니다.")

src/main/java/org/myteam/server/admin/dto/request/ContentRequestDto.java

@@ -5,8 +5,8 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.myteam.server.admin.utill.AdminControlType;
-import org.myteam.server.admin.utill.StaticDataType;
+import org.myteam.server.admin.utill.enums.AdminControlType;
+import org.myteam.server.admin.utill.enums.StaticDataType;
 import org.myteam.server.board.domain.BoardSearchType;
 import org.myteam.server.global.util.date.DateFormatUtil;
 
@@ -69,53 +69,4 @@ public LocalDateTime provideEndTime() {
         }
     }
 
-    @Getter
-    @NoArgsConstructor
-    public static class RequestDetail {
-        @NotNull
-        @Schema(description = "게시물이면 BOARD 댓글이면 COMMENT 입니다 필수값입니다.")
-        private StaticDataType staticDataType;
-        @NotNull(message ="contentid는 비면안됩니다.")
-        @Schema(description = "필수값입니다.")
-        private Long contentId;
-        @Schema(description = "관리자단 대시보드의 최신데이터 알람에서 신고목록을 클릭해서 넘어올떄만 넣어주세요")
-        private Long reportId;
-        @Schema(description = "관리자단 대시보드의 최신데이터 알람에서 넘어올경우에만 넣어주세요")
-        private String alarmCheck;
-        @Builder
-        public RequestDetail(StaticDataType staticDataType, Long contentId,Long reportId,String alarmCheck) {
-            this.staticDataType = staticDataType;
-            this.contentId = contentId;
-            this.reportId=reportId;
-            this.alarmCheck=alarmCheck;
-        }
-    }
-
-    @Getter
-    @NoArgsConstructor
-    public static class RequestReportList {
-        @NotNull(message ="데이터 타입은 비면 안됩니다.")
-        @Schema(description = "필수값입니다.")
-        private StaticDataType staticDataType;
-        @NotNull(message = "contentid는 비면안됩니다.")
-        @Schema(description = "필수값입니다.")
-        private Long contentId;
-        @NotNull(message = "offset은 비면안됩니다.")
-        @Schema(description = "필수값입니다.")
-        private int offset;
-
-        @Builder
-        public RequestReportList(StaticDataType staticDataType, Long contentId, int offset) {
-            this.staticDataType = staticDataType;
-            this.contentId = contentId;
-            this.offset = offset;
-        }
-
-        public int getOffset() {
-            return this.offset - 1;
-        }
-
-    }
-
-
 }