From bcb40d9626e3c375df363a67bc10cc05397e82d4 Mon Sep 17 00:00:00 2001 From: SoowanPark Date: Tue, 20 Feb 2024 20:50:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Fix]=20subscribe=20=EC=98=A4=ED=83=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/careerfestival/career/config/SecurityConfig.java | 2 +- .../career/subscribe/controller/SubscribeController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/careerfestival/career/config/SecurityConfig.java b/src/main/java/careerfestival/career/config/SecurityConfig.java index 9693e6c7..1b58c524 100644 --- a/src/main/java/careerfestival/career/config/SecurityConfig.java +++ b/src/main/java/careerfestival/career/config/SecurityConfig.java @@ -71,7 +71,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { //경로별 인가 작업 http .authorizeHttpRequests((auth) -> auth - .requestMatchers("/", "/login", "/signup", "/signup/detail", "/event/**", "/health").permitAll() + .requestMatchers("/", "/login", "/signup", "/signup/detail", "/event/**", "/health", "profile/**").permitAll() .requestMatchers("/mypage/**", "/event/*/participate").hasRole("PARTICIPANT") .requestMatchers("event/organizer, event/register").hasRole("ORGANIZER") .anyRequest().permitAll() diff --git a/src/main/java/careerfestival/career/subscribe/controller/SubscribeController.java b/src/main/java/careerfestival/career/subscribe/controller/SubscribeController.java index f3232923..08aa79a3 100644 --- a/src/main/java/careerfestival/career/subscribe/controller/SubscribeController.java +++ b/src/main/java/careerfestival/career/subscribe/controller/SubscribeController.java @@ -102,7 +102,7 @@ public ResponseEntity> getRegisterByOrganizerId( Page registerMainResponseDtos = registerService.getEventList(organizerId, pageable); - List subs = subscribeService.getAllSubscribeByUser(organizerId); + List subs = subscribeService.getAllSubscribeByUser(organizerUserId); int totalSubsCount = subs.size(); Map profile = new HashMap<>(); profile.put("organizerName", organizerName); From c0847ada169ac26cbfbb796582e05fa5789f2c03 Mon Sep 17 00:00:00 2001 From: SoowanPark Date: Tue, 20 Feb 2024 21:06:11 +0900 Subject: [PATCH 2/2] [Fix] subscribe organizerProfileImage --- .../career/subscribe/controller/SubscribeController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/careerfestival/career/subscribe/controller/SubscribeController.java b/src/main/java/careerfestival/career/subscribe/controller/SubscribeController.java index 08aa79a3..58ff18fc 100644 --- a/src/main/java/careerfestival/career/subscribe/controller/SubscribeController.java +++ b/src/main/java/careerfestival/career/subscribe/controller/SubscribeController.java @@ -98,6 +98,7 @@ public ResponseEntity> getRegisterByOrganizerId( System.out.println(organizerId + "주최자 id"); System.out.println(organizerUserId + "주최자의 유저 id"); String organizerName = registerService.getOrganizerName(organizerId); + String organizerProfileImage = organizerRepository.findByEncryptedEmail(fromUserId).getOrganizerProfileFileUrl(); int getEventCount = registerService.getCountRegisterEvent(organizerUserId); Page registerMainResponseDtos = registerService.getEventList(organizerId, pageable); @@ -106,6 +107,7 @@ public ResponseEntity> getRegisterByOrganizerId( int totalSubsCount = subs.size(); Map profile = new HashMap<>(); profile.put("organizerName", organizerName); + profile.put("organizerProfileImage", organizerProfileImage); // 구독자 관련 코드 추가 작성 필요 profile.put("festivalList", registerMainResponseDtos); profile.put("festivalCount", getEventCount);