From 3044833f19a0c2497290fcbb8276600e5695ed5a Mon Sep 17 00:00:00 2001 From: Willy Date: Fri, 30 Aug 2024 10:58:21 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[=E2=9C=A8feat]=20=ED=99=88=20>=20=EC=98=A4?= =?UTF-8?q?=EB=8A=98=20=EB=A7=88=EA=B0=90=EB=90=98=EB=8A=94=20=EA=B4=80?= =?UTF-8?q?=EC=8B=AC=EA=B3=B5=EA=B3=A0=EC=97=90=EC=84=9C=20=ED=99=88=20>?= =?UTF-8?q?=20=EA=B3=A7=20=EB=A7=88=EA=B0=90=EB=90=98=EB=8A=94=20=EA=B4=80?= =?UTF-8?q?=EC=8B=AC=EA=B3=B5=EA=B3=A0=EB=A1=9C=20=EB=B3=80=EA=B2=BD(Upcom?= =?UTF-8?q?ingScrapResponseDto)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...yScrapResponseDto.java => UpcomingScrapResponseDto.java} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename src/main/java/org/terning/terningserver/dto/user/response/{TodayScrapResponseDto.java => UpcomingScrapResponseDto.java} (89%) diff --git a/src/main/java/org/terning/terningserver/dto/user/response/TodayScrapResponseDto.java b/src/main/java/org/terning/terningserver/dto/user/response/UpcomingScrapResponseDto.java similarity index 89% rename from src/main/java/org/terning/terningserver/dto/user/response/TodayScrapResponseDto.java rename to src/main/java/org/terning/terningserver/dto/user/response/UpcomingScrapResponseDto.java index b734087..6d0e912 100644 --- a/src/main/java/org/terning/terningserver/dto/user/response/TodayScrapResponseDto.java +++ b/src/main/java/org/terning/terningserver/dto/user/response/UpcomingScrapResponseDto.java @@ -5,7 +5,7 @@ import org.terning.terningserver.util.DateUtil; @Builder -public record TodayScrapResponseDto( +public record UpcomingScrapResponseDto( Long internshipAnnouncementId, String companyImage, String dDay, @@ -16,10 +16,10 @@ public record TodayScrapResponseDto( String deadline, String startYearMonth ) { - public static TodayScrapResponseDto of(final Scrap scrap){ + public static UpcomingScrapResponseDto of(final Scrap scrap){ String startYearMonth = scrap.getInternshipAnnouncement().getStartYear() + "년 " + scrap.getInternshipAnnouncement().getStartMonth() + "월"; - return TodayScrapResponseDto.builder() + return UpcomingScrapResponseDto.builder() .internshipAnnouncementId(scrap.getInternshipAnnouncement().getId()) .companyImage(scrap.getInternshipAnnouncement().getCompany().getCompanyImage()) .dDay(DateUtil.convert(scrap.getInternshipAnnouncement().getDeadline())) From 8b2b11b42f07ab0c29194c70fd55b03825d78a11 Mon Sep 17 00:00:00 2001 From: Willy Date: Fri, 30 Aug 2024 10:58:58 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[=E2=9C=A8feat]=20=EB=A1=9C=EC=BB=AC=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84(localhost:8080)=20=EC=97=B0=EA=B2=B0?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20Swagger=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/terning/terningserver/config/SwaggerConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/terning/terningserver/config/SwaggerConfig.java b/src/main/java/org/terning/terningserver/config/SwaggerConfig.java index 4b70023..cc796a4 100644 --- a/src/main/java/org/terning/terningserver/config/SwaggerConfig.java +++ b/src/main/java/org/terning/terningserver/config/SwaggerConfig.java @@ -14,7 +14,8 @@ @OpenAPIDefinition( servers = { @Server(url = "https://www.terning-official.p-e.kr", description = "Default Server url"), - @Server(url = "http://15.165.242.132", description = "Staging Server URL") + @Server(url = "http://15.165.242.132", description = "Staging Server URL"), + @Server(url = "http://localhost:8080", description = "Local Development Server URL") } ) public class SwaggerConfig { From 69a1fb27eb6e528c4a51b996b6c0064b96dc7a56 Mon Sep 17 00:00:00 2001 From: Willy Date: Fri, 30 Aug 2024 10:59:56 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[=E2=9C=A8feat]=20SuccessMessage=20?= =?UTF-8?q?=EC=88=98=EC=A0=95(=EC=98=A4=EB=8A=98=20=EB=A7=88=EA=B0=90?= =?UTF-8?q?=EC=9D=B8=20=EA=B4=80=EC=8B=AC=20=EA=B3=B5=EA=B3=A0=20>=20?= =?UTF-8?q?=EA=B3=A7=20=EB=A7=88=EA=B0=90=EC=9D=B8=20=EA=B4=80=EC=8B=AC=20?= =?UTF-8?q?=EA=B3=B5=EA=B3=A0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terning/terningserver/exception/enums/SuccessMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/terning/terningserver/exception/enums/SuccessMessage.java b/src/main/java/org/terning/terningserver/exception/enums/SuccessMessage.java index 043f408..9795043 100644 --- a/src/main/java/org/terning/terningserver/exception/enums/SuccessMessage.java +++ b/src/main/java/org/terning/terningserver/exception/enums/SuccessMessage.java @@ -8,7 +8,7 @@ public enum SuccessMessage { // 홈 화면 SUCCESS_GET_ANNOUNCEMENTS(200, "인턴 공고 불러오기를 성공했습니다"), - SUCCESS_GET_TODAY_ANNOUNCEMENTS(200, "오늘 마감인 인턴 공고 요청을 성공했습니다"), + SUCCESS_GET_UPCOMING_ANNOUNCEMENTS(200, "곧 마감인 인턴 공고 요청을 성공했습니다"), // 소셜 로그인 SUCCESS_SIGN_IN(200, "소셜 로그인에 성공하였습니다"), From e40a952265eff11251b41d6cc436308058ccff4a Mon Sep 17 00:00:00 2001 From: Willy Date: Fri, 30 Aug 2024 11:01:39 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[=E2=9C=A8feat]=20D-day=20~=20D-7=20?= =?UTF-8?q?=EA=B4=80=EC=8B=AC=EA=B3=B5=EA=B3=A0=EB=A5=BC=20=EB=B3=B4?= =?UTF-8?q?=EB=82=B4=EC=A3=BC=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD(getUp?= =?UTF-8?q?comingScrap)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/terning/terningserver/service/ScrapService.java | 4 ++-- .../terning/terningserver/service/ScrapServiceImpl.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/terning/terningserver/service/ScrapService.java b/src/main/java/org/terning/terningserver/service/ScrapService.java index 5d94bb5..820faf5 100644 --- a/src/main/java/org/terning/terningserver/service/ScrapService.java +++ b/src/main/java/org/terning/terningserver/service/ScrapService.java @@ -5,13 +5,13 @@ import org.terning.terningserver.dto.calendar.response.DailyScrapResponseDto; import org.terning.terningserver.dto.calendar.response.MonthlyDefaultResponseDto; import org.terning.terningserver.dto.calendar.response.MonthlyListResponseDto; -import org.terning.terningserver.dto.user.response.TodayScrapResponseDto; +import org.terning.terningserver.dto.user.response.UpcomingScrapResponseDto; import java.time.LocalDate; import java.util.List; public interface ScrapService { - List getTodayScrap(Long userId); + List getUpcomingScrap(Long userId); void createScrap(Long internshipAnnouncementId, CreateScrapRequestDto request, Long userId); diff --git a/src/main/java/org/terning/terningserver/service/ScrapServiceImpl.java b/src/main/java/org/terning/terningserver/service/ScrapServiceImpl.java index bb34fb9..9a08170 100644 --- a/src/main/java/org/terning/terningserver/service/ScrapServiceImpl.java +++ b/src/main/java/org/terning/terningserver/service/ScrapServiceImpl.java @@ -12,7 +12,7 @@ import org.terning.terningserver.dto.calendar.response.DailyScrapResponseDto; import org.terning.terningserver.dto.calendar.response.MonthlyDefaultResponseDto; import org.terning.terningserver.dto.calendar.response.MonthlyListResponseDto; -import org.terning.terningserver.dto.user.response.TodayScrapResponseDto; +import org.terning.terningserver.dto.user.response.UpcomingScrapResponseDto; import org.terning.terningserver.exception.CustomException; import org.terning.terningserver.repository.internship_announcement.InternshipRepository; import org.terning.terningserver.repository.scrap.ScrapRepository; @@ -37,10 +37,11 @@ public class ScrapServiceImpl implements ScrapService { private final UserRepository userRepository; @Override - public List getTodayScrap(Long userId){ + public List getUpcomingScrap(Long userId){ LocalDate today = LocalDate.now(); - return scrapRepository.findByUserIdAndInternshipAnnouncement_Deadline(userId, today).stream() - .map(TodayScrapResponseDto::of) + LocalDate oneWeekFromToday = today.plusDays(7); + return scrapRepository.findScrapsByUserIdAndDeadlineBetweenOrderByDeadline(userId, today, oneWeekFromToday).stream() + .map(UpcomingScrapResponseDto::of) .toList(); } From 295c2ef7a7e958a10ecae59961ba4fdad67416da Mon Sep 17 00:00:00 2001 From: Willy Date: Fri, 30 Aug 2024 11:02:13 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[=E2=9C=A8feat]=20=ED=99=88=20>=20=EC=98=A4?= =?UTF-8?q?=EB=8A=98=20=EB=A7=88=EA=B0=90=EB=90=98=EB=8A=94=20=EA=B4=80?= =?UTF-8?q?=EC=8B=AC=EA=B3=B5=EA=B3=A0=EC=97=90=EC=84=9C=20=ED=99=88=20>?= =?UTF-8?q?=20=EA=B3=A7=20=EB=A7=88=EA=B0=90=EB=90=98=EB=8A=94=20=EA=B4=80?= =?UTF-8?q?=EC=8B=AC=EA=B3=B5=EA=B3=A0=EB=A1=9C=20=EB=B3=80=EA=B2=BD(HomeS?= =?UTF-8?q?wagger)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terningserver/controller/swagger/HomeSwagger.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/terning/terningserver/controller/swagger/HomeSwagger.java b/src/main/java/org/terning/terningserver/controller/swagger/HomeSwagger.java index 68383c2..249b3d4 100644 --- a/src/main/java/org/terning/terningserver/controller/swagger/HomeSwagger.java +++ b/src/main/java/org/terning/terningserver/controller/swagger/HomeSwagger.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; import org.terning.terningserver.dto.user.response.HomeAnnouncementsResponseDto; -import org.terning.terningserver.dto.user.response.TodayScrapResponseDto; +import org.terning.terningserver.dto.user.response.UpcomingScrapResponseDto; import org.terning.terningserver.exception.dto.SuccessResponse; import java.util.List; @@ -20,8 +20,8 @@ ResponseEntity> getAnnouncements( int startMonth ); - @Operation(summary = "홈화면 > 오늘 마감인 스크랩 공고 조회", description = "오늘 마감인 스크랩 공고를 조회하는 API") - ResponseEntity>> getTodayScraps( + @Operation(summary = "홈화면 > 곧 마감인 스크랩 공고 조회", description = "곧 마감인 스크랩 공고를 조회하는 API") + ResponseEntity>> getUpcomingScraps( Long userId ); } From 2acd0ba6f112f4cf198e4fa6c76a06457b4fff43 Mon Sep 17 00:00:00 2001 From: Willy Date: Fri, 30 Aug 2024 11:02:31 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[=E2=9C=A8feat]=20=ED=99=88=20>=20=EC=98=A4?= =?UTF-8?q?=EB=8A=98=20=EB=A7=88=EA=B0=90=EB=90=98=EB=8A=94=20=EA=B4=80?= =?UTF-8?q?=EC=8B=AC=EA=B3=B5=EA=B3=A0=EC=97=90=EC=84=9C=20=ED=99=88=20>?= =?UTF-8?q?=20=EA=B3=A7=20=EB=A7=88=EA=B0=90=EB=90=98=EB=8A=94=20=EA=B4=80?= =?UTF-8?q?=EC=8B=AC=EA=B3=B5=EA=B3=A0=EB=A1=9C=20=EB=B3=80=EA=B2=BD(HomeC?= =?UTF-8?q?ontroller)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terningserver/controller/HomeController.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/terning/terningserver/controller/HomeController.java b/src/main/java/org/terning/terningserver/controller/HomeController.java index 50ac335..3c82c30 100644 --- a/src/main/java/org/terning/terningserver/controller/HomeController.java +++ b/src/main/java/org/terning/terningserver/controller/HomeController.java @@ -6,19 +6,15 @@ import org.springframework.web.bind.annotation.*; import org.terning.terningserver.controller.swagger.HomeSwagger; import org.terning.terningserver.dto.user.response.HomeAnnouncementsResponseDto; -import org.terning.terningserver.dto.user.response.HomeResponseDto; -import org.terning.terningserver.dto.user.response.TodayScrapResponseDto; -import org.terning.terningserver.exception.CustomException; -import org.terning.terningserver.exception.dto.ErrorResponse; +import org.terning.terningserver.dto.user.response.UpcomingScrapResponseDto; import org.terning.terningserver.exception.dto.SuccessResponse; -import org.terning.terningserver.exception.enums.SuccessMessage; import org.terning.terningserver.service.HomeService; import org.terning.terningserver.service.ScrapService; import java.util.List; import static org.terning.terningserver.exception.enums.SuccessMessage.SUCCESS_GET_ANNOUNCEMENTS; -import static org.terning.terningserver.exception.enums.SuccessMessage.SUCCESS_GET_TODAY_ANNOUNCEMENTS; +import static org.terning.terningserver.exception.enums.SuccessMessage.SUCCESS_GET_UPCOMING_ANNOUNCEMENTS; @RestController @RequiredArgsConstructor @@ -40,13 +36,13 @@ public ResponseEntity> getAnnounce return ResponseEntity.ok(SuccessResponse.of(SUCCESS_GET_ANNOUNCEMENTS, announcements)); } - @GetMapping("/home/today") - public ResponseEntity>> getTodayScraps( + @GetMapping("/home/upcoming") + public ResponseEntity>> getUpcomingScraps( @AuthenticationPrincipal Long userId ){ - List scrapList = scrapService.getTodayScrap(userId); + List scrapList = scrapService.getUpcomingScrap(userId); - return ResponseEntity.ok(SuccessResponse.of(SUCCESS_GET_TODAY_ANNOUNCEMENTS, scrapList)); + return ResponseEntity.ok(SuccessResponse.of(SUCCESS_GET_UPCOMING_ANNOUNCEMENTS, scrapList)); } } From 8ee8c44eef80fa2028f0d225f6fd1ff0d2bf0190 Mon Sep 17 00:00:00 2001 From: Willy Date: Fri, 30 Aug 2024 11:03:14 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[=E2=9C=A8feat]=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terning/terningserver/repository/scrap/ScrapRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/terning/terningserver/repository/scrap/ScrapRepository.java b/src/main/java/org/terning/terningserver/repository/scrap/ScrapRepository.java index 8373692..16dac45 100644 --- a/src/main/java/org/terning/terningserver/repository/scrap/ScrapRepository.java +++ b/src/main/java/org/terning/terningserver/repository/scrap/ScrapRepository.java @@ -12,7 +12,7 @@ public interface ScrapRepository extends JpaRepository, ScrapReposi Optional findByInternshipAnnouncementIdAndUserId(Long internshipId, Long userId); - List findByUserIdAndInternshipAnnouncement_Deadline(Long userId, LocalDate deadline); +// List findByUserIdAndInternshipAnnouncement_Deadline(Long userId, LocalDate deadline); List findByUserIdAndInternshipAnnouncement_DeadlineBetween(Long userId, LocalDate start, LocalDate end);