Skip to content

Commit eb9c7a6

Browse files
authored
Merge pull request #121 from KB-Hackerton/feature/49
Home 기사 url 추가
2 parents 0539894 + 06cd1e9 commit eb9c7a6

6 files changed

Lines changed: 24 additions & 3 deletions

File tree

src/main/java/kb_hack/backend/domain/home/dto/request/RecentArticleDTO.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616
public class RecentArticleDTO {
1717
private String title;
1818
private Long articleId;
19+
private String articleUrl;
1920
}

src/main/java/kb_hack/backend/domain/home/dto/response/HomeResponse.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import kb_hack.backend.domain.home.dto.request.RecentAnnounceDTO;
88
import kb_hack.backend.domain.home.dto.request.RecentArticleDTO;
99
import kb_hack.backend.domain.home.dto.request.RecentFestivalDTO;
10+
import kb_hack.backend.domain.notice.dto.response.NoticeDTO;
1011
import lombok.AllArgsConstructor;
1112
import lombok.Data;
1213

@@ -22,4 +23,5 @@ public class HomeResponse {
2223

2324
List<RecentArticleDTO> recentArticle;
2425
List<RecentViewAnnounceDTO> recentViewAnnounce;
26+
List<NoticeDTO> notice;
2527
}

src/main/java/kb_hack/backend/domain/home/mapper/HomeMapper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import kb_hack.backend.domain.home.dto.request.RecentAnnounceDTO;
44
import kb_hack.backend.domain.home.dto.request.RecentArticleDTO;
55
import kb_hack.backend.domain.home.dto.request.RecentFestivalDTO;
6+
import kb_hack.backend.domain.notice.dto.response.NoticeDTO;
7+
68
import org.apache.ibatis.annotations.Mapper;
79

810
import java.util.List;
@@ -12,5 +14,5 @@ public interface HomeMapper {
1214
List<RecentAnnounceDTO> getRecentAnnounce();
1315
List<RecentFestivalDTO> getRecentFestival();
1416
List<RecentArticleDTO> getRecentArticle();
15-
17+
List<NoticeDTO> getNotice();
1618
}

src/main/java/kb_hack/backend/domain/home/service/HomeService.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import kb_hack.backend.domain.home.dto.request.RecentFestivalDTO;
1010
import kb_hack.backend.domain.home.dto.response.HomeResponse;
1111
import kb_hack.backend.domain.home.mapper.HomeMapper;
12+
import kb_hack.backend.domain.notice.dto.response.NoticeDTO;
1213
import kb_hack.backend.global.common.exception.enums.BadStatusCode;
1314
import kb_hack.backend.global.common.exception.type.ServerErrorException;
1415
import lombok.RequiredArgsConstructor;
@@ -31,6 +32,7 @@ public HomeResponse getHomeData(){
3132
List<RecentFestivalDTO> recentFestival;
3233
List<RecentArticleDTO> recentArticle;
3334
List<AnnounceRankingDTO> announceRanking;
35+
List<NoticeDTO> notice;
3436

3537
try {
3638
recentAnnounce = homeMapper.getRecentAnnounce();
@@ -56,7 +58,13 @@ public HomeResponse getHomeData(){
5658
throw new ServerErrorException(BadStatusCode.FAIL_TO_GET_RECENT_ARTICLE_EXCEPTION);
5759
}
5860

61+
try {
62+
notice = homeMapper.getNotice();
63+
} catch (Exception e) {
64+
throw new ServerErrorException(BadStatusCode.FAIL_TO_GET_RECENT_NOTICE_EXCEPTION);
65+
}
66+
5967
List<RecentViewAnnounceDTO> recentAnnounceList = recentAnnounceService.getRecentAnnounceList();
60-
return new HomeResponse(announceRanking,recentAnnounce,recentFestival,recentArticle,recentAnnounceList);
68+
return new HomeResponse(announceRanking,recentAnnounce,recentFestival,recentArticle,recentAnnounceList,notice);
6169
}
6270
}

src/main/java/kb_hack/backend/global/common/exception/enums/BadStatusCode.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public enum BadStatusCode {
5252
FAIL_TO_GET_RECENT_ANNOUNCE_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR,"최근 공고 불러오기에 실패 했습니다."),
5353
FAIL_TO_GET_RECENT_FESTIVAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR,"최근 축제 불러오기에 실패 했습니다."),
5454
FAIL_TO_GET_RECENT_ARTICLE_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR,"최근 본 공고 불러오기에 실패 했습니다."),
55+
FAIL_TO_GET_RECENT_NOTICE_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "공지사항 불러오기에 실패 했습니다."),
5556
KAKAO_TOKEN_EMPTY(HttpStatus.INTERNAL_SERVER_ERROR,"카카오 토큰 응답이 비어있습니다."),
5657
KAKAO_TOKEN_REQUEST_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 토큰 요청 중 오류가 발생 했습니다"),
5758
KAKAO_USERINFO_EMPTY(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 사용자 정보 응답이 비어있습니다."),

src/main/resources/mapper/HomeMapper.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,18 @@
1919
</select>
2020

2121
<select id="getRecentArticle" resultType="kb_hack.backend.domain.home.dto.request.RecentArticleDTO">
22-
SELECT title, article_id
22+
SELECT title, article_id,article_url
2323
FROM articles
2424
ORDER BY created_at DESC
2525
LIMIT 3
2626
</select>
2727

28+
<select id="getNotice" resultType="kb_hack.backend.domain.notice.dto.response.NoticeDTO">
29+
SELECT notice_id, title
30+
FROM notice
31+
ORDER BY created_at DESC
32+
LIMIT 3
33+
</select>
34+
2835

2936
</mapper>

0 commit comments

Comments
 (0)