From 13c9b276a163375fd4d9addcec8ad7ed3898899b Mon Sep 17 00:00:00 2001 From: Sejin Park <95167215+sejineer@users.noreply.github.com> Date: Sat, 11 May 2024 14:28:37 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20OFF-CAMPUS=20=EA=B3=B5=EA=B3=A0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20AI=EB=B6=84=EC=84=9D,=20=EB=AC=B8=EC=9D=98?= =?UTF-8?q?=EC=B2=98=20=EC=97=AC=EB=B6=80=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 교내, 교외, 창업제도 로드맵 리스트 API 구현 * feat: 교내, 교외, 창업제도 로드맵 리스트 조회 API 구현 * feat: 창업 강의 로드맵 추가 API 구현 * feat: 로드맵의 창업 강의 리스트 조회 API 구현 * feat: 창업 제도 리스트 API 구현 * feat: 교내 공고 리스트 조회 API 구현 * feat: 교내 창업 제도 공고 리스트 조회 API 구현 * feat: 교내 창업 강의 리스트 조회 API 구현 * feat: OFF-CAMPUS 공고 AI분석여부, 문의처존재 여부 Response 컬럼 추가 --- .../repository/AnnouncementQuerydslRepositoryImpl.java | 8 ++++++-- .../domain/announcement/dto/AnnouncementRes.java | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/startingblock/domain/announcement/domain/repository/AnnouncementQuerydslRepositoryImpl.java b/src/main/java/com/startingblock/domain/announcement/domain/repository/AnnouncementQuerydslRepositoryImpl.java index e3fbb97..d5e1ef2 100644 --- a/src/main/java/com/startingblock/domain/announcement/domain/repository/AnnouncementQuerydslRepositoryImpl.java +++ b/src/main/java/com/startingblock/domain/announcement/domain/repository/AnnouncementQuerydslRepositoryImpl.java @@ -53,7 +53,9 @@ public List findThreeRandomAnnouncement(final Long userId) { announcement.title, Expressions.stringTemplate("COALESCE({0}, {1})", announcement.startDate.stringValue(), announcement.nonDate), Expressions.stringTemplate("COALESCE({0}, {1})", announcement.endDate.stringValue(), announcement.nonDate), - roadmapAnnouncement.announcement.id.isNotNull() + roadmapAnnouncement.announcement.id.isNotNull(), + announcement.contact.isNotNull(), + announcement.isFileUploaded )) .from(announcement) .leftJoin(roadmapAnnouncement).on(announcement.id.eq(roadmapAnnouncement.announcement.id).and(roadmapAnnouncement.roadmap.user.id.eq(userId))) @@ -109,7 +111,9 @@ public Slice findAnnouncements(final Long userId, final Pageabl announcement.title, Expressions.stringTemplate("COALESCE({0}, {1})", announcement.startDate.stringValue(), announcement.nonDate), Expressions.stringTemplate("COALESCE({0}, {1})", announcement.endDate.stringValue(), announcement.nonDate), - roadmapAnnouncement.announcement.id.isNotNull() + roadmapAnnouncement.announcement.id.isNotNull(), + announcement.contact.isNotNull(), + announcement.isFileUploaded ) ) .from(announcement) diff --git a/src/main/java/com/startingblock/domain/announcement/dto/AnnouncementRes.java b/src/main/java/com/startingblock/domain/announcement/dto/AnnouncementRes.java index 38312b0..854d639 100644 --- a/src/main/java/com/startingblock/domain/announcement/dto/AnnouncementRes.java +++ b/src/main/java/com/startingblock/domain/announcement/dto/AnnouncementRes.java @@ -14,15 +14,19 @@ public class AnnouncementRes { private String startDate; private String endDate; private Boolean isBookmarked; + private Boolean isContactExist; + private Boolean isFileUploaded; @QueryProjection - public AnnouncementRes(Long announcementId, String departmentName, String title, String startDate, String endDate, Boolean isBookmarked) { + public AnnouncementRes(Long announcementId, String departmentName, String title, String startDate, String endDate, Boolean isBookmarked, Boolean isContactExist, Boolean isFileUploaded) { this.announcementId = announcementId; this.departmentName = departmentName; this.title = title; this.startDate = startDate; this.endDate = endDate; this.isBookmarked = isBookmarked; + this.isContactExist = isContactExist; + this.isFileUploaded = isFileUploaded; } }