Merge pull request #334 from MT-TEAM-Org/epic/fixTimeExpression

dong3058 · web-flow · commit af0788e124d9 · 2025-07-23T23:25:51.000+09:00
epic: 단순 시간표기 수정 및 swaager 수정
diff --git a/src/main/java/org/myteam/server/admin/dto/AdminDashBoardResponseDto.java b/src/main/java/org/myteam/server/admin/dto/AdminDashBoardResponseDto.java
@@ -5,7 +5,6 @@
 import lombok.Getter;
 import org.myteam.server.admin.utill.StaticDataType;
 
-import java.time.LocalDateTime;
 import java.util.Map;
 
 public record AdminDashBoardResponseDto() {
@@ -14,11 +13,13 @@ public record AdminDashBoardResponseDto() {
     @Builder
     public static class ResponseStatic {
 
-        @Schema(description = "기간에 따른 데이터의 양을 보여줍니다. 2025.02.06 : 1 이런꼴입니다.")
+        @Schema(description = "기간에 따른 데이터의 양을 보여줍니다.",
+                example = "{2025.02.06 : 1}")
         private Map<String, Long> currentStaticData;
         private Long currentCount;
         private Long pastCount;
         private Long totCount;
+        @Schema(examples = "-100,100")
         private int percent;
 
     }
@@ -36,11 +37,14 @@ public static class ResponseLatestData {
         private Long contentId;
         private String name;
         private String content;
-        private LocalDateTime createAt;
+        @Schema(example = "2025.06.06")
+        private String createAt;
         @Schema(description = "이값이 true이면 이미 읽은것,아니면은 읽지않은것입니다.")
         private boolean checkRead;
 
-        public ResponseLatestData(String reportType, StaticDataType staticDataType, String mainStatus, String subStatus, Long contentId, String name, String content, LocalDateTime createAt) {
+        public ResponseLatestData(String reportType, StaticDataType staticDataType,
+                                  String mainStatus, String subStatus, Long contentId,
+                                  String name, String content, String createAt) {
             this.reportType = reportType;
             this.staticDataType = staticDataType;
             this.mainStatus = mainStatus;
@@ -51,6 +55,10 @@ public ResponseLatestData(String reportType, StaticDataType staticDataType, Stri
             this.createAt = createAt;
         }
 
+        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/RequestContentDto.java b/src/main/java/org/myteam/server/admin/dto/RequestContentDto.java
@@ -23,7 +23,9 @@ public static class RequestContentData {
         private StaticDataType staticDataType;
         private Boolean isReported;
         private AdminControlType adminControlType;
+        @Schema(example = "2025.06.06")
         private String startTime;
+        @Schema(example = "2025.06.06")
         private String endTime;
         @NotNull
         private int offset;
diff --git a/src/main/java/org/myteam/server/admin/dto/ResponseContentDto.java b/src/main/java/org/myteam/server/admin/dto/ResponseContentDto.java
@@ -1,5 +1,6 @@
 package org.myteam.server.admin.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.util.List;
@@ -12,10 +13,12 @@ public static class ResponseContentSearch {
         private String nickName;
         private String staticDataType;
         private String content;
+        @Schema(example = "2025.06.06")
         private String createDate;
         private String memberStatus;
         private String adminControlType;
         private Long reportCount;
+        @Schema(description = "신고 됐다면 신고 신고가 없다면 미신고로 표시")
         private String reported;
 
         public void updateCountReported(Long count, String reported) {
@@ -43,6 +46,7 @@ public static class ResponseDetail {
         private String reported;
         private Long reportCount;
         private Integer recommendCount;
+        @Schema(example = "2025.06.06/16:30")
         private String createDate;
         private String memberStatus;
         private String nickname;
@@ -87,6 +91,7 @@ public static class ResponseReportList {
         private String nickName;
         private String reportType;
         private String content;
+        @Schema(example = "2025.06.06")
         private String createDate;
 
         @Builder
@@ -107,6 +112,7 @@ public void updateCreateDate(String date) {
     @Getter
     public static class AdminMemoResponse {
         private String writerName;
+        @Schema(example = "2025.06.06")
         private String createDate;
         private String content;
 
diff --git a/src/main/java/org/myteam/server/admin/entity/AdminChangeLog.java b/src/main/java/org/myteam/server/admin/entity/AdminChangeLog.java
@@ -23,7 +23,7 @@ public class AdminChangeLog extends BaseTime {
     private Long id;
     @ManyToOne(fetch = FetchType.LAZY)
     private Member admin;
-    private UUID publicId;
+    private UUID memberId;
     private Long contentId;
     @Enumerated(EnumType.STRING)
     private MemberStatus memberStatus;
@@ -34,12 +34,12 @@ public class AdminChangeLog extends BaseTime {
 
     @Builder
     public AdminChangeLog(MemberStatus memberStatus, StaticDataType staticDataType
-            , AdminControlType adminControlType, Member admin, UUID publicId, Long contentId) {
+            , AdminControlType adminControlType, Member admin, UUID memberId, Long contentId) {
         this.memberStatus = memberStatus;
         this.staticDataType = staticDataType;
         this.adminControlType = adminControlType;
         this.admin = admin;
-        this.publicId = publicId;
+        this.memberId = memberId;
         this.contentId = contentId;
     }
 }
diff --git a/src/main/java/org/myteam/server/admin/repository/AdminDashBoardRepository.java b/src/main/java/org/myteam/server/admin/repository/AdminDashBoardRepository.java
@@ -12,6 +12,7 @@
 import org.myteam.server.chat.block.domain.BanReason;
 import org.myteam.server.global.exception.ErrorCode;
 import org.myteam.server.global.exception.PlayHiveException;
+import org.myteam.server.global.util.date.DateFormatUtil;
 import org.myteam.server.global.util.redis.service.RedisService;
 import org.myteam.server.improvement.domain.ImprovementStatus;
 import org.myteam.server.member.domain.MemberStatus;
@@ -352,7 +353,7 @@ public List<ResponseLatestData> getLatestData(RequestLatestData requestLatestDat
                                             .otherwise(JPAExpressions.select(board.title)
                                                     .from(board)
                                                     .where(board.id.eq(report.reportedContentId))),
-                                    report.createDate
+                                    report.createDate.stringValue()
                             ))
                     .from(report)
                     .join(member)
@@ -367,6 +368,9 @@ public List<ResponseLatestData> getLatestData(RequestLatestData requestLatestDat
                         boolean readCheck = redisService.AdminReadCheck("ADMIN_ALARM", admin.getPublicId().toString()
                                 , x.getStaticDataType(), 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("노출");
@@ -404,7 +408,7 @@ public List<ResponseLatestData> getLatestData(RequestLatestData requestLatestDat
                                             .then(member.email)
                                             .otherwise(member.nickname),
                                     inquiry.content.substring(0, 20),
-                                    inquiry.createdAt
+                                    inquiry.createdAt.stringValue()
                             ))
                     .from(inquiry)
                     .join(member)
@@ -415,6 +419,11 @@ public List<ResponseLatestData> getLatestData(RequestLatestData requestLatestDat
                     .fetch();
             responseLatestDataList.stream()
                     .forEach(x -> {
+
+                        x.updateCreateAt(
+                                DateFormatUtil.formatByDot.format(
+                                        LocalDateTime.parse(x.getCreateAt(), DateFormatUtil.FLEXIBLE_NANO_FORMATTER)));
+
                         boolean readCheck = redisService.AdminReadCheck("ADMIN_ALARM", admin.getPublicId().toString()
                                 , x.getStaticDataType(), x.getContentId());
                         x.mappingCheckRead(readCheck);
@@ -440,7 +449,7 @@ public List<ResponseLatestData> getLatestData(RequestLatestData requestLatestDat
                                     improvement.id,
                                     member.nickname,
                                     improvement.content,
-                                    improvement.createDate
+                                    improvement.createDate.stringValue()
 
                             ))
                     .from(improvement)
@@ -454,6 +463,9 @@ public List<ResponseLatestData> getLatestData(RequestLatestData requestLatestDat
 
             responseLatestDataList.stream()
                     .forEach(x -> {
+                        x.updateCreateAt(
+                                DateFormatUtil.formatByDot.format(
+                                        LocalDateTime.parse(x.getCreateAt(), DateFormatUtil.FLEXIBLE_NANO_FORMATTER)));
                         boolean readCheck = redisService.AdminReadCheck("ADMIN_ALARM", admin.getPublicId().toString()
                                 , x.getStaticDataType(), x.getContentId());
                         x.mappingCheckRead(readCheck);
diff --git a/src/test/java/org/myteam/server/admin/repository/DashBoardRepoTest.java b/src/test/java/org/myteam/server/admin/repository/DashBoardRepoTest.java
@@ -126,7 +126,7 @@ void createDate() {
                         AdminChangeLog adminChangeLog = AdminChangeLog
                                 .builder()
                                 .admin(admin)
-                                .publicId(member.getPublicId())
+                                .memberId(member.getPublicId())
                                 .memberStatus(MemberStatus.PENDING)
                                 .build();
 
@@ -148,7 +148,7 @@ void createDate() {
                         AdminChangeLog adminChangeLog = AdminChangeLog
                                 .builder()
                                 .admin(admin)
-                                .publicId(member.getPublicId())
+                                .memberId(member.getPublicId())
                                 .memberStatus(MemberStatus.INACTIVE)
                                 .build();
 
