From a379f76b81f603e60764132e1176d23cdb23cbb9 Mon Sep 17 00:00:00 2001 From: whitemark Date: Mon, 17 Jun 2024 17:56:32 +0900 Subject: [PATCH] =?UTF-8?q?[feature/#308]=20=EC=9E=A5=ED=95=99=ED=9A=8C=20?= =?UTF-8?q?dto=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inhabas/api/domain/menu/domain/valueObject/MenuType.java | 4 ++-- .../inhabas/api/domain/scholarship/domain/Scholarship.java | 4 ++-- .../scholarship/usecase/ScholarshipBoardServiceImpl.java | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuType.java b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuType.java index 7f3c0ac7..462086a7 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuType.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/menu/domain/valueObject/MenuType.java @@ -45,9 +45,9 @@ public enum MenuType { // 베타테스터 BETA(DEACTIVATED, BASIC, DEACTIVATED, DEACTIVATED, DEACTIVATED), // 공모전 - CONTEST(ANONYMOUS, BASIC, ANONYMOUS, DEACTIVATED, BASIC), + CONTEST(ANONYMOUS, BASIC, ANONYMOUS, DEACTIVATED, ANONYMOUS), // 대외활동 - ACTIVITY(ANONYMOUS, BASIC, ANONYMOUS, DEACTIVATED, BASIC), + ACTIVITY(ANONYMOUS, BASIC, ANONYMOUS, DEACTIVATED, ANONYMOUS), // 장학회 SCHOLARSHIP(ANONYMOUS, SECRETARY, ANONYMOUS, ADMIN, ADMIN), // 후원 내용 diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java index 0413f19d..d3956cdd 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/domain/Scholarship.java @@ -15,6 +15,7 @@ import javax.persistence.Table; import lombok.AccessLevel; +import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -25,6 +26,7 @@ import com.inhabas.api.domain.file.domain.BoardFile; import com.inhabas.api.domain.menu.domain.Menu; +@Getter @Entity @Table(name = "SCHOLARSHIP_BOARD") @NoArgsConstructor(access = AccessLevel.PROTECTED) @@ -39,7 +41,6 @@ public class Scholarship extends BaseBoard { private LocalDateTime dateHistory; /* constructor */ - public Scholarship(String title, Menu menu, String content, LocalDateTime dateHistory) { super(title, menu); this.content = new Content(content); @@ -47,7 +48,6 @@ public Scholarship(String title, Menu menu, String content, LocalDateTime dateHi } /* getter */ - public String getContent() { return content.getValue(); } diff --git a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/usecase/ScholarshipBoardServiceImpl.java b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/usecase/ScholarshipBoardServiceImpl.java index b868a4d0..9ea6bcb1 100644 --- a/resource-server/src/main/java/com/inhabas/api/domain/scholarship/usecase/ScholarshipBoardServiceImpl.java +++ b/resource-server/src/main/java/com/inhabas/api/domain/scholarship/usecase/ScholarshipBoardServiceImpl.java @@ -62,6 +62,7 @@ public ScholarshipBoardDetailDto getPost(ScholarshipBoardType boardType, Long bo .title(scholarship.getTitle()) .content(scholarship.getContent()) .writer(scholarship.getWriter()) + .dateHistory(scholarship.getDateHistory()) .dateCreated(scholarship.getDateCreated()) .dateUpdated(scholarship.getDateUpdated()) .images(classifiedFiles.getImages())