Merge pull request #75 from DONGA-ST-A/refactor/74-notice-detail

[Refactor] 공지사항 상세 페이지 내용과 파일 응답 수정
DONGA-ST-A · Sep 16, 2023 · 93bd23d · 93bd23d
2 parents 538fa93 + 1992c82
commit 93bd23d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/com/teamA/hicardi/domain/notice/dto/response/NoticeGetResponseDto.java b/src/main/java/com/teamA/hicardi/domain/notice/dto/response/NoticeGetResponseDto.java
@@ -4,9 +4,9 @@
 
 import com.teamA.hicardi.domain.notice.entity.Notice;
 
-public record NoticeGetResponseDto(Long id, String category, String title, String content, String file, Boolean isTop, LocalDate createdDate) {
+public record NoticeGetResponseDto(Long id, String category, String title, String content, String file, Boolean isTop, LocalDate createdDate, int views) {
 
 	public static NoticeGetResponseDto from(Notice notice) {
-		return new NoticeGetResponseDto(notice.getId(), notice.getCategory().getDesc(), notice.getTitle(), notice.getContent(), notice.getFile(), notice.getIsTop(), notice.getCreatedDate().toLocalDate());
+		return new NoticeGetResponseDto(notice.getId(), notice.getCategory().getDesc(), notice.getTitle(), notice.getContent(), notice.getFile(), notice.getIsTop(), notice.getCreatedDate().toLocalDate(), notice.getViews());
 	}
 }
diff --git a/src/main/java/com/teamA/hicardi/domain/notice/entity/Notice.java b/src/main/java/com/teamA/hicardi/domain/notice/entity/Notice.java
@@ -29,4 +29,7 @@ public class Notice extends BaseTimeEntity {
     @Enumerated(EnumType.STRING)
     private NoticeCategory category;
 
+    @Column(columnDefinition = "Integer default 1")
+    private int views;
+
 }
diff --git a/src/main/java/com/teamA/hicardi/domain/notice/repository/NoticeRepository.java b/src/main/java/com/teamA/hicardi/domain/notice/repository/NoticeRepository.java
@@ -3,6 +3,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import com.teamA.hicardi.domain.notice.entity.Notice;
 import com.teamA.hicardi.domain.notice.entity.NoticeCategory;
@@ -27,4 +28,7 @@ public interface NoticeRepository extends JpaRepository<Notice, Long> {
 	@Query("SELECT n FROM Notice n WHERE n.id > :noticeId ORDER BY n.id LIMIT 1")
 	Notice findNextNotice(@Param("noticeId") Long noticeId);
 
+	@Modifying
+	@Query("update Notice n set n.views = n.views + 1 where n.id = :noticeId")
+	void updateView(@Param("noticeId") Long noticeId);
 }
diff --git a/src/main/java/com/teamA/hicardi/domain/notice/service/NoticeService.java b/src/main/java/com/teamA/hicardi/domain/notice/service/NoticeService.java
@@ -48,6 +48,8 @@ public List<NoticeGetResponseDto> getNotice(Long noticeId) {
 		Notice notice = noticeRepository.findById(noticeId)
 			.orElseThrow(() -> new BusinessException(ErrorCode.NOTICE_NOT_FOUND));
 
+		noticeRepository.updateView(noticeId);
+
 		Notice previousNotice = noticeRepository.findPreviousNotice(noticeId);
 
 		Notice nextNotice = noticeRepository.findNextNotice(noticeId);

diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
@@ -54,7 +54,7 @@ INSERT INTO Notice(id, title, content, istop, file, category, createdDate, modif
 INSERT INTO Notice(id, title, content, istop, file, category, createdDate, modifiedDate) VALUES(3, '의정부 튼튼어린이병원, 심질환 환아 감시 하이카디플러스 도입', '내용', 0, null, 'NEWS', '2023-08-20', '2023-08-20');
 INSERT INTO Notice(id, title, content, istop, file, category, createdDate, modifiedDate) VALUES(4, '[2023.09.17 마감] 하이카디 체험단 모집', '내용', 1, '첨부파일', 'NECESSARY', '2023-09-08', '2023-09-08');
 INSERT INTO Notice(id, title, content, istop, file, category, createdDate, modifiedDate) VALUES(5, '하이카디 갤럭시A13 연동 방법', '내용', 0, '첨부파일', 'DATA', '2023-09-08', '2023-09-08');
-INSERT INTO Notice(id, title, content, istop, file, category, createdDate, modifiedDate) VALUES(6, '[2023.09.15 마감] 하이카디플러스 소개 및 설명회 참여 인원 모집', '내용', 1, 'https://hicardi.s3.ap-northeast-2.amazonaws.com/notice1.svg', 'NECESSARY', '2023-09-09', '2023-09-09');
+INSERT INTO Notice(id, title, content, istop, file, category, createdDate, modifiedDate) VALUES(6, '[2023.09.15 마감] 하이카디플러스 소개 및 설명회 참여 인원 모집', 'https://hicardi.s3.ap-northeast-2.amazonaws.com/notice1.svg' , 1, 'hicardi_seminar.jpg(1.8MB)', 'NECESSARY', '2023-09-09', '2023-09-09');
 INSERT INTO Notice(id, title, content, istop, file, category, createdDate, modifiedDate) VALUES(7, '하이카디 패치 사용법', '내용', 0, '첨부파일', 'DATA', '2023-09-09', '2023-09-09');
 INSERT INTO Notice(id, title, content, istop, file, category, createdDate, modifiedDate) VALUES(8, '하이카디 갤럭시A13 연동 방법', '내용', 0, '첨부파일', 'DATA', '2023-09-09', '2023-09-09');
 INSERT INTO Notice(id, title, content, istop, file, category, createdDate, modifiedDate) VALUES(9, '하이카디 패치 사용법', '내용', 0, '첨부파일', 'DATA', '2023-09-10', '2023-09-10');