From 04b57164165353859ee4bcc7bed129d12f0c7703 Mon Sep 17 00:00:00 2001 From: kseysh Date: Thu, 21 Nov 2024 13:38:18 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[refactor]=20PlaygroundClient=20import=20?= =?UTF-8?q?=EB=8B=A8=EC=88=9C=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/playground/PlaygroundClient.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java b/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java index 66edf17c..91b163f0 100755 --- a/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java +++ b/src/main/java/org/sopt/app/application/playground/PlaygroundClient.java @@ -1,19 +1,13 @@ package org.sopt.app.application.playground; -import feign.HeaderMap; -import feign.Param; -import feign.RequestLine; -import java.util.List; -import java.util.Map; -import org.sopt.app.application.auth.dto.PlaygroundAuthTokenInfo.RefreshedToken; +import feign.*; +import java.util.*; +import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.*; import org.sopt.app.application.playground.dto.PlayGroundEmploymentResponse; import org.sopt.app.application.playground.dto.PlaygroundPostInfo.PlaygroundPostResponse; -import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.ActiveUserIds; -import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.OwnPlaygroundProfile; -import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.PlaygroundMain; -import org.sopt.app.application.playground.dto.PlaygroundProfileInfo.PlaygroundProfile; import org.sopt.app.application.playground.dto.PlaygroundUserFindCondition; +import org.sopt.app.application.auth.dto.PlaygroundAuthTokenInfo.RefreshedToken; import org.sopt.app.application.playground.dto.RecommendedFriendInfo.PlaygroundUserIds; import org.sopt.app.presentation.auth.AppAuthRequest.*; import org.sopt.app.presentation.home.response.RecentPostsResponse; From e53b3e9edf2b11693984951f7dc5565e7a29d9c5 Mon Sep 17 00:00:00 2001 From: kseysh Date: Thu, 21 Nov 2024 13:50:28 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[feat]=20CrewClient=20=EC=A0=95=EC=9D=98=20?= =?UTF-8?q?=EB=B0=8F=20=EC=82=AC=EC=9A=A9=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/application/meeting/CrewClient.java | 17 ++++++++++++++++ .../meeting/CrewMeetingResponse.java | 20 +++++++++++++++++++ .../sopt/app/common/config/ClientConfig.java | 16 +++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 src/main/java/org/sopt/app/application/meeting/CrewClient.java create mode 100644 src/main/java/org/sopt/app/application/meeting/CrewMeetingResponse.java diff --git a/src/main/java/org/sopt/app/application/meeting/CrewClient.java b/src/main/java/org/sopt/app/application/meeting/CrewClient.java new file mode 100644 index 00000000..08c758ef --- /dev/null +++ b/src/main/java/org/sopt/app/application/meeting/CrewClient.java @@ -0,0 +1,17 @@ +package org.sopt.app.application.meeting; + +import feign.*; +import java.util.Map; +import org.springframework.cloud.openfeign.EnableFeignClients; + +@EnableFeignClients +public interface CrewClient { + @RequestLine("GET /internal/meetings") + CrewMeetingResponse getAllMeetings(@HeaderMap Map headers, + @Param("orgId") Long playgroundId, + @Param("page") Long page, + @Param("take") Long take, + @Param("category") String category, + @Param("isOnlyActiveGeneration") Boolean isOnlyActiveGeneration + ); +} diff --git a/src/main/java/org/sopt/app/application/meeting/CrewMeetingResponse.java b/src/main/java/org/sopt/app/application/meeting/CrewMeetingResponse.java new file mode 100644 index 00000000..62f56bc0 --- /dev/null +++ b/src/main/java/org/sopt/app/application/meeting/CrewMeetingResponse.java @@ -0,0 +1,20 @@ +package org.sopt.app.application.meeting; + +import java.util.List; + +public record CrewMeetingResponse( + List meetings +) { + public record Meeting( + Long id, + String title, + Boolean canJoinOnlyActiveGeneration, + MeetingStatus status, + String imageUrl, + String category, + List joinableParts, + Boolean isBlockedMeeting + ){ + + } +} diff --git a/src/main/java/org/sopt/app/common/config/ClientConfig.java b/src/main/java/org/sopt/app/common/config/ClientConfig.java index 6a92997a..b91211a5 100755 --- a/src/main/java/org/sopt/app/common/config/ClientConfig.java +++ b/src/main/java/org/sopt/app/common/config/ClientConfig.java @@ -5,6 +5,7 @@ import feign.jackson.*; import feign.okhttp.OkHttpClient; import feign.slf4j.Slf4jLogger; +import org.sopt.app.application.meeting.CrewClient; import org.springframework.context.annotation.*; import org.sopt.app.application.playground.PlaygroundClient; import org.springframework.beans.factory.annotation.Value; @@ -13,9 +14,13 @@ @Configuration @EnableFeignClients public class ClientConfig { + @Value("${makers.playground.server}") private String playgroundEndPoint; + @Value("${makers.playground.server}") + private String crewEndPoint; + @Bean public PlaygroundClient playgroundClient() { return Feign.builder() @@ -27,6 +32,17 @@ public PlaygroundClient playgroundClient() { .target(PlaygroundClient.class, playgroundEndPoint); } + @Bean + public CrewClient crewClient() { + return Feign.builder() + .client(okHttpClient()) + .encoder(encoder()) + .decoder(decoder()) + .logger(new Slf4jLogger(CrewClient.class)) + .logLevel(feignLoggerLevel()) + .target(CrewClient.class, crewEndPoint); + } + @Bean public Encoder encoder() { return new JacksonEncoder(); From 38ff4bc8f9fd423611c58f39297bf0faaa66371b Mon Sep 17 00:00:00 2001 From: kseysh Date: Thu, 21 Nov 2024 14:32:05 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[feat]=20CrewClient=20=EC=A0=95=EC=9D=98=20?= =?UTF-8?q?=EB=B0=8F=20=EC=82=AC=EC=9A=A9=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/app/application/meeting/CrewClient.java | 9 +++++---- .../java/org/sopt/app/common/config/ClientConfig.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/sopt/app/application/meeting/CrewClient.java b/src/main/java/org/sopt/app/application/meeting/CrewClient.java index 08c758ef..b175c791 100644 --- a/src/main/java/org/sopt/app/application/meeting/CrewClient.java +++ b/src/main/java/org/sopt/app/application/meeting/CrewClient.java @@ -6,11 +6,12 @@ @EnableFeignClients public interface CrewClient { - @RequestLine("GET /internal/meetings") + + @RequestLine("GET /internal/meetings?orgId={playgroundId}&page={page}&take={take}&category={category}&isOnlyActiveGeneration={isOnlyActiveGeneration}") CrewMeetingResponse getAllMeetings(@HeaderMap Map headers, - @Param("orgId") Long playgroundId, - @Param("page") Long page, - @Param("take") Long take, + @Param("playgroundId") Long playgroundId, + @Param("page") int page, + @Param("take") int take, @Param("category") String category, @Param("isOnlyActiveGeneration") Boolean isOnlyActiveGeneration ); diff --git a/src/main/java/org/sopt/app/common/config/ClientConfig.java b/src/main/java/org/sopt/app/common/config/ClientConfig.java index b91211a5..dffb6dd6 100755 --- a/src/main/java/org/sopt/app/common/config/ClientConfig.java +++ b/src/main/java/org/sopt/app/common/config/ClientConfig.java @@ -18,7 +18,7 @@ public class ClientConfig { @Value("${makers.playground.server}") private String playgroundEndPoint; - @Value("${makers.playground.server}") + @Value("${makers.crew.server}") private String crewEndPoint; @Bean From 5224615a872ee5ac24adb68f428daffd538fde8b Mon Sep 17 00:00:00 2001 From: kseysh Date: Thu, 21 Nov 2024 14:33:09 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[feat]=20=EA=B8=B0=EC=A1=B4=20Dummy=20?= =?UTF-8?q?=EA=B0=92=20=EB=B0=98=ED=99=98=EC=9D=84=20=EC=8B=A4=EC=A0=9C=20?= =?UTF-8?q?DTO=20=EB=B0=98=ED=99=98=EC=9C=BC=EB=A1=9C=20=EB=B3=80=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/meeting/MeetingResponse.java | 78 +++++-------------- .../app/presentation/home/HomeController.java | 16 +--- 2 files changed, 20 insertions(+), 74 deletions(-) diff --git a/src/main/java/org/sopt/app/application/meeting/MeetingResponse.java b/src/main/java/org/sopt/app/application/meeting/MeetingResponse.java index 2d205a5d..ea53dc89 100644 --- a/src/main/java/org/sopt/app/application/meeting/MeetingResponse.java +++ b/src/main/java/org/sopt/app/application/meeting/MeetingResponse.java @@ -1,73 +1,31 @@ package org.sopt.app.application.meeting; +import java.util.List; import lombok.Builder; +import org.sopt.app.application.meeting.CrewMeetingResponse.CrewMeeting; +import org.sopt.app.domain.enums.Part; @Builder public record MeetingResponse( - Long meetingId, + Long id, String title, - MeetingCategory category, + String category, + Boolean canJoinOnlyActiveGeneration, + List joinableParts, + Boolean canJoinAllParts, MeetingStatus status, - String imageUrl, - Boolean canJoinOnlyActiveGeneration + String imageUrl ) { - @Deprecated - public static MeetingResponse eventActiveDummy(Long id) { + public static MeetingResponse of(final CrewMeeting crewMeeting) { return MeetingResponse.builder() - .meetingId(id) - .title("[35기 솝커톤] 서버 파트 신청") - .category(MeetingCategory.EVENT) - .status(MeetingStatus.ACTIVE) - .imageUrl("https://makers-web-img.s3.ap-northeast-2.amazonaws.com/meeting/2024/11/14/78d48e33-f1d7-474f-a357-117b75a8cb90.png") - .canJoinOnlyActiveGeneration(false) - .build(); - } - - @Deprecated - public static MeetingResponse studyRecruitingDummy(Long id) { - return MeetingResponse.builder() - .meetingId(id) - .title("모집중이고 활동 기수만 참여하는 스터디") - .category(MeetingCategory.STUDY) - .status(MeetingStatus.RECRUITING) - .imageUrl("https://makers-web-img.s3.ap-northeast-2.amazonaws.com/meeting/2024/11/14/78d48e33-f1d7-474f-a357-117b75a8cb90.png") - .canJoinOnlyActiveGeneration(true) - .build(); - } - - @Deprecated - public static MeetingResponse studyPreRecruitingDummy(Long id) { - return MeetingResponse.builder() - .meetingId(id) - .title("모집 이전이고 모든 기수가 참여하는 스터디") - .category(MeetingCategory.STUDY) - .status(MeetingStatus.PRE_RECRUITING) - .imageUrl("https://makers-web-img.s3.ap-northeast-2.amazonaws.com/meeting/2024/11/14/78d48e33-f1d7-474f-a357-117b75a8cb90.png") - .canJoinOnlyActiveGeneration(false) - .build(); - } - - @Deprecated - public static MeetingResponse studyClosedDummy(Long id) { - return MeetingResponse.builder() - .meetingId(id) - .title("모집이 끝나고 모든 기수가 참여하는 스터디") - .category(MeetingCategory.STUDY) - .status(MeetingStatus.CLOSED) - .imageUrl("https://makers-web-img.s3.ap-northeast-2.amazonaws.com/meeting/2024/11/14/78d48e33-f1d7-474f-a357-117b75a8cb90.png") - .canJoinOnlyActiveGeneration(false) - .build(); - } - - @Deprecated - public static MeetingResponse studyActiveDummy(Long id) { - return MeetingResponse.builder() - .meetingId(id) - .title("활동중이고 활동 기수만 참여하는 스터디") - .category(MeetingCategory.STUDY) - .status(MeetingStatus.ACTIVE) - .imageUrl("https://makers-web-img.s3.ap-northeast-2.amazonaws.com/meeting/2024/11/14/78d48e33-f1d7-474f-a357-117b75a8cb90.png") - .canJoinOnlyActiveGeneration(true) + .id(crewMeeting.id()) + .title(crewMeeting.title()) + .category(crewMeeting.category()) + .canJoinOnlyActiveGeneration(crewMeeting.canJoinOnlyActiveGeneration()) + .joinableParts(crewMeeting.joinableParts()) + .canJoinAllParts(crewMeeting.joinableParts().size() == Part.values().length) + .status(crewMeeting.status()) + .imageUrl(crewMeeting.imageUrl()) .build(); } } diff --git a/src/main/java/org/sopt/app/presentation/home/HomeController.java b/src/main/java/org/sopt/app/presentation/home/HomeController.java index 21159809..97d866fd 100644 --- a/src/main/java/org/sopt/app/presentation/home/HomeController.java +++ b/src/main/java/org/sopt/app/presentation/home/HomeController.java @@ -11,8 +11,7 @@ import org.sopt.app.application.meeting.MeetingResponse; import org.sopt.app.domain.entity.User; import org.sopt.app.facade.HomeFacade; -import org.sopt.app.presentation.home.response.RecentPostsResponse; -import org.sopt.app.presentation.home.response.EmploymentPostResponse; +import org.sopt.app.presentation.home.response.*; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @@ -98,18 +97,7 @@ public ResponseEntity> getAllMeeting( @RequestParam(value = "category") final String category ) { return ResponseEntity.ok( - List.of( - MeetingResponse.eventActiveDummy(1L), - MeetingResponse.studyRecruitingDummy(2L), - MeetingResponse.studyPreRecruitingDummy(3L), - MeetingResponse.studyClosedDummy(4L), - MeetingResponse.studyActiveDummy(5L), - MeetingResponse.eventActiveDummy(6L), - MeetingResponse.studyRecruitingDummy(7L), - MeetingResponse.studyPreRecruitingDummy(8L), - MeetingResponse.studyClosedDummy(9L), - MeetingResponse.studyActiveDummy(10L) - ) + homeFacade.getAllMeetings(new MeetingParamRequest(user.getPlaygroundId(), page, take, category)) ); } } From dab604d4eec99a48eb37345e771143774fab1bb4 Mon Sep 17 00:00:00 2001 From: kseysh Date: Thu, 21 Nov 2024 14:35:21 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[feat]=20crew=EC=97=90=EC=84=9C=20response?= =?UTF-8?q?=20=EB=B0=9B=EB=8A=94=20=EA=B0=92=20=EC=A0=95=EC=9D=98=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/CrewMeetingResponse.java | 4 ++-- .../application/meeting/MeetingService.java | 24 +++++++++++++++++++ .../application/meeting/MeetingStatus.java | 7 +++--- 3 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/sopt/app/application/meeting/MeetingService.java diff --git a/src/main/java/org/sopt/app/application/meeting/CrewMeetingResponse.java b/src/main/java/org/sopt/app/application/meeting/CrewMeetingResponse.java index 62f56bc0..dbfbef9d 100644 --- a/src/main/java/org/sopt/app/application/meeting/CrewMeetingResponse.java +++ b/src/main/java/org/sopt/app/application/meeting/CrewMeetingResponse.java @@ -3,9 +3,9 @@ import java.util.List; public record CrewMeetingResponse( - List meetings + List meetings ) { - public record Meeting( + public record CrewMeeting( Long id, String title, Boolean canJoinOnlyActiveGeneration, diff --git a/src/main/java/org/sopt/app/application/meeting/MeetingService.java b/src/main/java/org/sopt/app/application/meeting/MeetingService.java new file mode 100644 index 00000000..0d6a42af --- /dev/null +++ b/src/main/java/org/sopt/app/application/meeting/MeetingService.java @@ -0,0 +1,24 @@ +package org.sopt.app.application.meeting; + +import static org.sopt.app.application.playground.PlaygroundHeaderCreator.createAuthorizationHeaderByInternalPlaygroundToken; + +import lombok.RequiredArgsConstructor; +import org.sopt.app.presentation.home.MeetingParamRequest; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MeetingService { + private final CrewClient crewClient; + + public CrewMeetingResponse getAllMeetings(MeetingParamRequest request) { + return crewClient.getAllMeetings( + createAuthorizationHeaderByInternalPlaygroundToken(), + request.playgroundId(), + request.page(), + request.take(), + request.category(), + false + ); + } +} diff --git a/src/main/java/org/sopt/app/application/meeting/MeetingStatus.java b/src/main/java/org/sopt/app/application/meeting/MeetingStatus.java index a795d1d6..b8cd1325 100644 --- a/src/main/java/org/sopt/app/application/meeting/MeetingStatus.java +++ b/src/main/java/org/sopt/app/application/meeting/MeetingStatus.java @@ -1,8 +1,7 @@ package org.sopt.app.application.meeting; public enum MeetingStatus { - RECRUITING, - PRE_RECRUITING, - CLOSED, - ACTIVE + APPLY_ABLE, + BEFORE_START, + RECRUITMENT_COMPLETE } From 2e86c74dfe3631c3358af8a92ca3d7c4b7e45306 Mon Sep 17 00:00:00 2001 From: kseysh Date: Thu, 21 Nov 2024 14:35:46 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[refactor]=20HomeDescriptionResponse=20resp?= =?UTF-8?q?onse=20=ED=8C=A8=ED=82=A4=EC=A7=80=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/{ => response}/HomeDescriptionResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/org/sopt/app/presentation/home/{ => response}/HomeDescriptionResponse.java (89%) diff --git a/src/main/java/org/sopt/app/presentation/home/HomeDescriptionResponse.java b/src/main/java/org/sopt/app/presentation/home/response/HomeDescriptionResponse.java similarity index 89% rename from src/main/java/org/sopt/app/presentation/home/HomeDescriptionResponse.java rename to src/main/java/org/sopt/app/presentation/home/response/HomeDescriptionResponse.java index 0eb736f5..f80d20d1 100644 --- a/src/main/java/org/sopt/app/presentation/home/HomeDescriptionResponse.java +++ b/src/main/java/org/sopt/app/presentation/home/response/HomeDescriptionResponse.java @@ -1,4 +1,4 @@ -package org.sopt.app.presentation.home; +package org.sopt.app.presentation.home.response; import lombok.*; From 00f22dc060b37ea7f6e81b1ae0e0ecf6d2de8b3c Mon Sep 17 00:00:00 2001 From: kseysh Date: Thu, 21 Nov 2024 14:36:37 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[feat]=20HomeFacade=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=AA=A8=EB=93=A0=20=EB=AA=A8=EC=9E=84=EC=9D=84=20=EB=B0=9B?= =?UTF-8?q?=EC=95=84=EC=98=A4=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/application/meeting/MeetingCategory.java | 6 ------ src/main/java/org/sopt/app/facade/HomeFacade.java | 14 +++++++++++--- .../app/presentation/home/MeetingParamRequest.java | 10 ++++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) delete mode 100644 src/main/java/org/sopt/app/application/meeting/MeetingCategory.java create mode 100644 src/main/java/org/sopt/app/presentation/home/MeetingParamRequest.java diff --git a/src/main/java/org/sopt/app/application/meeting/MeetingCategory.java b/src/main/java/org/sopt/app/application/meeting/MeetingCategory.java deleted file mode 100644 index a3b5f621..00000000 --- a/src/main/java/org/sopt/app/application/meeting/MeetingCategory.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.sopt.app.application.meeting; - -public enum MeetingCategory { - STUDY, - EVENT -} diff --git a/src/main/java/org/sopt/app/facade/HomeFacade.java b/src/main/java/org/sopt/app/facade/HomeFacade.java index 98e73310..764ba75e 100755 --- a/src/main/java/org/sopt/app/facade/HomeFacade.java +++ b/src/main/java/org/sopt/app/facade/HomeFacade.java @@ -4,15 +4,16 @@ import lombok.RequiredArgsConstructor; import lombok.val; import org.sopt.app.application.app_service.*; -import org.sopt.app.application.app_service.dto.AppServiceEntryStatusResponse; -import org.sopt.app.application.app_service.dto.AppServiceInfo; +import org.sopt.app.application.app_service.dto.*; import org.sopt.app.application.home.ActivityDurationCalculator; +import org.sopt.app.application.meeting.*; import org.sopt.app.application.playground.PlaygroundAuthService; import org.sopt.app.application.description.DescriptionInfo.MainDescription; import org.sopt.app.application.description.DescriptionService; import org.sopt.app.domain.entity.User; import org.sopt.app.domain.enums.UserStatus; -import org.sopt.app.presentation.home.HomeDescriptionResponse; +import org.sopt.app.presentation.home.response.HomeDescriptionResponse; +import org.sopt.app.presentation.home.MeetingParamRequest; import org.sopt.app.presentation.home.response.RecentPostsResponse; import org.sopt.app.presentation.home.response.EmploymentPostResponse; import org.springframework.stereotype.Service; @@ -26,6 +27,7 @@ public class HomeFacade { private final PlaygroundAuthService playgroundAuthService; private final AppServiceService appServiceService; private final AppServiceBadgeService appServiceBadgeService; + private final MeetingService meetingService; @Transactional(readOnly = true) @Deprecated @@ -85,4 +87,10 @@ public List getHomeEmploymentPost(User user) { return playgroundAuthService.getPlaygroundEmploymentPost(user.getPlaygroundToken()); } + public List getAllMeetings(MeetingParamRequest request) { + return meetingService.getAllMeetings(request) + .meetings().stream() + .map(MeetingResponse::of) + .toList(); + } } diff --git a/src/main/java/org/sopt/app/presentation/home/MeetingParamRequest.java b/src/main/java/org/sopt/app/presentation/home/MeetingParamRequest.java new file mode 100644 index 00000000..078fc15b --- /dev/null +++ b/src/main/java/org/sopt/app/presentation/home/MeetingParamRequest.java @@ -0,0 +1,10 @@ +package org.sopt.app.presentation.home; + +public record MeetingParamRequest( + Long playgroundId, + int page, + int take, + String category +) { + +} From eae2f2eeebca1762106f6adc475dbb87c995ecc5 Mon Sep 17 00:00:00 2001 From: kseysh Date: Thu, 21 Nov 2024 14:59:28 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[feat]=20=EB=AA=A8=EC=9E=84=EC=9D=B4=20bloc?= =?UTF-8?q?kedMeeting=EC=9D=BC=20=EB=95=8C=20=EB=B3=B4=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/sopt/app/facade/HomeFacade.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/sopt/app/facade/HomeFacade.java b/src/main/java/org/sopt/app/facade/HomeFacade.java index 764ba75e..31e6f29b 100755 --- a/src/main/java/org/sopt/app/facade/HomeFacade.java +++ b/src/main/java/org/sopt/app/facade/HomeFacade.java @@ -90,6 +90,7 @@ public List getHomeEmploymentPost(User user) { public List getAllMeetings(MeetingParamRequest request) { return meetingService.getAllMeetings(request) .meetings().stream() + .filter(crewMeeting -> !crewMeeting.isBlockedMeeting()) .map(MeetingResponse::of) .toList(); }