diff --git a/src/main/java/org/myteam/server/admin/controller/AdminContentSearchController.java b/src/main/java/org/myteam/server/admin/controller/AdminContentSearchController.java index 09cb3e0f..ad1a15bf 100644 --- a/src/main/java/org/myteam/server/admin/controller/AdminContentSearchController.java +++ b/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> getResponseDetail(@RequestBody @Valid RequestDetail requestDetail){ + @GetMapping("/detail") + public ResponseEntity> 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>> getContentData(@ @ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true), @ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), }) - @PostMapping("/reportList") - public ResponseEntity>> getContentDetail(@RequestBody @Valid RequestReportList requestReportList){ + @GetMapping("/reportList") + public ResponseEntity>> 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 = "댓글,게시글에 대한 관리자 메모를 추가합니다.") diff --git a/src/main/java/org/myteam/server/admin/controller/AdminDashBoardController.java b/src/main/java/org/myteam/server/admin/controller/AdminDashBoardController.java index 18452c17..ca913a5f 100644 --- a/src/main/java/org/myteam/server/admin/controller/AdminDashBoardController.java +++ b/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>> - 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>>> getLatestData() { - return ResponseEntity.ok( new ResponseDto<>(ResponseStatus.SUCCESS.name(), "조회 성공", adminDashBoardService.getLatestData())); diff --git a/src/main/java/org/myteam/server/admin/controller/AdminImprovementController.java b/src/main/java/org/myteam/server/admin/controller/AdminImprovementController.java index e81e768e..d7e2d879 100644 --- a/src/main/java/org/myteam/server/admin/controller/AdminImprovementController.java +++ b/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>> getImproveLi @ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true), @ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), }) - @PostMapping("/detail") + @GetMapping("/detail") public ResponseEntity> 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 = "관리자 메모 추가.", diff --git a/src/main/java/org/myteam/server/admin/controller/AdminInquiryController.java b/src/main/java/org/myteam/server/admin/controller/AdminInquiryController.java index 2858da61..1df020e8 100644 --- a/src/main/java/org/myteam/server/admin/controller/AdminInquiryController.java +++ b/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>> getInquiryListMemb @ApiResponse(responseCode = "200", description = "정보 조회 성공", useReturnTypeSchema = true), @ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), }) - @PostMapping("/detail") + @GetMapping("/detail") public ResponseEntity> 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) )); } diff --git a/src/main/java/org/myteam/server/admin/dto/ctes/BoardCountCte.java b/src/main/java/org/myteam/server/admin/dto/ctes/BoardRecommendCountCte.java similarity index 89% rename from src/main/java/org/myteam/server/admin/dto/ctes/BoardCountCte.java rename to src/main/java/org/myteam/server/admin/dto/ctes/BoardRecommendCountCte.java index df226b41..508df3c4 100644 --- a/src/main/java/org/myteam/server/admin/dto/ctes/BoardCountCte.java +++ b/src/main/java/org/myteam/server/admin/dto/ctes/BoardRecommendCountCte.java @@ -1,5 +1,6 @@ package org.myteam.server.admin.dto.ctes; + import com.blazebit.persistence.CTE; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -7,11 +8,10 @@ import java.util.UUID; - -@Entity @Getter @CTE -public class BoardCountCte { +@Entity +public class BoardRecommendCountCte { @Id private UUID publicId; private Long count; diff --git a/src/main/java/org/myteam/server/admin/dto/ctes/CommentCountCte.java b/src/main/java/org/myteam/server/admin/dto/ctes/CommentRecommendCountCte.java similarity index 80% rename from src/main/java/org/myteam/server/admin/dto/ctes/CommentCountCte.java rename to src/main/java/org/myteam/server/admin/dto/ctes/CommentRecommendCountCte.java index fd19eb92..be9da320 100644 --- a/src/main/java/org/myteam/server/admin/dto/ctes/CommentCountCte.java +++ b/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; } diff --git a/src/main/java/org/myteam/server/admin/dto/ctes/ContentCountCte.java b/src/main/java/org/myteam/server/admin/dto/ctes/ContentIdCte.java similarity index 86% rename from src/main/java/org/myteam/server/admin/dto/ctes/ContentCountCte.java rename to src/main/java/org/myteam/server/admin/dto/ctes/ContentIdCte.java index ca2074e4..5d11b7fb 100644 --- a/src/main/java/org/myteam/server/admin/dto/ctes/ContentCountCte.java +++ b/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; diff --git a/src/main/java/org/myteam/server/admin/dto/ctes/ContentCte.java b/src/main/java/org/myteam/server/admin/dto/ctes/ContentTotInfoCte.java similarity index 82% rename from src/main/java/org/myteam/server/admin/dto/ctes/ContentCte.java rename to src/main/java/org/myteam/server/admin/dto/ctes/ContentTotInfoCte.java index 1c7f166f..15083c0e 100644 --- a/src/main/java/org/myteam/server/admin/dto/ctes/ContentCte.java +++ b/src/main/java/org/myteam/server/admin/dto/ctes/ContentTotInfoCte.java @@ -7,8 +7,8 @@ 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; @@ -16,7 +16,7 @@ @CTE @Getter @Entity -public class ContentCte { +public class ContentTotInfoCte { @Id private Long contentId; diff --git a/src/main/java/org/myteam/server/admin/dto/ctes/MemberContentCountCte.java b/src/main/java/org/myteam/server/admin/dto/ctes/MemberContentCountCte.java deleted file mode 100644 index 566f110f..00000000 --- a/src/main/java/org/myteam/server/admin/dto/ctes/MemberContentCountCte.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.myteam.server.admin.dto.ctes; - - -import com.blazebit.persistence.CTE; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import lombok.Getter; - -@CTE -@Getter -@Entity -public class MemberContentCountCte { - @Id - private Long contentId; - private Long count; -} diff --git a/src/main/java/org/myteam/server/admin/dto/ctes/MemberReportCte.java b/src/main/java/org/myteam/server/admin/dto/ctes/MemberReportCountCte.java similarity index 92% rename from src/main/java/org/myteam/server/admin/dto/ctes/MemberReportCte.java rename to src/main/java/org/myteam/server/admin/dto/ctes/MemberReportCountCte.java index 3b3ab03f..4559af07 100644 --- a/src/main/java/org/myteam/server/admin/dto/ctes/MemberReportCte.java +++ b/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; diff --git a/src/main/java/org/myteam/server/admin/dto/ctes/ReportCountCte.java b/src/main/java/org/myteam/server/admin/dto/ctes/MemberReportedCountCte.java similarity index 87% rename from src/main/java/org/myteam/server/admin/dto/ctes/ReportCountCte.java rename to src/main/java/org/myteam/server/admin/dto/ctes/MemberReportedCountCte.java index 32cac621..7022fd35 100644 --- a/src/main/java/org/myteam/server/admin/dto/ctes/ReportCountCte.java +++ b/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; diff --git a/src/main/java/org/myteam/server/admin/dto/request/AdminMemoRequestDto.java b/src/main/java/org/myteam/server/admin/dto/request/AdminMemoRequestDto.java index a24f771e..4ef3e538 100644 --- a/src/main/java/org/myteam/server/admin/dto/request/AdminMemoRequestDto.java +++ b/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 = "개선 요청 메모 작성 요청시 쓰이는 값입니다.") diff --git a/src/main/java/org/myteam/server/admin/dto/request/ContentRequestDto.java b/src/main/java/org/myteam/server/admin/dto/request/ContentRequestDto.java index f342d22c..280f8e8f 100644 --- a/src/main/java/org/myteam/server/admin/dto/request/ContentRequestDto.java +++ b/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; - } - - } - - } diff --git a/src/main/java/org/myteam/server/admin/dto/request/ImproveRequestDto.java b/src/main/java/org/myteam/server/admin/dto/request/ImproveRequestDto.java index d3a60416..6ed88a40 100644 --- a/src/main/java/org/myteam/server/admin/dto/request/ImproveRequestDto.java +++ b/src/main/java/org/myteam/server/admin/dto/request/ImproveRequestDto.java @@ -73,24 +73,6 @@ public LocalDateTime provideEndTime() { } } - - @Getter - @NoArgsConstructor - public final static class RequestImprovementDetail { - @NotNull(message = "contentid는 비면안됩니다.") - @Schema(description = "필수값 입니다.") - private Long contentId; - @Schema(description = "관리자단 대시보드의 최신데이터 알림에서 넘어올경우에만 넘겨주시면됩니다." + - "그외엔 null로 주시면됩니다.") - private String alarmCheck; - @Builder - public RequestImprovementDetail(Long contentId,String alarmCheck) { - this.contentId = contentId; - this.alarmCheck=alarmCheck; - } - } - - @Getter @NoArgsConstructor public final static class RequestMemberImproveList { diff --git a/src/main/java/org/myteam/server/admin/dto/request/InquiryRequestDto.java b/src/main/java/org/myteam/server/admin/dto/request/InquiryRequestDto.java index c735162b..a917043f 100644 --- a/src/main/java/org/myteam/server/admin/dto/request/InquiryRequestDto.java +++ b/src/main/java/org/myteam/server/admin/dto/request/InquiryRequestDto.java @@ -32,13 +32,11 @@ public RequestInquiryList(String email, int offset) { this.email = email; this.offset = offset; } - public int getOffset() { return this.offset - 1; } } - @Getter @NoArgsConstructor public final static class RequestInquiryListCond { @@ -54,8 +52,6 @@ public final static class RequestInquiryListCond { @NotNull(message = "offset은 필수입니다.") @Schema(description = "필수입니다.") private int offset; - - @Builder public RequestInquiryListCond(Boolean isMember, String startTime, String endTime, Boolean isAnswered, String nickName, String email, String content @@ -91,24 +87,4 @@ public LocalDateTime provideEndTime() { } } - - @Getter - @NoArgsConstructor - public final static class RequestInquiryDetail { - @NotNull(message = "contentid 는 비면안됩니다.") - @Schema(description = "inquiry id값입니다. 필수입니다.") - private Long contentId; - @Schema(description = "관리자단 대시보드의 최신데이터 알림에서 넘어올경우에만 넘겨주시면됩니다." + - "그외엔 null로 주시면됩니다.") - private String alarmCheck; - - @Builder - public RequestInquiryDetail(Long id,String alarmCheck) { - this.contentId = id; - this.alarmCheck=alarmCheck; - } - } - - - } diff --git a/src/main/java/org/myteam/server/admin/dto/request/MemberSearchRequestDto.java b/src/main/java/org/myteam/server/admin/dto/request/MemberSearchRequestDto.java index 96ee2db1..f148ae4c 100644 --- a/src/main/java/org/myteam/server/admin/dto/request/MemberSearchRequestDto.java +++ b/src/main/java/org/myteam/server/admin/dto/request/MemberSearchRequestDto.java @@ -84,7 +84,6 @@ public static class RequestMemberDetail { @NotNull(message = "유저 식별값은 비면 안됩니다") @Schema(description = "필수값입니다.") private UUID publicId; - @Schema(description = "이 객체는 회원 한명에 대한 데이터와 회원에 대해 발생한 신고에대해서" + "쓰이기에 offset을 넣주었고 회원 한명에대한 데이터를 볼때에는 offset에 아무값이나 넣어줘도" + "알아서 걸러줍니다.") @@ -97,7 +96,6 @@ public RequestMemberDetail(UUID publicId, int offset) { this.offset = offset; } - public int getOffset() { return this.offset - 1; } diff --git a/src/main/java/org/myteam/server/admin/dto/response/AdminDashBoardResponseDto.java b/src/main/java/org/myteam/server/admin/dto/response/AdminDashBoardResponseDto.java index ff1c14ac..9fd49637 100644 --- a/src/main/java/org/myteam/server/admin/dto/response/AdminDashBoardResponseDto.java +++ b/src/main/java/org/myteam/server/admin/dto/response/AdminDashBoardResponseDto.java @@ -3,7 +3,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Getter; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.NeedDateTimeFix; +import org.myteam.server.admin.utill.enums.StaticDataType; import java.util.Map; @@ -27,7 +28,7 @@ public static class ResponseStatic { } @Getter - public static class ResponseLatestData { + public static class ResponseLatestData extends NeedDateTimeFix { @Schema(description = "불러온 최신 데이터 타입이 신고일때 어떤 콘텐츠에대한 신고인지를 나타냅니다.") private String reportType; @@ -38,8 +39,6 @@ public static class ResponseLatestData { private Long contentId; private String name; private String content; - @Schema(example = "2025.06.06") - private String createAt; @Schema(description = "어떤 종류의 최신데이터인지 보여줍니다") private StaticDataType staticDataType; @Schema(description = "이값이 true이면 이미 읽은것,아니면은 읽지않은것입니다.") @@ -49,23 +48,19 @@ public static class ResponseLatestData { public ResponseLatestData(String reportType, String mainStatus, String subStatus, Long contentId, - String name, String content, String createAt,Long reportId + String name, String content, String createDate,Long reportId ,StaticDataType staticDataType) { + super(createDate); this.reportType = reportType; this.mainStatus = mainStatus; this.subStatus = subStatus; this.contentId = contentId; this.name = name; this.content = content; - this.createAt = createAt; this.reportId=reportId; this.staticDataType=staticDataType; } - public void updateCreateAt(String createAt) { - this.createAt = createAt; - } - public void mappingCheckRead(boolean check) { this.checkRead = check; } diff --git a/src/main/java/org/myteam/server/admin/dto/response/CommonResponseDto.java b/src/main/java/org/myteam/server/admin/dto/response/CommonResponseDto.java index 9c63d1da..2f13a5c7 100644 --- a/src/main/java/org/myteam/server/admin/dto/response/CommonResponseDto.java +++ b/src/main/java/org/myteam/server/admin/dto/response/CommonResponseDto.java @@ -3,17 +3,17 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Getter; +import org.myteam.server.admin.utill.NeedDateTimeFix; public record CommonResponseDto() { @Getter - @AllArgsConstructor - public static class AdminMemoResponse{ + public static class AdminMemoResponse extends NeedDateTimeFix { private String writerName; - @Schema(example = "2025.06.06") - private String createDate; private String content; - public void updateCreateDate(String date) { - this.createDate = date; + public AdminMemoResponse(String writerName, String createDate, String content) { + super(createDate); + this.writerName = writerName; + this.content = content; } } } diff --git a/src/main/java/org/myteam/server/admin/dto/response/ImprovementResponseDto.java b/src/main/java/org/myteam/server/admin/dto/response/ImprovementResponseDto.java index f6449f69..f16c56d7 100644 --- a/src/main/java/org/myteam/server/admin/dto/response/ImprovementResponseDto.java +++ b/src/main/java/org/myteam/server/admin/dto/response/ImprovementResponseDto.java @@ -3,6 +3,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Getter; +import org.myteam.server.admin.utill.NeedDateTimeFix; import java.util.List; import java.util.UUID; @@ -10,8 +11,8 @@ public record ImprovementResponseDto() { @Getter - @AllArgsConstructor - public final static class ResponseImprovement { + + public final static class ResponseImprovement extends NeedDateTimeFix { private Long improvementId; private UUID publicId; @Schema(example = "높음 중간 낮음") @@ -22,15 +23,21 @@ public final static class ResponseImprovement { private String nickName; private String title; private String content; - private String createDate; - - public void updateCreateDate(String date) { - this.createDate = date; + public ResponseImprovement(Long improvementId, UUID publicId, String importantStatus, String processStatus, + Integer recommendCount, String nickName, String title, String content,String createDate) { + super(createDate); + this.improvementId = improvementId; + this.publicId = publicId; + this.importantStatus = importantStatus; + this.processStatus = processStatus; + this.recommendCount = recommendCount; + this.nickName = nickName; + this.title = title; + this.content = content; } } - @Getter - public final static class ResponseImprovementDetail { + public final static class ResponseImprovementDetail{ private String nickName; private String createDate; private String ip; @@ -41,7 +48,6 @@ public final static class ResponseImprovementDetail { @Schema(example = "높음 중간 낮음") private String importantStatus; private List adminMemoResponseList; - public ResponseImprovementDetail(String nickName, String createDate, String ip, String title, String content, String improvementStatus, String importantStatus) { @@ -53,19 +59,16 @@ public ResponseImprovementDetail(String nickName, String createDate, String ip, this.improvementStatus = improvementStatus; this.importantStatus = importantStatus; } - public void updateAdminMemoList(List adminMemoResponseList) { this.adminMemoResponseList = adminMemoResponseList; } - public void updateCreateDate(String date) { this.createDate = date; } } @Getter - @AllArgsConstructor - public final static class ResponseMemberImproveList { + public final static class ResponseMemberImproveList extends NeedDateTimeFix{ private Long id; @Schema(example = "접수 대기 완료") private String improvementStatus; @@ -75,10 +78,17 @@ public final static class ResponseMemberImproveList { private String nickName; private String title; private String content; - private String createDate; - - public void updateCreateDate(String date) { - this.createDate = date; + public ResponseMemberImproveList(Long id, String improvementStatus, String importantStatus, + Integer recommendCount, String nickName, + String title, String content,String createDate) { + super(createDate); + this.id = id; + this.improvementStatus = improvementStatus; + this.importantStatus = importantStatus; + this.recommendCount = recommendCount; + this.nickName = nickName; + this.title = title; + this.content = content; } } } diff --git a/src/main/java/org/myteam/server/admin/dto/response/InquiryResponseDto.java b/src/main/java/org/myteam/server/admin/dto/response/InquiryResponseDto.java index 30e56d53..08119017 100644 --- a/src/main/java/org/myteam/server/admin/dto/response/InquiryResponseDto.java +++ b/src/main/java/org/myteam/server/admin/dto/response/InquiryResponseDto.java @@ -3,14 +3,14 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Getter; +import org.myteam.server.admin.utill.NeedDateTimeFix; import java.util.List; public record InquiryResponseDto() { @Getter - @AllArgsConstructor - public final static class ResponseInquiryList { + public final static class ResponseInquiryList extends NeedDateTimeFix { private Long id; @Schema(example ="답변대기,답변완료") private String processStatus; @@ -19,17 +19,22 @@ public final static class ResponseInquiryList { private String nickName; private String email; private String content; - private String createDate; - - public void updateCreateDate(String date) { - this.createDate = date; + public ResponseInquiryList(Long id, String processStatus, + String isMember, String nickName, String email, + String content, String createDate) { + super(createDate); + this.id = id; + this.processStatus = processStatus; + this.isMember = isMember; + this.nickName = nickName; + this.email = email; + this.content = content; } } @Getter - @AllArgsConstructor - public final static class ResponseInquiryListCond { + public final static class ResponseInquiryListCond extends NeedDateTimeFix{ private Long id; @Schema(example ="답변대기,답변완료") private String isAnswered; @@ -40,10 +45,16 @@ public final static class ResponseInquiryListCond { private String content; @Schema(description = "문의 작성자의 메일입니다.") private String userMail; - private String createDate; - public void updateCreateDate(String date) { - this.createDate = date; + public ResponseInquiryListCond(Long id, String isAnswered, String isMember, String nicknameEmail, + String content, String userMail,String createDate) { + super(createDate); + this.id = id; + this.isAnswered = isAnswered; + this.isMember = isMember; + this.nicknameEmail = nicknameEmail; + this.content = content; + this.userMail = userMail; } } @Getter diff --git a/src/main/java/org/myteam/server/admin/dto/response/MemberSearchResponseDto.java b/src/main/java/org/myteam/server/admin/dto/response/MemberSearchResponseDto.java index 3d864c21..cbd65ae2 100644 --- a/src/main/java/org/myteam/server/admin/dto/response/MemberSearchResponseDto.java +++ b/src/main/java/org/myteam/server/admin/dto/response/MemberSearchResponseDto.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.myteam.server.admin.utill.NeedDateTimeFix; import java.util.List; import java.util.UUID; @@ -12,9 +13,7 @@ public record MemberSearchResponseDto() { @Getter - @AllArgsConstructor - @NoArgsConstructor - public static class ResponseMemberSearch { + public static class ResponseMemberSearch extends NeedDateTimeFix{ private String status; private String nickName; private Long boardCount; @@ -25,35 +24,40 @@ public static class ResponseMemberSearch { private String memberType; private String email; private String tel; - private String createDate; @Schema(description = "회원 식별값입니다. 상세검색시에 이용해주세요") private UUID memberId; - - public void updateCreateDate(String date) { - this.createDate = date; + public ResponseMemberSearch(String status, String nickName, Long boardCount, Long commentCount, Long reportCount, Integer recommendCount, String genderType, + String memberType, String email, String tel, String createDate, UUID memberId) { + super(createDate); + this.status = status; + this.nickName = nickName; + this.boardCount = boardCount; + this.commentCount = commentCount; + this.reportCount = reportCount; + this.recommendCount = recommendCount; + this.genderType = genderType; + this.memberType = memberType; + this.email = email; + this.tel = tel; + this.memberId = memberId; } } @Getter - public static class ResponseReportList { + public static class ResponseReportList extends NeedDateTimeFix{ private Long contentId; - private String reportedDate; private Long reportedCount; private String reportType; private String content; public ResponseReportList(Long contentId, String reportedDate, Long reportedCount, String reportType, String content) { + super(reportedDate); this.contentId = contentId; - this.reportedDate = reportedDate; this.reportedCount = reportedCount; this.reportType = reportType; this.content = content; } - - public void updateReportDate(String date) { - this.reportedDate = date; - } } @Getter diff --git a/src/main/java/org/myteam/server/admin/dto/response/ResponseContentDto.java b/src/main/java/org/myteam/server/admin/dto/response/ResponseContentDto.java index 7fdecaf3..362738fb 100644 --- a/src/main/java/org/myteam/server/admin/dto/response/ResponseContentDto.java +++ b/src/main/java/org/myteam/server/admin/dto/response/ResponseContentDto.java @@ -2,6 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.myteam.server.admin.utill.NeedDateTimeFix; import java.util.List; @@ -9,15 +10,12 @@ public record ResponseContentDto() { @Getter - @AllArgsConstructor - public static class ResponseContentSearch { + public static class ResponseContentSearch extends NeedDateTimeFix { private Long contentId; private String nickName; @Schema(example = "게시판,댓글,채팅") private String staticDataType; private String content; - @Schema(example = "2025.06.06") - private String createDate; @Schema(example = "정지,정상,경고") private String memberStatus; @Schema(example = "노출,보류,숨김") @@ -26,13 +24,23 @@ public static class ResponseContentSearch { @Schema(description = "신고 됐다면 신고 신고가 없다면 미신고로 표시") private String reported; - public void updateCountReported(Long count, String reported) { + public ResponseContentSearch(Long contentId, String nickName, String staticDataType, + String content, String createDate, + String memberStatus, String adminControlType, Long reportCount, String reported) { + super(createDate); + this.contentId = contentId; + this.nickName = nickName; + this.staticDataType = staticDataType; + this.content = content; + this.memberStatus = memberStatus; + this.adminControlType = adminControlType; + this.reportCount = reportCount; this.reported = reported; - this.reportCount = count; } - public void updateCreateDate(String date) { - this.createDate = date; + public void updateCountReported(Long count, String reported) { + this.reported = reported; + this.reportCount = count; } } diff --git a/src/main/java/org/myteam/server/admin/entity/AdminContentChangeLog.java b/src/main/java/org/myteam/server/admin/entity/AdminContentChangeLog.java index f252b261..8d9230ab 100644 --- a/src/main/java/org/myteam/server/admin/entity/AdminContentChangeLog.java +++ b/src/main/java/org/myteam/server/admin/entity/AdminContentChangeLog.java @@ -4,8 +4,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.global.domain.BaseTime; import org.myteam.server.member.entity.Member; diff --git a/src/main/java/org/myteam/server/admin/entity/AdminContentMemo.java b/src/main/java/org/myteam/server/admin/entity/AdminContentMemo.java index 458adff3..2a408d9f 100644 --- a/src/main/java/org/myteam/server/admin/entity/AdminContentMemo.java +++ b/src/main/java/org/myteam/server/admin/entity/AdminContentMemo.java @@ -4,7 +4,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.global.domain.BaseTime; import org.myteam.server.member.entity.Member; diff --git a/src/main/java/org/myteam/server/admin/repository/AdminDashBoardRepository.java b/src/main/java/org/myteam/server/admin/repository/AdminDashBoardRepository.java index a05a60a9..7c086929 100644 --- a/src/main/java/org/myteam/server/admin/repository/AdminDashBoardRepository.java +++ b/src/main/java/org/myteam/server/admin/repository/AdminDashBoardRepository.java @@ -1,14 +1,13 @@ package org.myteam.server.admin.repository; -import com.querydsl.core.Tuple; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.core.types.dsl.Expressions; -import com.querydsl.core.types.dsl.StringTemplate; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; import org.myteam.server.admin.utill.*; +import org.myteam.server.admin.utill.enums.*; import org.myteam.server.chat.block.domain.BanReason; import org.myteam.server.global.exception.ErrorCode; import org.myteam.server.global.exception.PlayHiveException; @@ -45,17 +44,17 @@ public class AdminDashBoardRepository { private final SecurityReadService securityReadService; - public List getStaticData(StaticDataType staticDataType, DateType dateType) { + public List getStaticData(AdminDashBoardType adminDashBoardType, DateType dateType) { - return getStaticDataByRequest(dateType, staticDataType); + return getStaticDataByRequest(dateType, adminDashBoardType); } - private List getStaticDataByRequest(DateType dateType, StaticDataType staticDataType) { + private List getStaticDataByRequest(DateType dateType,AdminDashBoardType adminDashBoardType) { LocalDateTime now = LocalDateTime.now(); List dateList = DateTypeFactory.SupplyDateTime(dateType, now); - if(staticDataType.name().equals(StaticDataType.DashBoard.name())){ + if(adminDashBoardType.name().equals(AdminDashBoardType.DashBoard.name())){ List responseStatics=new ArrayList<>(); responseStatics.add(CreateStaticQueryFactory.createStaticQuery(board, dateType, dateList, queryFactory)); responseStatics.add(CreateStaticQueryFactory.createStaticQuery(comment1, dateType, dateList, queryFactory)); @@ -67,33 +66,33 @@ private List getStaticDataByRequest(DateType dateType, StaticDat responseStatics.add(CreateStaticQueryFactory.createStaticQuery(member, dateType, dateList, queryFactory)); return responseStatics; } - if(staticDataType.name().equals(StaticDataType.MemberBoard.name())){ + if(adminDashBoardType.name().equals(AdminDashBoardType.MemberBoard.name())){ List responseStatics=new ArrayList<>(); - responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery(member, dateType, dateList, queryFactory)); - responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery(memberAccess, dateType, dateList, queryFactory)); - responseStatics.add(CreateStaticQueryFactory.createSimpleUserDelStatic(dateType,dateList,queryFactory)); + responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery(member, dateList, queryFactory)); + responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery(memberAccess, dateList, queryFactory)); + responseStatics.add(CreateStaticQueryFactory.createSimpleUserDelStatic(dateList,queryFactory)); responseStatics.add(CreateStaticQueryFactory.createStaticMemberStatusQuery( MemberStatus.WARNED,dateList,queryFactory)); responseStatics.add(CreateStaticQueryFactory.createStaticMemberStatusQuery( MemberStatus.INACTIVE,dateList,queryFactory)); return responseStatics; } - if(staticDataType.name().equals(StaticDataType.ContentBoard.name())){ + if(adminDashBoardType.name().equals(AdminDashBoardType.ContentBoard.name())){ List responseStatics=new ArrayList<>(); - responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery(board, dateType, dateList, queryFactory)); - responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery(comment1, dateType, dateList, queryFactory)); - responseStatics.add(CreateStaticQueryFactory.createSimpleReportStaticQuery(dateType, dateList, queryFactory,ReportType.BOARD)); - responseStatics.add(CreateStaticQueryFactory.createSimpleReportStaticQuery(dateType, dateList, queryFactory, ReportType.COMMENT)); + responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery(board, dateList, queryFactory)); + responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery(comment1, dateList, queryFactory)); + responseStatics.add(CreateStaticQueryFactory.createSimpleReportStaticQuery(dateList, queryFactory,ReportType.BOARD)); + responseStatics.add(CreateStaticQueryFactory.createSimpleReportStaticQuery( dateList, queryFactory, ReportType.COMMENT)); responseStatics.add(CreateStaticQueryFactory.createStaticContentQuery(StaticDataType.BOARD,AdminControlType.HIDDEN ,dateList,queryFactory)); - responseStatics.add(CreateStaticQueryFactory.createStaticContentQuery(StaticDataType.COMMENT,AdminControlType.HIDDEN + responseStatics.add(CreateStaticQueryFactory.createStaticContentQuery(StaticDataType.COMMENT, AdminControlType.HIDDEN ,dateList,queryFactory)); return responseStatics; } - if(staticDataType.name().equals(StaticDataType.Inquiry.name())){ + if(adminDashBoardType.name().equals(AdminDashBoardType.InquiryBoard.name())){ List responseStatics=new ArrayList<>(); responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery( - inquiry, dateType, dateList, queryFactory)); + inquiry, dateList, queryFactory)); responseStatics.add(CreateStaticQueryFactory .createInquiryStaticQuery(dateList,false,queryFactory)); responseStatics.add(CreateStaticQueryFactory @@ -104,10 +103,10 @@ private List getStaticDataByRequest(DateType dateType, StaticDat .createMemberInquiryStaticQuery(dateList,false,queryFactory)); return responseStatics; } - if(staticDataType.name().equals(StaticDataType.Improvement.name())){ + if(adminDashBoardType.name().equals(AdminDashBoardType.ImprovementBoard.name())){ List responseStatics=new ArrayList<>(); responseStatics.add(CreateStaticQueryFactory.createSimpleStaticQuery( - improvement, dateType, dateList, queryFactory)); + improvement, dateList, queryFactory)); responseStatics.add(CreateStaticQueryFactory .createImprovementStaticQuery(dateList,StaticDataType.ImprovementPending,queryFactory)); responseStatics.add(CreateStaticQueryFactory @@ -176,15 +175,12 @@ public Map> getLatestData() { .limit(10) .offset(0) .fetch(); + DateFormatUtil.makeTimeByFormatter(reportLatest, DateFormatEnum.formatByDotReq); reportLatest.stream() .forEach(x -> { boolean readCheck = redisService.AdminReadCheck(admin.getPublicId().toString() ,StaticDataType.Report, x.getContentId()); x.mappingCheckRead(readCheck); - x.updateCreateAt( - DateFormatUtil.formatByDot.format( - LocalDateTime.parse(x.getCreateAt(), DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); - if (x.getMainStatus().equals("SHOW")) { x.updateMainStatus("노출"); } @@ -224,13 +220,9 @@ public Map> getLatestData() { .limit(10) .offset(0) .fetch(); + DateFormatUtil.makeTimeByFormatter(inquiryLatest,DateFormatEnum.formatByDotReq); inquiryLatest.stream() .forEach(x -> { - - x.updateCreateAt( - DateFormatUtil.formatByDot.format( - LocalDateTime.parse(x.getCreateAt(), DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); - boolean readCheck = redisService.AdminReadCheck(admin.getPublicId().toString() , x.getStaticDataType(), x.getContentId()); x.mappingCheckRead(readCheck); @@ -261,11 +253,9 @@ public Map> getLatestData() { .limit(10) .offset(0) .fetch(); + DateFormatUtil.makeTimeByFormatter(improveLatest,DateFormatEnum.formatByDotReq); improveLatest.stream() .forEach(x -> { - x.updateCreateAt( - DateFormatUtil.formatByDot.format( - LocalDateTime.parse(x.getCreateAt(), DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); boolean readCheck = redisService.AdminReadCheck(admin.getPublicId().toString() , StaticDataType.Improvement, x.getContentId()); x.mappingCheckRead(readCheck); diff --git a/src/main/java/org/myteam/server/admin/repository/AdminImprovementSearchRepo.java b/src/main/java/org/myteam/server/admin/repository/AdminImprovementSearchRepo.java index 58a74abc..24ca9931 100644 --- a/src/main/java/org/myteam/server/admin/repository/AdminImprovementSearchRepo.java +++ b/src/main/java/org/myteam/server/admin/repository/AdminImprovementSearchRepo.java @@ -7,7 +7,8 @@ import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; import org.myteam.server.admin.utill.CreateAdminMemo; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.DateFormatEnum; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.global.util.date.DateFormatUtil; import org.myteam.server.improvement.domain.ImportantStatus; import org.myteam.server.improvement.domain.ImprovementStatus; @@ -85,12 +86,7 @@ public Page getImprovementList(RequestImprovementList reque .limit(pageable.getPageSize()) .fetch(); - responseImprovementList.stream() - .forEach(x -> { - x.updateCreateDate(DateFormatUtil.formatByDot - .format(LocalDateTime.parse(x.getCreateDate(), DateFormatUtil - .FLEXIBLE_NANO_FORMATTER))); - }); + DateFormatUtil.makeTimeByFormatter(responseImprovementList,DateFormatEnum.formatByDotReq); Long count = Optional.ofNullable(queryFactory.select(improvement.count()) .from(improvement) @@ -107,7 +103,7 @@ public Page getImprovementList(RequestImprovementList reque return new PageImpl<>(responseImprovementList, pageable, count); } - public ResponseImprovementDetail getImprovementDetail(RequestImprovementDetail requestImprovementDetail) { + public ResponseImprovementDetail getImprovementDetail(Long contentId) { ResponseImprovementDetail responseImprovementDetail = queryFactory .select( Projections.constructor( @@ -133,15 +129,14 @@ public ResponseImprovementDetail getImprovementDetail(RequestImprovementDetail r .from(improvement) .join(member) .on(member.eq(improvement.member)) - .where(improvement.id.eq(requestImprovementDetail.getContentId())) + .where(improvement.id.eq(contentId)) .fetchOne(); responseImprovementDetail.updateCreateDate(DateFormatUtil.formatByDotAndSlash.format( LocalDateTime.parse(responseImprovementDetail.getCreateDate() , DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); - responseImprovementDetail.updateAdminMemoList( createAdminMemo.getAdminContentMemo(StaticDataType.Improvement, - requestImprovementDetail.getContentId(), queryFactory)); + contentId, queryFactory)); return responseImprovementDetail; } @@ -181,12 +176,7 @@ public Page getMemberImprovementList(RequestMemberImp .offset(pageable.getOffset()) .fetch(); - responseMemberImproveLists.stream() - .forEach(x -> { - x.updateCreateDate(DateFormatUtil.formatByDot - .format(LocalDateTime.parse(x.getCreateDate() - , DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); - }); + DateFormatUtil.makeTimeByFormatter(responseMemberImproveLists,DateFormatEnum.formatByDotReq); Long totCount = Optional.ofNullable(queryFactory .select(improvement.count()) diff --git a/src/main/java/org/myteam/server/admin/repository/AdminMemberRepository.java b/src/main/java/org/myteam/server/admin/repository/AdminMemberRepository.java index c6b4cfb0..5e023dcd 100644 --- a/src/main/java/org/myteam/server/admin/repository/AdminMemberRepository.java +++ b/src/main/java/org/myteam/server/admin/repository/AdminMemberRepository.java @@ -9,11 +9,9 @@ import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; -import org.myteam.server.admin.dto.ctes.QBoardCountCte; -import org.myteam.server.admin.dto.ctes.QCommentCountCte; -import org.myteam.server.admin.dto.ctes.QMemberReportCte; -import org.myteam.server.admin.dto.ctes.QReportCountCte; +import org.myteam.server.admin.dto.ctes.*; import org.myteam.server.admin.utill.CreateAdminMemo; +import org.myteam.server.admin.utill.enums.DateFormatEnum; import org.myteam.server.global.util.date.DateFormatUtil; import org.myteam.server.member.domain.GenderType; import org.myteam.server.member.domain.MemberRole; @@ -29,7 +27,6 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -56,9 +53,9 @@ public class AdminMemberRepository { public Page getMemberDataList(RequestMemberSearch requestMemberSearch) { Pageable pageable = PageRequest.of(requestMemberSearch.getOffset(), 10); - QBoardCountCte boardCounting = new QBoardCountCte("boardCounting"); - QCommentCountCte commentCount = new QCommentCountCte("commentCount"); - QReportCountCte reportCount = new QReportCountCte("reportCount"); + QBoardRecommendCountCte boardCounting=new QBoardRecommendCountCte("boardCounting"); + QCommentRecommendCountCte commentCount=new QCommentRecommendCountCte("commentCounting"); + QMemberReportedCountCte reportCount = new QMemberReportedCountCte("reportCount"); BlazeJPAQuery blazeJPAQuery = blazeJPAQueryFactory .from(board) @@ -76,7 +73,7 @@ public Page getMemberDataList(RequestMemberSearch requestM .join(member) .on(member.eq(comment1.member)) .groupBy(member.publicId) - .bind(commentCount.publicID, member.publicId) + .bind(commentCount.publicId, member.publicId) .bind(commentCount.count, comment1.id.count().coalesce(0L)) .bind(commentCount.recommendCount, comment1.recommendCount.sum().coalesce(0)); @@ -156,7 +153,7 @@ public Page getMemberDataList(RequestMemberSearch requestM .leftJoin(boardCounting) .on(boardCounting.publicId.eq(member.publicId)) .leftJoin(commentCount) - .on(commentCount.publicID.eq(member.publicId)) + .on(commentCount.publicId.eq(member.publicId)) .leftJoin(reportCount) .on(reportCount.publicId.eq(member.publicId)) .where(userListSearchCond(requestMemberSearch), member.role.notIn(MemberRole.ADMIN)) @@ -165,33 +162,23 @@ public Page getMemberDataList(RequestMemberSearch requestM .limit(pageable.getPageSize()) .fetch(); - responseSearchUserLists.stream().forEach( - x -> { - x.updateCreateDate( - DateFormatUtil.formatByDot - .format(LocalDateTime.parse(x.getCreateDate(), DateFormatUtil - .FLEXIBLE_NANO_FORMATTER))); - } - ); - + DateFormatUtil.makeTimeByFormatter(responseSearchUserLists,DateFormatEnum.formatByDotReq); Long userTot = Optional.ofNullable(queryFactory.select(member.count()) .from(member) .where(userListSearchCond(requestMemberSearch)) .fetchOne()) .orElse(0L); return new PageImpl<>(responseSearchUserLists, pageable, userTot); - } public ResponseMemberDetail getMemberDetail(UUID publicId) { - QBoardCountCte boardCounting = new QBoardCountCte("boardCounting"); - QCommentCountCte commentCount = new QCommentCountCte("commentCount"); + QBoardRecommendCountCte boardCounting=new QBoardRecommendCountCte("boardCounting"); + QCommentRecommendCountCte commentCount=new QCommentRecommendCountCte("commentCounting"); QMember subQueryImprovementMember = new QMember("subQueryImprovementMember"); QMember subQueryReportedMember = new QMember("subQueryReportedMember"); QMember subQueryReporterMember = new QMember("subQueryReporterMember"); - BlazeJPAQuery blazeJPAQuery = blazeJPAQueryFactory .from(board) .join(member) @@ -210,7 +197,7 @@ public ResponseMemberDetail getMemberDetail(UUID publicId) { .on(member.eq(comment1.member)) .where(member.publicId.eq(publicId)) .groupBy(member.publicId) - .bind(commentCount.publicID, member.publicId) + .bind(commentCount.publicId, member.publicId) .bind(commentCount.count, comment1.id.count().coalesce(0L)) .bind(commentCount.recommendCount, comment1.recommendCount.sum().coalesce(0)); @@ -288,15 +275,14 @@ public ResponseMemberDetail getMemberDetail(UUID publicId) { .join(boardCounting) .on(boardCounting.publicId.eq(member.publicId)) .join(commentCount) - .on(commentCount.publicID.eq(member.publicId)) + .on(commentCount.publicId.eq(member.publicId)) .join(memberActivity) .on(memberActivity.member.eq(member)) .where(member.publicId.eq(publicId)) .fetch() .get(0); - editTime(publicId, responseMemberDetail); - + editAdminMemo(publicId, responseMemberDetail); return responseMemberDetail; } @@ -312,7 +298,7 @@ public Page getMemberReportedList(RequestMemberDetail reques UUID publicId = requestMemberDetail.getPublicId(); Pageable pageable = PageRequest.of(requestMemberDetail.getOffset(), 10); - QMemberReportCte cte = new QMemberReportCte("cte"); + QMemberReportCountCte cte = new QMemberReportCountCte("cte"); List responseReportLists = blazeJPAQueryFactory .with(cte, blazeJPAQueryFactory .from(report) @@ -359,8 +345,6 @@ public Page getMemberReportedList(RequestMemberDetail reques .limit(10) .offset(pageable.getOffset()) .fetch(); - - Long totCount = Optional.ofNullable(queryFactory .select(report.count()) .from(report) @@ -368,14 +352,7 @@ public Page getMemberReportedList(RequestMemberDetail reques .on(report.reported.publicId.eq(publicId)) .fetchOne()) .orElse(0L); - - - responseReportLists.stream().forEach(x -> { - x.updateReportDate(DateFormatUtil.formatByDot. - format(LocalDateTime. - parse(x.getReportedDate(), DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); - }); - + DateFormatUtil.makeTimeByFormatter(responseReportLists, DateFormatEnum.formatByDotReq); return new PageImpl<>(responseReportLists, pageable, totCount); } @@ -428,8 +405,7 @@ private BooleanBuilder userListSearchCond(RequestMemberSearch requestMemberSearc return booleanBuilder; } - private void editTime(UUID publicId - , ResponseMemberDetail responseMemberDetail) { + private void editAdminMemo(UUID publicId,ResponseMemberDetail responseMemberDetail) { List adminMemoResponses= createAdminMemo.getAdminMemberMemo(publicId,queryFactory); responseMemberDetail.updateAdminMemoResponse(adminMemoResponses); diff --git a/src/main/java/org/myteam/server/admin/repository/ContentSearchRepository.java b/src/main/java/org/myteam/server/admin/repository/ContentSearchRepository.java index ec082824..67fdad47 100644 --- a/src/main/java/org/myteam/server/admin/repository/ContentSearchRepository.java +++ b/src/main/java/org/myteam/server/admin/repository/ContentSearchRepository.java @@ -9,14 +9,14 @@ import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; -import org.myteam.server.admin.dto.ctes.QContentCountCte; -import org.myteam.server.admin.dto.ctes.QContentCte; -import org.myteam.server.admin.dto.ctes.QMemberReportCte; +import org.myteam.server.admin.dto.ctes.QContentIdCte; +import org.myteam.server.admin.dto.ctes.QContentTotInfoCte; import org.myteam.server.admin.dto.ctes.QSimpleReportCte; import org.myteam.server.admin.dto.response.CommonResponseDto; -import org.myteam.server.admin.utill.AdminControlType; +import org.myteam.server.admin.utill.enums.AdminControlType; import org.myteam.server.admin.utill.CreateAdminMemo; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.DateFormatEnum; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.board.domain.BoardSearchType; import org.myteam.server.chat.block.domain.BanReason; import org.myteam.server.global.util.date.DateFormatUtil; @@ -38,7 +38,7 @@ import static org.myteam.server.admin.dto.request.AdminMemoRequestDto.*; import static org.myteam.server.admin.dto.request.ContentRequestDto.*; import static org.myteam.server.admin.dto.response.ResponseContentDto.*; -import static org.myteam.server.admin.utill.AdminControlType.*; +import static org.myteam.server.admin.utill.enums.AdminControlType.*; import static org.myteam.server.board.domain.QBoard.board; import static org.myteam.server.board.domain.QBoardCount.boardCount; import static org.myteam.server.comment.domain.QComment.comment1; @@ -59,10 +59,10 @@ public void addAdminMemo(AdminMemoContentRequest adminMemoContentRequest) { createAdminMemo.createContentAdminMemo(adminMemoContentRequest,queryFactory); } - public Page getReportList(RequestReportList requestReportList) { + public Page getReportList(Long contentId,StaticDataType staticDataType,Integer page) { - Pageable pageable = PageRequest.of(requestReportList.getOffset(), 10); - if (requestReportList.getStaticDataType().name().equals(StaticDataType.COMMENT.name())) { + Pageable pageable = PageRequest.of(page-1, 10); + if (staticDataType.name().equals(StaticDataType.COMMENT.name())) { List responseReportLists = queryFactory .select( Projections.constructor(ResponseReportList.class, @@ -83,16 +83,16 @@ public Page getReportList(RequestReportList requestReportLis .from(report) .join(comment1) .on(comment1.id.eq(report.reportedContentId).and(report.reportType.eq(ReportType.COMMENT))) - .where(report.reportedContentId.eq(requestReportList.getContentId())) + .where(report.reportedContentId.eq(contentId)) .orderBy(report.createDate.desc()) .limit(10) - .offset(requestReportList.getOffset()) + .offset(pageable.getOffset()) .fetch(); Long totNum = Optional.ofNullable(queryFactory .select(report.count()) .from(report) - .where(report.reportedContentId.eq(requestReportList.getContentId()) + .where(report.reportedContentId.eq(contentId) , report.reportType.eq(ReportType.COMMENT)) .fetchOne()) .orElse(0L); @@ -127,15 +127,15 @@ public Page getReportList(RequestReportList requestReportLis .from(report) .join(board) .on(board.id.eq(report.reportedContentId).and(report.reportType.eq(ReportType.BOARD))) - .where(report.reportedContentId.eq(requestReportList.getContentId())) + .where(report.reportedContentId.eq(contentId)) .orderBy(report.createDate.desc()) .limit(10) - .offset(requestReportList.getOffset()) + .offset(pageable.getOffset()) .fetch(); Long totNum = Optional.ofNullable(queryFactory .select(report.count()) .from(report) - .where(report.reportedContentId.eq(requestReportList.getContentId()) + .where(report.reportedContentId.eq(contentId) , report.reportType.eq(ReportType.BOARD)) .fetchOne() ).orElse(0L); @@ -151,8 +151,8 @@ public Page getReportList(RequestReportList requestReportLis return new PageImpl<>(responseReportLists, pageable, totNum); } - public ResponseDetail getDetail(RequestDetail requestDetail) { - if (requestDetail.getStaticDataType().name().equals(StaticDataType.COMMENT.name())) { + public ResponseDetail getDetail(Long contentId,StaticDataType staticDataType) { + if (staticDataType.name().equals(StaticDataType.COMMENT.name())) { ResponseDetail responseDetail = queryFactory.select(Projections.constructor(ResponseDetail.class, new CaseBuilder() .when(comment1.adminControlType.eq(SHOW)) @@ -180,10 +180,10 @@ public ResponseDetail getDetail(RequestDetail requestDetail) { .from(comment1) .join(member) .on(member.eq(comment1.member)) - .where(comment1.id.eq(requestDetail.getContentId())) + .where(comment1.id.eq(contentId)) .fetch() .get(0); - return editDataTime(StaticDataType.COMMENT, responseDetail, requestDetail); + return editDataTimeAndAdminMemo(StaticDataType.COMMENT, responseDetail,contentId); } ResponseDetail responseDetail = queryFactory.select(Projections.constructor(ResponseDetail.class, @@ -215,11 +215,11 @@ public ResponseDetail getDetail(RequestDetail requestDetail) { .from(board) .join(member) .on(member.eq(board.member)) - .where(board.id.eq(requestDetail.getContentId())) + .where(board.id.eq(contentId)) .fetch() .get(0); - return editDataTime(StaticDataType.BOARD, responseDetail, requestDetail); + return editDataTimeAndAdminMemo(StaticDataType.BOARD, responseDetail, contentId); } public Page getDataList(RequestContentData adminContentResearch) { @@ -241,7 +241,7 @@ public Page getWhenDataTypeIsNullWithUnion(RequestContent Pageable pageable = PageRequest.of(adminContentResearch.getOffset(), 10); QSimpleReportCte reportCte = new QSimpleReportCte("reportCte"); - QContentCte cte = new QContentCte("cte"); + QContentTotInfoCte cte = new QContentTotInfoCte("cte"); //group by문에는 seelct 혹은 bind시 통계데이터만 들어가야되고 상수값이 들ㅇ거ㅏ면안된다. expression.const같은거 @@ -351,7 +351,7 @@ public Page getAdminCommentList(RequestContentData adminC String searchKeyWord = adminContentResearch.getSearchKeyWord(); LocalDateTime startTime = adminContentResearch.provideStartTime(); LocalDateTime endTime = adminContentResearch.provideEndTime(); - QContentCountCte cte = new QContentCountCte("cte"); + QContentIdCte cte = new QContentIdCte("cte"); BlazeJPAQuery countCteQuery = blazeJPAQueryFactory .from(report) @@ -422,7 +422,7 @@ public Page getAdminBoardList(RequestContentData adminCon LocalDateTime startTime = adminContentResearch.provideStartTime(); LocalDateTime endTime = adminContentResearch.provideEndTime(); - QContentCountCte cte = new QContentCountCte("cte"); + QContentIdCte cte = new QContentIdCte("cte"); BlazeJPAQuery countCteQuery = blazeJPAQueryFactory .from(report) @@ -612,7 +612,7 @@ private Predicate totReportCond(Boolean reported, QSimpleReportCte cte) { return cte.isNull(); } - private Predicate totReportCond(Boolean reported, QContentCountCte cte) { + private Predicate totReportCond(Boolean reported, QContentIdCte cte) { if (reported == null) { return null; } @@ -637,16 +637,13 @@ private void updateDetailReportInfo(Boolean isReported, ReportType reportType, IntStream.range(0, responseContents.size()) .forEach(i -> { - String dateTime = DateFormatUtil.formatByDot.format(LocalDateTime.parse( - responseContents.get(i).getCreateDate(), DateFormatUtil.FLEXIBLE_NANO_FORMATTER - )); - responseContents.get(i).updateCreateDate(dateTime); if (countSearches.get(i) == 0) { responseContents.get(i).updateCountReported(0L, "미신고"); } else { responseContents.get(i).updateCountReported(countSearches.get(i), "신고"); } }); + DateFormatUtil.makeTimeByFormatter(responseContents,DateFormatEnum.formatByDotReq); return; } if (isReported && !responseContents.isEmpty()) { @@ -664,32 +661,22 @@ private void updateDetailReportInfo(Boolean isReported, ReportType reportType, .fetch(); IntStream.range(0, responseContents.size()) .forEach(i -> { - String dateTime = DateFormatUtil.formatByDot.format(LocalDateTime.parse( - responseContents.get(i).getCreateDate(), DateFormatUtil.FLEXIBLE_NANO_FORMATTER - )); - responseContents.get(i).updateCreateDate(dateTime); responseContents.get(i).updateCountReported(countSearches.get(i).getReportCount(), "신고"); }); + DateFormatUtil.makeTimeByFormatter(responseContents,DateFormatEnum.formatByDotReq); return; } } private void updateDetailReportInfo(Boolean isReported, List responseContents) { if (isReported == null || !isReported) { - responseContents.stream().forEach(x -> { - - String dateTime = DateFormatUtil.formatByDot.format(LocalDateTime.parse( - x.getCreateDate(), DateFormatUtil.FLEXIBLE_NANO_FORMATTER - )); - x.updateCreateDate(dateTime); - }); + DateFormatUtil.makeTimeByFormatter(responseContents,DateFormatEnum.formatByDotReq); return; } if (isReported && responseContents.size() > 0) { List contentId = responseContents.stream().map(x -> { return new CountSearch(x.getContentId(), x.getAdminControlType(), 0L); }).collect(Collectors.toList()); - List countSearches = contentId.stream().map(x -> { if (x.getContentType().equals("게시판")) { return Optional.ofNullable(queryFactory.select(report.count()) @@ -706,41 +693,31 @@ private void updateDetailReportInfo(Boolean isReported, List { - - String dateTime = DateFormatUtil - .formatByDotAndSlash.format(LocalDateTime.parse(responseContents.get(i) - .getCreateDate() - , DateFormatUtil.FLEXIBLE_NANO_FORMATTER)); - responseContents.get(i).updateCreateDate(dateTime); - if (countSearches.get(i) == 0) { responseContents.get(i).updateCountReported(0L, "미신고"); } else { responseContents.get(i).updateCountReported(countSearches.get(i), "신고"); } }); + DateFormatUtil.makeTimeByFormatter(responseContents,DateFormatEnum.formatByDotAndSlashReq); } } - private ResponseDetail editDataTime(StaticDataType staticDataType, ResponseDetail responseDetail - , RequestDetail requestDetail) { + private ResponseDetail editDataTimeAndAdminMemo(StaticDataType staticDataType, ResponseDetail responseDetail + , Long contentId) { if (responseDetail.getReportCount() > 0) { responseDetail.updateReported("신고"); } List adminMemoResponses = createAdminMemo.getAdminContentMemo(staticDataType, - requestDetail.getContentId(),queryFactory); - + contentId,queryFactory); responseDetail.updateAdminMemoResponses(adminMemoResponses); - String dateTime = DateFormatUtil .formatByDotAndSlash.format(LocalDateTime.parse(responseDetail.getCreateDate() , DateFormatUtil.FLEXIBLE_NANO_FORMATTER)); responseDetail.updateCreateDate(dateTime); - return responseDetail; } diff --git a/src/main/java/org/myteam/server/admin/repository/InquirySearchRepo.java b/src/main/java/org/myteam/server/admin/repository/InquirySearchRepo.java index cec2be92..4753a46e 100644 --- a/src/main/java/org/myteam/server/admin/repository/InquirySearchRepo.java +++ b/src/main/java/org/myteam/server/admin/repository/InquirySearchRepo.java @@ -8,7 +8,8 @@ import lombok.RequiredArgsConstructor; import org.myteam.server.admin.entity.AdminContentMemo; import org.myteam.server.admin.utill.CreateAdminMemo; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.DateFormatEnum; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.global.util.date.DateFormatUtil; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -40,7 +41,7 @@ public AdminContentMemo createAdminMemo(AdminMemoInquiryRequest adminMemoRequest return createAdminMemo.createInquiryAdminMemo(adminMemoRequest, queryFactory); } - public ResponseInquiryDetail getInquiryDetail(RequestInquiryDetail requestInquiryDetail) { + public ResponseInquiryDetail getInquiryDetail(Long inquiryId) { ResponseInquiryDetail responseInquiryDetail = queryFactory .select( Projections.constructor(ResponseInquiryDetail.class, @@ -65,7 +66,7 @@ public ResponseInquiryDetail getInquiryDetail(RequestInquiryDetail requestInquir .from(inquiry) .leftJoin(member) .on(member.eq(inquiry.member)) - .where(inquiry.id.eq(requestInquiryDetail.getContentId())) + .where(inquiry.id.eq(inquiryId)) .fetchOne(); responseInquiryDetail.updateCreateDate(DateFormatUtil.formatByDot @@ -73,7 +74,7 @@ public ResponseInquiryDetail getInquiryDetail(RequestInquiryDetail requestInquir , DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); responseInquiryDetail.updateAdminMemoList( createAdminMemo.getAdminContentMemo(StaticDataType.Inquiry, - requestInquiryDetail.getContentId(), queryFactory)); + inquiryId, queryFactory)); return responseInquiryDetail; } @@ -110,13 +111,7 @@ public Page getInquiryList(RequestInquiryList requestInquir .offset(pageable.getOffset()) .fetch(); - inquiryList.stream() - .forEach(x -> { - x.updateCreateDate(DateFormatUtil.formatByDot - .format(LocalDateTime.parse(x.getCreateDate() - , DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); - }); - + DateFormatUtil.makeTimeByFormatter(inquiryList, DateFormatEnum.formatByDotReq); Long totCount = Optional.ofNullable(queryFactory .select(inquiry.count()) .from(inquiry) @@ -167,13 +162,7 @@ public Page getInquiryListByCond(RequestInquiryListCond .offset(pageable.getOffset()) .fetch(); - responseInquiryListConds.stream() - .forEach(x -> { - x.updateCreateDate(DateFormatUtil.formatByDot - .format(LocalDateTime.parse(x.getCreateDate(), DateFormatUtil - .FLEXIBLE_NANO_FORMATTER))); - }); - + DateFormatUtil.makeTimeByFormatter(responseInquiryListConds,DateFormatEnum.formatByDotReq); Long count = Optional.ofNullable(queryFactory.select(inquiry.count()) .from(inquiry) .leftJoin(member) diff --git a/src/main/java/org/myteam/server/admin/service/AdminBotListener.java b/src/main/java/org/myteam/server/admin/service/AdminBotListener.java index 742d9f7b..228c1eda 100644 --- a/src/main/java/org/myteam/server/admin/service/AdminBotListener.java +++ b/src/main/java/org/myteam/server/admin/service/AdminBotListener.java @@ -3,8 +3,9 @@ import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; -import org.myteam.server.admin.entity.AdminInquiryChangeLog; import org.myteam.server.admin.utill.*; +import org.myteam.server.admin.utill.enums.AdminControlType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.comment.domain.Comment; import org.myteam.server.improvement.domain.ImportantStatus; import org.myteam.server.improvement.domain.ImprovementStatus; diff --git a/src/main/java/org/myteam/server/admin/service/AdminDashBoardService.java b/src/main/java/org/myteam/server/admin/service/AdminDashBoardService.java index 5a711976..0a3ee337 100644 --- a/src/main/java/org/myteam/server/admin/service/AdminDashBoardService.java +++ b/src/main/java/org/myteam/server/admin/service/AdminDashBoardService.java @@ -2,8 +2,8 @@ import lombok.RequiredArgsConstructor; import org.myteam.server.admin.repository.AdminDashBoardRepository; -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.springframework.stereotype.Service; import java.util.List; @@ -19,14 +19,11 @@ public class AdminDashBoardService { private final AdminDashBoardRepository adminDashBoardRepository; - public List getStaticData(StaticDataType staticDataType,DateType dateType) { - - return adminDashBoardRepository.getStaticData(staticDataType,dateType); + public List getStaticData(AdminDashBoardType adminDashBoardType, DateType dateType) { + return adminDashBoardRepository.getStaticData(adminDashBoardType,dateType); } - public Map> getLatestData() { - return adminDashBoardRepository.getLatestData(); } } diff --git a/src/main/java/org/myteam/server/admin/service/AdminImprovementService.java b/src/main/java/org/myteam/server/admin/service/AdminImprovementService.java index 7d473ca4..30c2d3d7 100644 --- a/src/main/java/org/myteam/server/admin/service/AdminImprovementService.java +++ b/src/main/java/org/myteam/server/admin/service/AdminImprovementService.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import org.myteam.server.admin.repository.AdminImprovementSearchRepo; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.global.util.redis.service.RedisService; import org.myteam.server.member.entity.Member; import org.myteam.server.member.service.SecurityReadService; @@ -24,22 +24,20 @@ public class AdminImprovementService { public Page getImproveListCond(RequestImprovementList requestImprovementList) { - return adminImprovementSearchRepo.getImprovementList(requestImprovementList); } public Page getImproveListMember(RequestMemberImproveList requestImprovementList) { - return adminImprovementSearchRepo.getMemberImprovementList(requestImprovementList); } - public ResponseImprovementDetail getImproveDetail(RequestImprovementDetail requestImprovementList) { + public ResponseImprovementDetail getImproveDetail(Long contentId,String readCheck) { ResponseImprovementDetail responseImprovementDetail - =adminImprovementSearchRepo.getImprovementDetail(requestImprovementList);; - if(requestImprovementList.getAlarmCheck()!=null) { + =adminImprovementSearchRepo.getImprovementDetail(contentId);; + if(readCheck!=null) { Member admin = securityReadService.getMember(); redisService.adminReadCheckUpdate(admin.getPublicId().toString() - , StaticDataType.Improvement, requestImprovementList.getContentId()); + , StaticDataType.Improvement, contentId); } return responseImprovementDetail; } diff --git a/src/main/java/org/myteam/server/admin/service/AdminInquiryService.java b/src/main/java/org/myteam/server/admin/service/AdminInquiryService.java index 850505e2..c0c21122 100644 --- a/src/main/java/org/myteam/server/admin/service/AdminInquiryService.java +++ b/src/main/java/org/myteam/server/admin/service/AdminInquiryService.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import org.myteam.server.admin.entity.AdminContentMemo; import org.myteam.server.admin.repository.InquirySearchRepo; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.common.certification.service.InquiryAnsSendService; import org.myteam.server.global.util.redis.service.RedisService; import org.myteam.server.member.entity.Member; @@ -33,13 +33,13 @@ public Page getInquiryListCond(RequestInquiryListCond r return inquirySearchRepo.getInquiryListByCond(requestInquiryListCond); } - public ResponseInquiryDetail getInquiryDetail(RequestInquiryDetail requestInquiryDetail) { + public ResponseInquiryDetail getInquiryDetail(Long inquiryId,String readCheck) { ResponseInquiryDetail responseInquiryDetail= - inquirySearchRepo.getInquiryDetail(requestInquiryDetail); - if(requestInquiryDetail.getAlarmCheck()!=null) { + inquirySearchRepo.getInquiryDetail(inquiryId); + if(readCheck!=null) { Member admin = securityReadService.getMember(); redisService.adminReadCheckUpdate(admin.getPublicId().toString() - , StaticDataType.Inquiry, requestInquiryDetail.getContentId()); + , StaticDataType.Inquiry, inquiryId); } return responseInquiryDetail; } diff --git a/src/main/java/org/myteam/server/admin/service/ContentSearchService.java b/src/main/java/org/myteam/server/admin/service/ContentSearchService.java index fddf047f..2395dead 100644 --- a/src/main/java/org/myteam/server/admin/service/ContentSearchService.java +++ b/src/main/java/org/myteam/server/admin/service/ContentSearchService.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import org.myteam.server.admin.repository.ContentSearchRepository; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.global.util.redis.service.RedisService; import org.myteam.server.member.entity.Member; import org.myteam.server.member.service.SecurityReadService; @@ -24,20 +24,20 @@ public class ContentSearchService { private final SecurityReadService securityReadService; private final RedisService redisService; - public Page getReportList(RequestReportList requestReportList){ + public Page getReportList(Long contentId,StaticDataType staticDataType,Integer page){ - return contentSearchRepository.getReportList(requestReportList); + return contentSearchRepository.getReportList(contentId,staticDataType,page); } public Page getContentList(RequestContentData requestReportList){ return contentSearchRepository.getDataList(requestReportList); } - public ResponseDetail getContentDetail(RequestDetail requestDetail){ - ResponseDetail responseDetail=contentSearchRepository.getDetail(requestDetail); - if(requestDetail.getAlarmCheck()!=null&&requestDetail.getReportId()!=null) { + public ResponseDetail getContentDetail(Long contentId,StaticDataType staticDataType,Long reportId,String readCheck){ + ResponseDetail responseDetail=contentSearchRepository.getDetail(contentId,staticDataType); + if(readCheck!=null&&reportId!=null) { Member admin = securityReadService.getMember(); redisService.adminReadCheckUpdate(admin.getPublicId().toString() - , StaticDataType.Report, requestDetail.getReportId()); + , StaticDataType.Report,reportId); } return responseDetail; } diff --git a/src/main/java/org/myteam/server/admin/utill/AdminBotCreateLogEvent.java b/src/main/java/org/myteam/server/admin/utill/AdminBotCreateLogEvent.java index 2f02a0d8..ff07a8fc 100644 --- a/src/main/java/org/myteam/server/admin/utill/AdminBotCreateLogEvent.java +++ b/src/main/java/org/myteam/server/admin/utill/AdminBotCreateLogEvent.java @@ -4,7 +4,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.myteam.server.report.domain.ReportType; +import org.myteam.server.admin.utill.enums.StaticDataType; @NoArgsConstructor @Getter @@ -15,7 +15,7 @@ public class AdminBotCreateLogEvent { private Boolean isMember; @Builder - public AdminBotCreateLogEvent(Long contentId,StaticDataType staticDataType,Boolean isMember){ + public AdminBotCreateLogEvent(Long contentId, StaticDataType staticDataType, Boolean isMember){ this.contentId=contentId; this.staticDataType=staticDataType; this.isMember=isMember; diff --git a/src/main/java/org/myteam/server/admin/utill/CreateAdminMemo.java b/src/main/java/org/myteam/server/admin/utill/CreateAdminMemo.java index 1149b5c1..c5f1a188 100644 --- a/src/main/java/org/myteam/server/admin/utill/CreateAdminMemo.java +++ b/src/main/java/org/myteam/server/admin/utill/CreateAdminMemo.java @@ -6,6 +6,8 @@ import lombok.RequiredArgsConstructor; import org.myteam.server.admin.entity.*; import org.myteam.server.admin.repository.simpleRepo.*; +import org.myteam.server.admin.utill.enums.DateFormatEnum; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.board.domain.Board; import org.myteam.server.comment.domain.Comment; import org.myteam.server.global.util.date.DateFormatUtil; @@ -16,7 +18,7 @@ import org.myteam.server.member.service.MemberReadService; import org.myteam.server.member.service.SecurityReadService; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; + import java.util.List; import java.util.UUID; @@ -220,11 +222,8 @@ public List getAdminContentMemo(StaticDataType staticDataType .and(adminContentMemo.contentId.eq(contentId))) .orderBy(adminContentMemo.createDate.desc()) .fetch(); - adminMemoList.stream().forEach(x->{ - x.updateCreateDate(DateFormatUtil.formatByDot - .format(LocalDateTime.parse(x.getCreateDate(), - DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); - }); + + DateFormatUtil.makeTimeByFormatter(adminMemoList, DateFormatEnum.formatByDotReq); return adminMemoList; } @@ -242,11 +241,7 @@ public List getAdminMemberMemo(UUID memberId, JPAQueryFactory .where(adminMemberMemo.memberId.eq(memberId)) .orderBy(adminMemberMemo.createDate.desc()) .fetch(); - adminMemoList.stream().forEach(x->{ - x.updateCreateDate(DateFormatUtil.formatByDot - .format(LocalDateTime.parse(x.getCreateDate(), - DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); - }); + DateFormatUtil.makeTimeByFormatter(adminMemoList,DateFormatEnum.formatByDotReq); return adminMemoList; } diff --git a/src/main/java/org/myteam/server/admin/utill/CreateStaticQueryFactory.java b/src/main/java/org/myteam/server/admin/utill/CreateStaticQueryFactory.java index 65b1b88b..6ea713a3 100644 --- a/src/main/java/org/myteam/server/admin/utill/CreateStaticQueryFactory.java +++ b/src/main/java/org/myteam/server/admin/utill/CreateStaticQueryFactory.java @@ -6,8 +6,10 @@ import com.querydsl.core.types.dsl.EntityPathBase; import com.querydsl.core.types.dsl.StringTemplate; import com.querydsl.jpa.impl.JPAQueryFactory; -import org.hibernate.type.descriptor.DateTimeUtils; -import org.myteam.server.admin.entity.AdminInquiryChangeLog; +import org.apache.naming.TransactionRef; +import org.myteam.server.admin.utill.enums.AdminControlType; +import org.myteam.server.admin.utill.enums.DateType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.global.util.date.DateFormatUtil; import org.myteam.server.improvement.domain.ImprovementStatus; import org.myteam.server.member.domain.MemberStatus; @@ -21,7 +23,6 @@ import static org.myteam.server.admin.entity.QAdminImproveChangeLog.adminImproveChangeLog; import static org.myteam.server.admin.entity.QAdminInquiryChangeLog.adminInquiryChangeLog; import static org.myteam.server.admin.entity.QAdminMemberChangeLog.*; -import static org.myteam.server.inquiry.domain.QInquiry.inquiry; import static org.myteam.server.member.entity.QMember.member; import static org.myteam.server.report.domain.QReport.report; @@ -56,31 +57,15 @@ public static ResponseStatic createStaticQuery(EntityPath target, .fetch() .get(0); - Map currentCountByDate = new HashMap<>(); - Map pastCountByDate=new HashMap<>(); - currentCount.stream() - .forEach(x -> { - currentCountByDate.put(x.get(0, String.class), x.get(1, Long.class)); - }); - pastCount.stream() - .forEach(x -> { - pastCountByDate.put(x.get(0, String.class), x.get(1, Long.class)); - }); + Map currentCountByDateFinal=new TreeMap<>(); + Map pastCountByDateFinal=new TreeMap<>(); - Map currentCountByDateFinal; - Map pastCountByDateFinal; - currentCountByDateFinal=fillEmptyDate(staticEndTime,staticStartTime,currentCountByDate,dateType); - pastCountByDateFinal=fillEmptyDate(staticEndTimePast,staticStartTimePast,pastCountByDate,dateType); - - Long currentSums = currentCount.stream() - .mapToLong(x -> x.get(1, Long.class)) - .sum(); - - Long pastSums = pastCount.stream() - .mapToLong(x -> x.get(1, Long.class)) - .sum(); + List values=makeFinalDateAndCountMap(currentCountByDateFinal,pastCountByDateFinal,currentCount + ,pastCount,staticEndTime,staticStartTime,staticEndTimePast,staticStartTimePast, dateType); + Long currentSums=values.get(0); + Long pastSums=values.get(1); int percent = StaticUtil.makeStaticPercent(currentSums,pastSums); @@ -98,8 +83,7 @@ public static ResponseStatic createStaticQuery(EntityPath target, .build(); } - public static ResponseStatic createSimpleStaticQuery(EntityPath target, - DateType dateType, List dateList + public static ResponseStatic createSimpleStaticQuery(EntityPath target,List dateList , JPAQueryFactory queryFactory) { LocalDateTime staticStartTime = dateList.get(0); @@ -251,7 +235,7 @@ public static ResponseStatic createMemberInquiryStaticQuery(List } public static ResponseStatic createStaticContentQuery(StaticDataType staticDataType, - AdminControlType adminControlType,List dateList,JPAQueryFactory queryFactory) + AdminControlType adminControlType, List dateList, JPAQueryFactory queryFactory) { LocalDateTime staticStartTime = dateList.get(0); LocalDateTime staticEndTime = dateList.get(1); @@ -362,30 +346,16 @@ public static ResponseStatic createReportStaticQuery(DateType dateType, List currentCountByDate = new HashMap<>(); - Map pastCountByDate=new HashMap<>(); - currentCount.stream() - .forEach(x -> { - currentCountByDate.put(x.get(0, String.class), x.get(1, Long.class)); - }); - pastCount.stream() - .forEach(x -> { - pastCountByDate.put(x.get(0, String.class), x.get(1, Long.class)); - }); - Map currentCountByDateFinal; - Map pastCountByDateFinal; + Map currentCountByDateFinal=new TreeMap<>(); + Map pastCountByDateFinal=new TreeMap<>(); - currentCountByDateFinal=fillEmptyDate(staticEndTime,staticStartTime,currentCountByDate,dateType); - pastCountByDateFinal=fillEmptyDate(staticEndTimePast,staticStartTimePast,pastCountByDate,dateType); - Long currentSums = currentCount.stream() - .mapToLong(x -> x.get(1, Long.class)) - .sum(); + List values=makeFinalDateAndCountMap(currentCountByDateFinal,pastCountByDateFinal,currentCount + ,pastCount,staticEndTime,staticStartTime,staticEndTimePast,staticStartTimePast, dateType); - Long pastSums = pastCount.stream() - .mapToLong(x -> x.get(1, Long.class)) - .sum(); + Long currentSums=values.get(0); + Long pastSums=values.get(1); int percent = StaticUtil.makeStaticPercent(currentSums,pastSums); @@ -400,7 +370,7 @@ public static ResponseStatic createReportStaticQuery(DateType dateType, List dateList + public static ResponseStatic createSimpleReportStaticQuery( List dateList , JPAQueryFactory queryFactory, ReportType reportType) { LocalDateTime staticStartTime = dateList.get(0); @@ -441,7 +411,7 @@ public static ResponseStatic createSimpleReportStaticQuery(DateType dateType, Li } - public static ResponseStatic createSimpleUserDelStatic(DateType dateType,List dateList,JPAQueryFactory queryFactory){ + public static ResponseStatic createSimpleUserDelStatic(List dateList,JPAQueryFactory queryFactory){ LocalDateTime staticStartTime = dateList.get(0); LocalDateTime staticEndTime = dateList.get(1); LocalDateTime staticStartTimePast = dateList.get(2); @@ -494,44 +464,24 @@ public static ResponseStatic createUserDelStatic(DateType dateType,List currentCountByDate = new HashMap<>(); - Map pastCountByDate=new HashMap<>(); - currentCount.stream() - .forEach(x -> { - currentCountByDate.put(x.get(0, String.class), x.get(1, Long.class)); - }); - pastCount.stream() - .forEach(x -> { - pastCountByDate.put(x.get(0, String.class), x.get(1, Long.class)); - }); + Map currentCountByDateFinal=new TreeMap<>(); + Map pastCountByDateFinal=new TreeMap<>(); - Map currentCountByDateFinal; - Map pastCountByDateFinal; - currentCountByDateFinal=fillEmptyDate(staticEndTime,staticStartTime,currentCountByDate,dateType); - pastCountByDateFinal=fillEmptyDate(staticEndTimePast,staticStartTimePast,pastCountByDate,dateType); + List values=makeFinalDateAndCountMap(currentCountByDateFinal,pastCountByDateFinal,currentCount + ,pastCount,staticEndTime,staticStartTime,staticEndTimePast,staticStartTimePast, dateType); - Long currentSum = currentCount - .stream() - .mapToLong(x -> { - return x.get(1, Long.class); - }) - .sum(); - Long pastSum = pastCount - .stream() - .mapToLong(x -> { - return x.get(1, Long.class); - }) - .sum(); + Long currentSums=values.get(0); + Long pastSums=values.get(1); - int percent = StaticUtil.makeStaticPercent(currentSum,pastSum); + int percent = StaticUtil.makeStaticPercent(currentSums,pastSums); return ResponseStatic .builder() .currentStaticData(currentCountByDateFinal) .pastStaticData(pastCountByDateFinal) - .currentCount(currentSum) - .pastCount(pastSum) + .currentCount(currentSums) + .pastCount(pastSums) .totCount(totCount) .percent(percent) .staticDataName(StaticDataType.UserDeleted.name()) @@ -557,9 +507,8 @@ private static Predicate improvementProcessCond(StaticDataType staticDataType){ return adminImproveChangeLog.improvementStatus.eq(ImprovementStatus.COMPLETED); } - public static Map fillEmptyDate(LocalDateTime startTime, - LocalDateTime endTime,Map maps,DateType dateType){ - Map filledResult = new TreeMap<>(); + private static void fillEmptyDate(LocalDateTime startTime,LocalDateTime endTime,Map maps + ,DateType dateType,Map finalMap){ if(dateType.equals(DateType.OneMonth)||dateType.equals(DateType.SixMonth)|| dateType.equals(DateType.ThreeMonth)||dateType.equals(DateType.Year)) { @@ -568,7 +517,7 @@ public static Map fillEmptyDate(LocalDateTime startTime, YearMonth current = startMonth; while (current.isBefore(endMonth)) { String monthKey = DateFormatUtil.formatByDotMonth.format(current); - filledResult.put(monthKey, maps.getOrDefault(monthKey, 0L)); + finalMap.put(monthKey, maps.getOrDefault(monthKey, 0L)); current = current.plusMonths(1); } } @@ -576,10 +525,43 @@ public static Map fillEmptyDate(LocalDateTime startTime, LocalDateTime current=startTime; while (current.isBefore(endTime)) { String dayKey =DateFormatUtil.formatByDot.format(current); - filledResult.put(dayKey,maps.getOrDefault(dayKey, 0L)); + finalMap.put(dayKey,maps.getOrDefault(dayKey, 0L)); current = current.plusDays(1L); } } - return filledResult; } + + private static void fillDateAndCountToMap(Map map,List data){ + data.stream() + .forEach(x->{ + map.put(x.get(0,String.class),x.get(1,Long.class)); + }); + } + private static Long makeTotalSumOfCount(List data){ + return data.stream() + .mapToLong( + x->{ + return x.get(1,Long.class); + } + ) + .sum(); + } + private static List makeFinalDateAndCountMap + (Map currentCountByDateFinal,Map pastCountByDateFinal + ,List currentCount,List pastCount, + LocalDateTime staticEndTime,LocalDateTime staticStartTime,LocalDateTime staticEndTimePast + ,LocalDateTime staticStartTimePast,DateType dateType){ + Map currentCountByDate = new HashMap<>(); + Map pastCountByDate=new HashMap<>(); + fillDateAndCountToMap(currentCountByDate,currentCount); + fillDateAndCountToMap(pastCountByDate,pastCount); + fillEmptyDate(staticEndTime,staticStartTime,currentCountByDate,dateType,currentCountByDateFinal); + fillEmptyDate(staticEndTimePast,staticStartTimePast,pastCountByDate,dateType,pastCountByDateFinal); + List values=new ArrayList<>(); + values.add(makeTotalSumOfCount(currentCount)); + values.add(makeTotalSumOfCount(pastCount)); + + return values; + } + } diff --git a/src/main/java/org/myteam/server/admin/utill/DateTypeFactory.java b/src/main/java/org/myteam/server/admin/utill/DateTypeFactory.java index c4c587af..c48a33a3 100644 --- a/src/main/java/org/myteam/server/admin/utill/DateTypeFactory.java +++ b/src/main/java/org/myteam/server/admin/utill/DateTypeFactory.java @@ -1,5 +1,6 @@ package org.myteam.server.admin.utill; +import org.myteam.server.admin.utill.enums.DateType; import org.myteam.server.global.exception.ErrorCode; import org.myteam.server.global.exception.PlayHiveException; diff --git a/src/main/java/org/myteam/server/admin/utill/NeedDateTimeFix.java b/src/main/java/org/myteam/server/admin/utill/NeedDateTimeFix.java new file mode 100644 index 00000000..7b6c059d --- /dev/null +++ b/src/main/java/org/myteam/server/admin/utill/NeedDateTimeFix.java @@ -0,0 +1,20 @@ +package org.myteam.server.admin.utill; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +public class NeedDateTimeFix { + + @Schema(example = "2025.06.06") + private String createDate; + public NeedDateTimeFix(String createDate) { + this.createDate = createDate; + } + public void updateCreateDate(String date) { + this.createDate = date; + } + +} diff --git a/src/main/java/org/myteam/server/admin/utill/StaticUtil.java b/src/main/java/org/myteam/server/admin/utill/StaticUtil.java index 639b6f0c..25e8d4d4 100644 --- a/src/main/java/org/myteam/server/admin/utill/StaticUtil.java +++ b/src/main/java/org/myteam/server/admin/utill/StaticUtil.java @@ -3,9 +3,13 @@ import com.querydsl.core.types.EntityPath; import com.querydsl.core.types.Predicate; import com.querydsl.core.types.dsl.StringTemplate; +import javassist.Loader; +import org.myteam.server.admin.utill.enums.DateType; + import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.Date; + import static com.querydsl.core.types.dsl.Expressions.stringTemplate; import static org.myteam.server.admin.entity.QAdminContentChangeLog.adminContentChangeLog; import static org.myteam.server.admin.entity.QAdminImproveChangeLog.adminImproveChangeLog; @@ -146,7 +150,7 @@ public static int makeStaticPercent(Long val1, Long val2) { return Math.round(((float) (val1 - val2) / val2) * 100f); } - public static String dateFormat(Date date, String mysqlFormatPattern) { + public static String dateFormat(Date date, String mysqlFormatPattern) { if (date == null) { return null; } @@ -158,7 +162,6 @@ public static String dateFormat(Date date, String mysqlFormatPattern) { .replace("%H", "HH") // 시 (00-23) .replace("%i", "mm") // 분 (00-59) .replace("%s", "ss"); // 초 (00-59) - // 필요한 다른 MySQL 패턴도 여기에 추가 변환 로직을 넣을 수 있습니다. SimpleDateFormat sdf = new SimpleDateFormat(javaFormatPattern); return sdf.format(date); diff --git a/src/main/java/org/myteam/server/admin/utill/AdminControlType.java b/src/main/java/org/myteam/server/admin/utill/enums/AdminControlType.java similarity index 57% rename from src/main/java/org/myteam/server/admin/utill/AdminControlType.java rename to src/main/java/org/myteam/server/admin/utill/enums/AdminControlType.java index ee8d4641..1cc118a9 100644 --- a/src/main/java/org/myteam/server/admin/utill/AdminControlType.java +++ b/src/main/java/org/myteam/server/admin/utill/enums/AdminControlType.java @@ -1,7 +1,6 @@ -package org.myteam.server.admin.utill; +package org.myteam.server.admin.utill.enums; public enum AdminControlType { - SHOW, PENDING, HIDDEN } diff --git a/src/main/java/org/myteam/server/admin/utill/enums/AdminDashBoardType.java b/src/main/java/org/myteam/server/admin/utill/enums/AdminDashBoardType.java new file mode 100644 index 00000000..c4445c27 --- /dev/null +++ b/src/main/java/org/myteam/server/admin/utill/enums/AdminDashBoardType.java @@ -0,0 +1,5 @@ +package org.myteam.server.admin.utill.enums; + +public enum AdminDashBoardType { + DashBoard,MemberBoard,ContentBoard,InquiryBoard,ImprovementBoard +} diff --git a/src/main/java/org/myteam/server/admin/utill/enums/DateFormatEnum.java b/src/main/java/org/myteam/server/admin/utill/enums/DateFormatEnum.java new file mode 100644 index 00000000..577d925a --- /dev/null +++ b/src/main/java/org/myteam/server/admin/utill/enums/DateFormatEnum.java @@ -0,0 +1,6 @@ +package org.myteam.server.admin.utill.enums; + +public enum DateFormatEnum { + + formatByDotAndSlashReq,formatByDotReq,formatByDotMonthReq +} diff --git a/src/main/java/org/myteam/server/admin/utill/DateType.java b/src/main/java/org/myteam/server/admin/utill/enums/DateType.java similarity index 62% rename from src/main/java/org/myteam/server/admin/utill/DateType.java rename to src/main/java/org/myteam/server/admin/utill/enums/DateType.java index dfd8fd65..9ca4cc68 100644 --- a/src/main/java/org/myteam/server/admin/utill/DateType.java +++ b/src/main/java/org/myteam/server/admin/utill/enums/DateType.java @@ -1,4 +1,4 @@ -package org.myteam.server.admin.utill; +package org.myteam.server.admin.utill.enums; public enum DateType { Day,WeekEnd,OneMonth,ThreeMonth,SixMonth,Year diff --git a/src/main/java/org/myteam/server/admin/utill/StaticDataType.java b/src/main/java/org/myteam/server/admin/utill/enums/StaticDataType.java similarity index 87% rename from src/main/java/org/myteam/server/admin/utill/StaticDataType.java rename to src/main/java/org/myteam/server/admin/utill/enums/StaticDataType.java index bc713dca..53376161 100644 --- a/src/main/java/org/myteam/server/admin/utill/StaticDataType.java +++ b/src/main/java/org/myteam/server/admin/utill/enums/StaticDataType.java @@ -1,9 +1,7 @@ -package org.myteam.server.admin.utill; +package org.myteam.server.admin.utill.enums; public enum StaticDataType { - DashBoard,MemberBoard,ContentBoard, - Report, ReportedChat, ReportedComment, ReportedBoard, //BOARD,COMMENT의 경우 ReportType이라는 enum과 값을 맞춰야 하는 로직이 다른 기능에서 존재해서 대문자로 했습니다. BOARD, COMMENT, BoardComment, diff --git a/src/main/java/org/myteam/server/board/domain/Board.java b/src/main/java/org/myteam/server/board/domain/Board.java index 58b16069..d806541a 100644 --- a/src/main/java/org/myteam/server/board/domain/Board.java +++ b/src/main/java/org/myteam/server/board/domain/Board.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.dto.request.BoardRequest; import org.myteam.server.global.domain.BaseTime; import org.myteam.server.global.domain.Category; diff --git a/src/main/java/org/myteam/server/comment/domain/Comment.java b/src/main/java/org/myteam/server/comment/domain/Comment.java index ebccf3b6..111c9eb1 100644 --- a/src/main/java/org/myteam/server/comment/domain/Comment.java +++ b/src/main/java/org/myteam/server/comment/domain/Comment.java @@ -3,8 +3,8 @@ import jakarta.persistence.*; 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.global.domain.BaseTime; import org.myteam.server.member.entity.Member; diff --git a/src/main/java/org/myteam/server/global/util/date/DateFormatUtil.java b/src/main/java/org/myteam/server/global/util/date/DateFormatUtil.java index e346b94e..9f2b4eb8 100644 --- a/src/main/java/org/myteam/server/global/util/date/DateFormatUtil.java +++ b/src/main/java/org/myteam/server/global/util/date/DateFormatUtil.java @@ -1,12 +1,17 @@ package org.myteam.server.global.util.date; +import org.myteam.server.admin.utill.enums.DateFormatEnum; +import org.myteam.server.admin.utill.NeedDateTimeFix; + import java.sql.Date; import java.sql.Time; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.time.temporal.ChronoField; +import java.util.List; public class DateFormatUtil { @@ -27,4 +32,18 @@ public static LocalDate convertToLocalDateToDate(LocalDate localDate) { public static LocalTime convertToLocalTimeToTime(LocalTime localDate) { return Time.valueOf(localDate).toLocalTime(); } + public static void makeTimeByFormatter(List data, DateFormatEnum dateFormatEnum){ + data.stream() + .forEach(x -> { + x.updateCreateDate( + dateFormatEnum.equals(DateFormatEnum.formatByDotReq) ? + DateFormatUtil.formatByDot + .format(LocalDateTime.parse(x.getCreateDate() + , DateFormatUtil.FLEXIBLE_NANO_FORMATTER)) + : DateFormatUtil.formatByDotAndSlash + .format(LocalDateTime.parse(x.getCreateDate() + , DateFormatUtil.FLEXIBLE_NANO_FORMATTER))); + }); + } + } diff --git a/src/main/java/org/myteam/server/global/util/redis/service/RedisService.java b/src/main/java/org/myteam/server/global/util/redis/service/RedisService.java index 74c6ad98..c39f65b2 100644 --- a/src/main/java/org/myteam/server/global/util/redis/service/RedisService.java +++ b/src/main/java/org/myteam/server/global/util/redis/service/RedisService.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.util.UUID; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/myteam/server/improvement/service/ImprovementService.java b/src/main/java/org/myteam/server/improvement/service/ImprovementService.java index c86b1c17..62adaf46 100644 --- a/src/main/java/org/myteam/server/improvement/service/ImprovementService.java +++ b/src/main/java/org/myteam/server/improvement/service/ImprovementService.java @@ -2,10 +2,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.myteam.server.admin.entity.AdminImproveChangeLog; -import org.myteam.server.admin.repository.simpleRepo.AdminImproveChangeLogRepo; import org.myteam.server.admin.utill.AdminBotCreateLogEvent; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.comment.domain.CommentType; import org.myteam.server.comment.service.CommentService; import org.myteam.server.global.exception.ErrorCode; @@ -23,11 +21,9 @@ import org.myteam.server.improvement.repository.ImprovementQueryRepository; import org.myteam.server.improvement.repository.ImprovementRepository; import org.myteam.server.member.entity.Member; -import org.myteam.server.member.service.MemberReadService; import org.myteam.server.member.service.SecurityReadService; import org.myteam.server.report.domain.DomainType; import org.myteam.server.upload.service.StorageService; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/myteam/server/inquiry/service/InquiryService.java b/src/main/java/org/myteam/server/inquiry/service/InquiryService.java index 4a315e8c..51ea3c49 100644 --- a/src/main/java/org/myteam/server/inquiry/service/InquiryService.java +++ b/src/main/java/org/myteam/server/inquiry/service/InquiryService.java @@ -3,10 +3,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.myteam.server.admin.entity.AdminInquiryChangeLog; -import org.myteam.server.admin.repository.simpleRepo.AdminInquiryChangeLogRepo; import org.myteam.server.admin.utill.AdminBotCreateLogEvent; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.comment.domain.CommentType; import org.myteam.server.comment.service.CommentService; import org.myteam.server.global.exception.ErrorCode; @@ -17,7 +15,6 @@ import org.myteam.server.inquiry.repository.InquiryRepository; import org.myteam.server.member.entity.Member; import org.myteam.server.member.repository.MemberJpaRepository; -import org.myteam.server.member.service.MemberReadService; import org.myteam.server.member.service.SecurityReadService; import org.myteam.server.util.slack.service.SlackService; import org.springframework.context.ApplicationEventPublisher; diff --git a/src/test/java/org/myteam/server/admin/AdminContentSearchTest.java b/src/test/java/org/myteam/server/admin/AdminContentSearchTest.java index 2b42e362..1ee0769e 100644 --- a/src/test/java/org/myteam/server/admin/AdminContentSearchTest.java +++ b/src/test/java/org/myteam/server/admin/AdminContentSearchTest.java @@ -7,8 +7,8 @@ import org.myteam.server.admin.entity.AdminContentChangeLog; import org.myteam.server.admin.entity.AdminContentMemo; import org.myteam.server.admin.repository.ContentSearchRepository; -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.Board; import org.myteam.server.board.domain.CategoryType; import org.myteam.server.chat.block.domain.BanReason; @@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.data.domain.Page; -import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.transaction.annotation.Transactional; import java.time.Duration; @@ -34,6 +33,7 @@ import static org.myteam.server.admin.entity.QAdminContentChangeLog.adminContentChangeLog; import static org.myteam.server.admin.entity.QAdminContentMemo.adminContentMemo; import static org.myteam.server.global.security.jwt.JwtProvider.TOKEN_CATEGORY_ACCESS; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -190,29 +190,15 @@ void contentListTest() { @Test void getDetail() { - RequestDetail requestDetail = RequestDetail - .builder() - .staticDataType(StaticDataType.BOARD) - .contentId(b.getId()) - .build(); - - ResponseDetail responseDetail = contentSearchRepository.getDetail(requestDetail); + ResponseDetail responseDetail = contentSearchRepository.getDetail(b.getId(),StaticDataType.BOARD); assertThat(responseDetail.getReportCount()).isEqualTo(1); assertThat(responseDetail.getRecommendCount()).isEqualTo(0); assertThat(responseDetail.getReported()).isEqualTo("신고"); assertThat(responseDetail.getNickname()).isEqualTo("test1"); - - RequestDetail requestDetail2 = RequestDetail - .builder() - .staticDataType(StaticDataType.COMMENT) - .contentId(c.getId()) - .build(); - - - ResponseDetail responseDetail2 = contentSearchRepository.getDetail(requestDetail2); + ResponseDetail responseDetail2 = contentSearchRepository.getDetail(c.getId(),StaticDataType.COMMENT); assertThat(responseDetail2.getReportCount()).isEqualTo(1); assertThat(responseDetail2.getRecommendCount()).isEqualTo(0); @@ -280,24 +266,14 @@ void createAdminChangeLogAndAdminMemoTest() { @Test void getReportList() { - RequestReportList requestReportList = RequestReportList - .builder() - .staticDataType(StaticDataType.COMMENT) - .contentId(c.getId()) - .offset(1) - .build(); - List responseReportLists = contentSearchRepository.getReportList(requestReportList).getContent(); + List responseReportLists = contentSearchRepository + .getReportList(c.getId(),StaticDataType.COMMENT,1).getContent(); assertThat(responseReportLists.get(0).getReportType()).isEqualTo("정치"); assertThat(responseReportLists.get(0).getNickName()).isEqualTo("test1"); - RequestReportList requestReportList2 = RequestReportList - .builder() - .staticDataType(StaticDataType.BOARD) - .contentId(b.getId()) - .offset(1) - .build(); - List responseReportLists2 = contentSearchRepository.getReportList(requestReportList2).getContent(); + List responseReportLists2 = contentSearchRepository + .getReportList(b.getId(),StaticDataType.BOARD,1).getContent(); assertThat(responseReportLists2.get(0).getReportType()).isEqualTo("풍기위반"); assertThat(responseReportLists2.get(0).getNickName()).isEqualTo("test1"); @@ -306,47 +282,25 @@ void getReportList() { @Test void missingArgsTest() throws Exception { - String staticError = """ - { - "contentId":"1" - } - """; - - String offSet = """ - { - - } - """; - String reportList = """ - { - - - } - """; + accessToken = jwtProvider.generateToken(TOKEN_CATEGORY_ACCESS, Duration.ofDays(1), admin.getPublicId(), admin.getRole().name(), admin.getStatus().name()); - mockMvc.perform(post("/api/admin/content/detail") - .contentType(MediaType.APPLICATION_JSON) - .content(staticError) + mockMvc.perform(get("/api/admin/content/detail?contentId=1") .header("Authorization", "Bearer " + accessToken)) .andDo(print()) .andExpect(status().isBadRequest()); - mockMvc.perform(post("/api/admin/content/detail") - .contentType(MediaType.APPLICATION_JSON) - .content(offSet) + mockMvc.perform(get("/api/admin/content/detail") .header("Authorization", "Bearer " + accessToken)) .andDo(print()) .andExpect(status().isBadRequest()); - mockMvc.perform(post("/api/admin/content/reportList") - .contentType(MediaType.APPLICATION_JSON) - .content(reportList) + mockMvc.perform(get("/api/admin/content/reportList?contentId=1&staticDateType=COMMENT") .header("Authorization", "Bearer " + accessToken)) .andDo(print()) .andExpect(status().isBadRequest()); diff --git a/src/test/java/org/myteam/server/admin/AdminReadCheckTest.java b/src/test/java/org/myteam/server/admin/AdminReadCheckTest.java index c69d4cc2..782fc03d 100644 --- a/src/test/java/org/myteam/server/admin/AdminReadCheckTest.java +++ b/src/test/java/org/myteam/server/admin/AdminReadCheckTest.java @@ -3,12 +3,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.myteam.server.admin.dto.request.ImproveRequestDto.RequestImprovementDetail; import org.myteam.server.admin.repository.AdminDashBoardRepository; import org.myteam.server.admin.service.AdminImprovementService; import org.myteam.server.admin.service.AdminInquiryService; import org.myteam.server.admin.service.ContentSearchService; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.board.domain.Board; import org.myteam.server.board.domain.CategoryType; import org.myteam.server.chat.block.domain.BanReason; @@ -25,8 +24,6 @@ import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import static org.myteam.server.admin.dto.request.ContentRequestDto.*; -import static org.myteam.server.admin.dto.request.InquiryRequestDto.*; import static org.myteam.server.admin.dto.response.AdminDashBoardResponseDto.*; public class AdminReadCheckTest extends IntegrationTestSupport { @@ -110,14 +107,7 @@ void testRead(){ @Test void testContentReadDetail(){ - RequestDetail requestDetail=RequestDetail - .builder() - .alarmCheck("zczx") - .contentId(board.getId()) - .staticDataType(StaticDataType.BOARD) - .reportId(report.getId()) - .build(); - contentSearchService.getContentDetail(requestDetail); + contentSearchService.getContentDetail(board.getId(),StaticDataType.BOARD,report.getId(),"zz"); verify(redisService).adminReadCheckUpdate(any(String.class),any(StaticDataType.class), any(Long.class)); } @@ -127,28 +117,9 @@ void testContentReadDetail(){ @Test void testContentReadDetail2(){ - RequestDetail requestDetail=RequestDetail - .builder() - .alarmCheck("zczx") - .contentId(board.getId()) - .staticDataType(StaticDataType.BOARD) - .build(); - contentSearchService.getContentDetail(requestDetail); - RequestDetail requestDetail2=RequestDetail - .builder() - .contentId(board.getId()) - .reportId(report.getId()) - .staticDataType(StaticDataType.BOARD) - .build(); - contentSearchService.getContentDetail(requestDetail2); - RequestDetail requestDetail3=RequestDetail - .builder() - .contentId(board.getId()) - .staticDataType(StaticDataType.BOARD) - .build(); - contentSearchService.getContentDetail(requestDetail3); - - + contentSearchService.getContentDetail(board.getId(),StaticDataType.BOARD,null,"zcxzc"); + contentSearchService.getContentDetail(board.getId(),StaticDataType.BOARD, report.getId(),null); + contentSearchService.getContentDetail(board.getId(),StaticDataType.BOARD,null,null); verify(redisService,never()).adminReadCheckUpdate(any(String.class),any(StaticDataType.class), any(Long.class)); } @@ -156,12 +127,7 @@ void testContentReadDetail2(){ @DisplayName("detail 서비스로 접근시에 adminreadcheckupdate가 호출이되는가") @Test void testInquiryReadDetail(){ - RequestInquiryDetail requestInquiryDetail=RequestInquiryDetail - .builder() - .alarmCheck("dsfdsf") - .id(inquiry.getId()) - .build(); - adminInquiryService.getInquiryDetail(requestInquiryDetail); + adminInquiryService.getInquiryDetail(inquiry.getId(),"Dfdsf"); verify(redisService).adminReadCheckUpdate(any(String.class),any(StaticDataType.class), any(Long.class)); @@ -169,13 +135,7 @@ void testInquiryReadDetail(){ @DisplayName("detail 서비스로 접근시에 adminreadcheckupdate가 호출이되는가") @Test void testImprovementReadDetail(){ - RequestImprovementDetail requestImprovementDetail= - RequestImprovementDetail - .builder() - .alarmCheck("check") - .contentId(improvement.getId()) - .build(); - adminImprovementService.getImproveDetail(requestImprovementDetail); + adminImprovementService.getImproveDetail(improvement.getId(),"check"); verify(redisService).adminReadCheckUpdate(any(String.class),any(StaticDataType.class), any(Long.class)); @@ -183,16 +143,8 @@ void testImprovementReadDetail(){ @DisplayName("detail 서비스로 접근시에 adminreadcheckupdate가 호출이 안되는가") @Test void testNotReadDetail(){ - RequestImprovementDetail requestImprovementDetail= RequestImprovementDetail - .builder() - .contentId(improvement.getId()) - .build(); - adminImprovementService.getImproveDetail(requestImprovementDetail); - RequestInquiryDetail requestInquiryDetail=RequestInquiryDetail - .builder() - .id(inquiry.getId()) - .build(); - adminInquiryService.getInquiryDetail(requestInquiryDetail); + adminImprovementService.getImproveDetail(improvement.getId(),null); + adminInquiryService.getInquiryDetail(inquiry.getId(),null); verify(redisService,never()).adminReadCheckUpdate(any(String.class),any(StaticDataType.class), any(Long.class)); } diff --git a/src/test/java/org/myteam/server/admin/inquriyimprovementtest.java b/src/test/java/org/myteam/server/admin/inquriyimprovementtest.java index e2a978f0..03a5ad04 100644 --- a/src/test/java/org/myteam/server/admin/inquriyimprovementtest.java +++ b/src/test/java/org/myteam/server/admin/inquriyimprovementtest.java @@ -5,11 +5,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.myteam.server.admin.entity.AdminContentMemo; import org.myteam.server.admin.entity.AdminImproveChangeLog; import org.myteam.server.admin.entity.AdminInquiryChangeLog; -import org.myteam.server.admin.entity.AdminMemberMemo; import org.myteam.server.admin.repository.AdminImprovementSearchRepo; import org.myteam.server.admin.repository.InquirySearchRepo; import org.myteam.server.admin.service.AdminInquiryService; @@ -25,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.boot.test.mock.mockito.MockBeans; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -113,18 +110,10 @@ void getImproveInquriyList() { @Test void getdetailandmemo() { - RequestImprovementDetail requestImprovementDetail = RequestImprovementDetail - .builder() - .contentId(improvement1.getId()) - .build(); - RequestInquiryDetail requestInquiryDetail = RequestInquiryDetail - .builder() - .id(inquiry1.getId()) - .build(); ResponseImprovementDetail responseImprovementDetail = - adminImprovementSearchRepo.getImprovementDetail(requestImprovementDetail); + adminImprovementSearchRepo.getImprovementDetail(improvement1.getId()); ResponseInquiryDetail responseInquiryDetail = - inquirySearchRepo.getInquiryDetail(requestInquiryDetail); + inquirySearchRepo.getInquiryDetail(inquiry1.getId()); assertThat(responseImprovementDetail.getAdminMemoResponseList().size()).isEqualTo(0); assertThat(responseInquiryDetail.getAdminMemoResponseList().size()).isEqualTo(0); assertThat(responseImprovementDetail.getImprovementStatus()).isEqualTo("대기"); @@ -149,9 +138,9 @@ void getdetailandmemo() { .build(); inquirySearchRepo.createAdminMemo(adminMemoInquiryRequest); responseImprovementDetail = - adminImprovementSearchRepo.getImprovementDetail(requestImprovementDetail); + adminImprovementSearchRepo.getImprovementDetail(improvement1.getId()); responseInquiryDetail = - inquirySearchRepo.getInquiryDetail(requestInquiryDetail); + inquirySearchRepo.getInquiryDetail(inquiry1.getId()); assertThat(responseImprovementDetail.getAdminMemoResponseList().size()).isEqualTo(0); assertThat(responseInquiryDetail.getAdminMemoResponseList().size()).isEqualTo(1); assertThat(responseImprovementDetail.getImprovementStatus()).isEqualTo("완료"); diff --git a/src/test/java/org/myteam/server/admin/repository/DashBoardRepoTest.java b/src/test/java/org/myteam/server/admin/repository/DashBoardRepoTest.java index 6fea04ff..d7555d8e 100644 --- a/src/test/java/org/myteam/server/admin/repository/DashBoardRepoTest.java +++ b/src/test/java/org/myteam/server/admin/repository/DashBoardRepoTest.java @@ -11,9 +11,10 @@ import org.myteam.server.admin.entity.AdminInquiryChangeLog; import org.myteam.server.admin.entity.AdminMemberChangeLog; import org.myteam.server.admin.service.AdminDashBoardService; -import org.myteam.server.admin.utill.AdminControlType; -import org.myteam.server.admin.utill.DateType; -import org.myteam.server.admin.utill.StaticDataType; +import org.myteam.server.admin.utill.enums.AdminControlType; +import org.myteam.server.admin.utill.enums.AdminDashBoardType; +import org.myteam.server.admin.utill.enums.DateType; +import org.myteam.server.admin.utill.enums.StaticDataType; import org.myteam.server.board.domain.Board; import org.myteam.server.board.domain.CategoryType; import org.myteam.server.chat.block.domain.BanReason; @@ -214,7 +215,7 @@ void createDate() { @DisplayName("문의 개선 건의사항 세부 통계테스트") void testGetInquiryImprovementTest(){ - List responseStatics=adminDashBoardService.getStaticData(StaticDataType.Inquiry,DateType.Day); + List responseStatics=adminDashBoardService.getStaticData(AdminDashBoardType.InquiryBoard,DateType.Day); assertThat(responseStatics.size()).isEqualTo(5); @@ -245,7 +246,7 @@ void testGetInquiryImprovementTest(){ assertThat(responseStatics.get(4).getPercent()).isEqualTo(100); - List responseImproves=adminDashBoardService.getStaticData(StaticDataType.Improvement,DateType.Day); + List responseImproves=adminDashBoardService.getStaticData(AdminDashBoardType.ImprovementBoard,DateType.Day); assertThat(responseImproves.size()).isEqualTo(4); @@ -278,9 +279,9 @@ void testGetDataByDay() { LocalDateTime now = LocalDateTime.now(); - List responseStaticsDashBoard=adminDashBoardService.getStaticData(StaticDataType.DashBoard,DateType.Day); - List responseStaticsMemberBoard=adminDashBoardService.getStaticData(StaticDataType.MemberBoard,DateType.Day); - List responseStaticsContentBoard=adminDashBoardService.getStaticData(StaticDataType.ContentBoard,DateType.Day); + List responseStaticsDashBoard=adminDashBoardService.getStaticData(AdminDashBoardType.DashBoard,DateType.Day); + List responseStaticsMemberBoard=adminDashBoardService.getStaticData(AdminDashBoardType.MemberBoard,DateType.Day); + List responseStaticsContentBoard=adminDashBoardService.getStaticData(AdminDashBoardType.ContentBoard,DateType.Day); assertThat(responseStaticsDashBoard.size()).isEqualTo(8); diff --git a/src/test/java/org/myteam/server/report/service/ReportCreateSuccessTest.java b/src/test/java/org/myteam/server/report/service/ReportCreateSuccessTest.java index 9845882a..b60243b4 100644 --- a/src/test/java/org/myteam/server/report/service/ReportCreateSuccessTest.java +++ b/src/test/java/org/myteam/server/report/service/ReportCreateSuccessTest.java @@ -5,13 +5,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.myteam.server.admin.entity.AdminContentChangeLog; -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.BoardCount; -import org.myteam.server.member.domain.MemberRole; -import org.myteam.server.member.domain.MemberStatus; -import org.myteam.server.member.domain.MemberType; -import org.myteam.server.member.service.MemberReadService; import org.myteam.server.support.IntegrationTestSupport; import org.myteam.server.board.domain.Board; import org.myteam.server.board.domain.CategoryType; @@ -28,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy;