[Feat] noti 세팅

app/src/main/java/fc/be/app/common/authentication/controller/AuthController.java

@@ -172,15 +172,13 @@ public void joinSpaceToken(@PathVariable Long spaceId, @RequestParam String code
             Instant expiredInstant = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant();
             String expiredEmptyJwt = JWT.create().withExpiresAt(expiredInstant).sign(Algorithm.none());
             CookieUtil.addCookieNotHttpOnly(response, "join_space_token", expiredEmptyJwt, 60 * 5);
-            CookieUtil.addCookieNotHttpOnlyForLocal(response, "join_space_token", expiredEmptyJwt, 60 * 5);
             response.sendRedirect("https://tripvote.site");
             return;
         }
         Map<String, String> codeInfo = verifyService.getCodeInfo(VerifyService.Purpose.JOIN_SPACE, code);
         JoinSpaceToken genRequest = JoinSpaceToken.unauthenticated(null, codeInfo.get("issuer"), spaceId);
         Token generatedToken = delegatingTokenManager.generate(genRequest);
         CookieUtil.addCookieNotHttpOnly(response, "join_space_token", generatedToken.getTokenValue(), 60 * 60 * 2);
-        CookieUtil.addCookieNotHttpOnlyForLocal(response, "join_space_token", generatedToken.getTokenValue(), 60 * 60 * 2);
         response.sendRedirect("https://tripvote.site");
     }
 

app/src/main/java/fc/be/app/common/authentication/controller/dto/request/ModifyLostPasswordRequest.java

@@ -12,6 +12,7 @@ public record ModifyLostPasswordRequest(
         @NotNull
         String email,
         @Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*[!@#$%^&*()])(?=.*[0-9]).{8,16}$")
+        @NotBlank
         String newPassword
 ) {
 }

app/src/main/java/fc/be/app/common/authentication/controller/dto/request/ModifyPasswordRequest.java

@@ -7,6 +7,7 @@ public record ModifyPasswordRequest(
         @NotBlank
         String token,
         @Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*[!@#$%^&*()])(?=.*[0-9]).{8,16}$")
+        @NotBlank
         String newPassword
 ) {
 }

app/src/main/java/fc/be/app/domain/member/controller/MemberController.java

@@ -24,6 +24,9 @@
 import fc.be.app.domain.wish.service.WishService;
 import fc.be.app.global.config.security.model.user.UserPrincipal;
 import fc.be.app.global.http.ApiResponse;
+import fc.be.app.global.util.CookieUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -96,18 +99,22 @@ public ApiResponse<Void> changeProfileAndNickname(@AuthenticationPrincipal UserP
 
     @PostMapping("/sign-out")
     @PreAuthorize("isAuthenticated()")
-    public ApiResponse<Void> signOut(@AuthenticationPrincipal UserPrincipal userPrincipal, @Valid @RequestBody(required = false) DeleteMemberRequest request, @CookieValue(name = "access-token", required = false) String accessToken) {
+    public ApiResponse<Void> signOut(@AuthenticationPrincipal UserPrincipal userPrincipal, @Valid @RequestBody(required = false) DeleteMemberRequest request, @CookieValue(name = "access-token", required = false) String accessToken, HttpServletRequest servletRequest, HttpServletResponse servletResponse) {
         if (userPrincipal.authProvider() != AuthProvider.NONE) {
             ProviderMemberDeactivateRequest deactivateRequest = new ProviderMemberDeactivateRequest(userPrincipal.id(), accessToken);
             try {
                 memberCommand.deactivate(deactivateRequest);
+                CookieUtil.deleteCookie(servletRequest, servletResponse, "access-token");
+                CookieUtil.deleteCookie(servletRequest, servletResponse, "refresh-token");
             } catch (AuthException exception) {
                 throw exception;
             }
             return ApiResponse.ok();
         }
         MemberDeactivateRequest deactivateRequest = new MemberDeactivateRequest(userPrincipal.id(), request.password());
         memberCommand.deactivate(deactivateRequest);
+        CookieUtil.deleteCookie(servletRequest, servletResponse, "access-token");
+        CookieUtil.deleteCookie(servletRequest, servletResponse, "refresh-token");
         return ApiResponse.ok();
     }
 }

app/src/main/java/fc/be/app/domain/member/controller/dto/response/MyInfoResponse.java

@@ -7,9 +7,10 @@ public record MyInfoResponse(
         String nickname,
         String email,
         String profile,
-        AuthProvider provider
+        AuthProvider provider,
+        boolean isSubscribe
 ) {
     public static MyInfoResponse from(MemberQuery.MemberResponse memberResponse) {
-        return new MyInfoResponse(memberResponse.nickname(), memberResponse.email(), memberResponse.profile(), memberResponse.provider());
+        return new MyInfoResponse(memberResponse.nickname(), memberResponse.email(), memberResponse.profile(), memberResponse.provider(), memberResponse.isSubscribe());
     }
 }

app/src/main/java/fc/be/app/domain/member/service/MemberQuery.java

@@ -42,7 +42,8 @@ record MemberResponse(
             String email,
             String nickname,
             String profile,
-            AuthProvider provider
+            AuthProvider provider,
+            boolean isSubscribe
     ) {
     }
 }

app/src/main/java/fc/be/app/domain/member/service/MemberQueryHandler.java

@@ -29,7 +29,8 @@ public Optional<MemberResponse> findById(Long id) {
                         member.getEmail(),
                         member.getNickname(),
                         member.getProfile(),
-                        member.getProvider()));
+                        member.getProvider(),
+                        member.isSubscription()));
     }
 
     @Override
@@ -42,7 +43,8 @@ public Optional<MemberResponse> find(MemberRequest request) {
                         member.getEmail(),
                         member.getNickname(),
                         member.getProfile(),
-                        member.getProvider()));
+                        member.getProvider(),
+                        member.isSubscription()));
     }
 
     @Override
@@ -55,7 +57,8 @@ public Optional<MemberResponse> find(ProviderMemberRequest request) {
                         member.getEmail(),
                         member.getNickname(),
                         member.getProfile(),
-                        member.getProvider()));
+                        member.getProvider(),
+                        member.isSubscription()));
     }
 
     @Override

app/src/main/java/fc/be/app/domain/notification/application/NotificationSubscribeService.java

@@ -10,12 +10,14 @@
 import fc.be.app.domain.space.repository.JoinedMemberRepository;
 import fc.be.notification.application.NotificationSubscribePort;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 import static fc.be.app.domain.notification.exception.NotificationErrorCode.NOT_FOUND_TOKEN;
 
 @Service
+@Transactional
 public class NotificationSubscribeService {
     private static final long GLOBAL_TOPIC_ID = 0;
 

app/src/main/java/fc/be/app/domain/notification/controller/NotificationTokenController.java

@@ -7,6 +7,7 @@
 import fc.be.app.global.http.ApiResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +20,7 @@ public class NotificationTokenController {
     private final NotificationTokenRegisterService notificationTokenRegisterService;
 
     @PostMapping("/notifications/token")
+    @PreAuthorize("isAuthenticated()")
     public ApiResponse<Void> createFcmToken(
             @Valid @RequestBody TokenRegisterApiRequest request,
             @AuthenticationPrincipal UserPrincipal userPrincipal

app/src/main/java/fc/be/app/domain/place/service/PlaceService.java

@@ -8,7 +8,6 @@
 import fc.be.app.domain.place.exception.PlaceException;
 import fc.be.app.domain.place.repository.PlaceRepository;
 import fc.be.openapi.algolia.SearchEngineService;
-import fc.be.openapi.google.dto.review.APIRatingResponse;
 import fc.be.openapi.google.service.ReviewAPIService;
 import fc.be.openapi.tourapi.TourAPIService;
 import fc.be.openapi.tourapi.dto.response.bone.PlaceDTO;
@@ -93,11 +92,7 @@ public PlaceNearbyResponse bringNearbyPlaces(PlaceNearbyRequest placeNearbyReque
             throw new PlaceException(PLACE_NOT_LOADED);
         }
 
-        List<APIRatingResponse> apiRatingResponses = places.stream()
-                .map(place -> reviewAPIService.bringRatingCount(place.getTitle(), place.getContentTypeId()))
-                .toList();
-
-        return PlaceNearbyResponse.from(places).with(apiRatingResponses);
+        return PlaceNearbyResponse.from(places);
     }
 
     public PlacePopularGetResponse bringPopularPlaces(PlacePopularGetRequest placePopularGetRequest) {

app/src/main/java/fc/be/app/domain/vote/service/dto/response/vo/PlaceInfo.java

@@ -4,6 +4,7 @@
 
 public record PlaceInfo(
         Integer placeId,
+        Integer contentTypeId,
         String placeName,
         String category,
         int areaCode,
@@ -14,6 +15,7 @@ public record PlaceInfo(
     public static PlaceInfo of(Place place) {
         return new PlaceInfo(
                 place.getId(),
+                place.getContentTypeId().getId(),
                 place.getTitle(),
                 place.getCategory(),
                 place.getLocation().getAreaCode(),

app/src/main/java/fc/be/app/global/config/security/SecurityAppConfig.java

@@ -15,8 +15,8 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.WebAuthenticationDetails;
 import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
 
 import java.util.Arrays;
 import java.util.List;
@@ -44,7 +44,7 @@ public JwtAuthenticationFilter jwtAuthenticationFilter(JwtAuthenticationProvider
 
     @Bean
     @Profile("prod")
-    public CorsConfigurationSource prodCorsFilter() {
+    public CorsFilter prodCorsFilter() {
         CorsConfiguration corsConfiguration = new CorsConfiguration();
         corsConfiguration.setAllowCredentials(true);
         corsConfiguration.setAllowedOrigins(corsProperties.getAllowedOrigins());
@@ -53,12 +53,12 @@ public CorsConfigurationSource prodCorsFilter() {
                 Arrays.asList("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", corsConfiguration);
-        return source;
+        return new CorsFilter(source);
     }
 
     @Bean
     @Profile(value = {"default", "dev"})
-    public CorsConfigurationSource developCorsFilter() {
+    public CorsFilter developCorsFilter() {
         CorsConfiguration corsConfiguration = new CorsConfiguration();
         corsConfiguration.setAllowCredentials(true);
         corsConfiguration.setAllowedOrigins(corsProperties.getAllowedOrigins());
@@ -67,6 +67,6 @@ public CorsConfigurationSource developCorsFilter() {
         corsConfiguration.addExposedHeader("*");
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", corsConfiguration);
-        return source;
+        return new CorsFilter(source);
     }
 }

app/src/main/java/fc/be/app/global/config/security/filter/JwtAuthenticationFilter.java

@@ -90,7 +90,6 @@ protected void onSuccessfulAuthentication(HttpServletRequest request, HttpServle
             TokenPair newTokenPair = (TokenPair) jwtAuthToken.getCredentials();
             if (newTokenPair.isRegenerated()) {
                 CookieUtil.addCookie(response, tokenProperties.getAccessTokenName(), newTokenPair.accessToken(), Integer.parseInt(tokenProperties.getAccessTokenCookieExpireTime()));
-                CookieUtil.addCookieForLocal(response, tokenProperties.getAccessTokenName(), newTokenPair.accessToken(), Integer.parseInt(tokenProperties.getAccessTokenCookieExpireTime()));
             }
         }
     }

app/src/main/java/fc/be/app/global/config/security/handler/LoginAuthenticationSuccessHandler.java

@@ -50,14 +50,11 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
             throw new InternalAuthenticationServiceException(ex.getMessage(), ex);
         }
         CookieUtil.addCookie(response, tokenProperties.getAccessTokenName(), accessToken, Integer.parseInt(tokenProperties.getAccessTokenCookieExpireTime()));
-        CookieUtil.addCookieForLocal(response, tokenProperties.getAccessTokenName(), accessToken, Integer.parseInt(tokenProperties.getAccessTokenCookieExpireTime()));
 
         String refreshToken = refreshTokenService.refresh(accessToken, principal, (AuthenticationDetails) loginAuthentication.getDetails());
         CookieUtil.addCookie(response, tokenProperties.getRefreshTokenName(), refreshToken, Integer.parseInt(tokenProperties.getRefreshTokenCookieExpireTime()));
-        CookieUtil.addCookieForLocal(response, tokenProperties.getRefreshTokenName(), refreshToken, Integer.parseInt(tokenProperties.getRefreshTokenCookieExpireTime()));
 
         CookieUtil.addSessionCookie(response, "isLogin", "true");
-        CookieUtil.addSessionCookieForLocal(response, "isLogin", "true");
 
         response.setStatus(HttpStatus.OK.value());
         response.setContentType(MediaType.APPLICATION_JSON_VALUE);

app/src/main/java/fc/be/app/global/config/security/handler/OAuth2AuthenticationSuccessHandler.java

@@ -73,14 +73,11 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
             throw new InternalAuthenticationServiceException(ex.getMessage(), ex);
         }
         CookieUtil.addCookie(response, tokenProperties.getAccessTokenName(), accessToken, Integer.parseInt(tokenProperties.getAccessTokenExpireTime()));
-        CookieUtil.addCookieForLocal(response, tokenProperties.getAccessTokenName(), accessToken, Integer.parseInt(tokenProperties.getAccessTokenExpireTime()));
 
         String refreshToken = refreshTokenService.refresh(accessToken, userPrincipal, (AuthenticationDetails) oauth2Authentication.getDetails());
         CookieUtil.addCookie(response, tokenProperties.getRefreshTokenName(), refreshToken, Integer.parseInt(tokenProperties.getRefreshTokenCookieExpireTime()));
-        CookieUtil.addCookieForLocal(response, tokenProperties.getRefreshTokenName(), refreshToken, Integer.parseInt(tokenProperties.getRefreshTokenCookieExpireTime()));
 
         CookieUtil.addSessionCookie(response, "isLogin", "true");
-        CookieUtil.addSessionCookieForLocal(response, "isLogin", "true");
 
         response.sendRedirect("https://tripvote.site");
     }

app/src/main/java/fc/be/app/global/util/CookieUtil.java

@@ -20,17 +20,6 @@ public static Optional<Cookie> getCookie(HttpServletRequest request, String name
         return Optional.empty();
     }
 
-    public static void addCookie(HttpServletResponse response, String name, String value, int maxAge) {
-        Cookie cookie = new Cookie(name, value);
-        cookie.setPath("/");
-        cookie.setDomain("tripvote.site");
-        cookie.setHttpOnly(true);
-        cookie.setSecure(true);
-        cookie.setAttribute("SameSite", "Lax");
-        cookie.setMaxAge(maxAge);
-        response.addCookie(cookie);
-    }
-
     public static void addCookieNotHttpOnly(HttpServletResponse response, String name, String value, int maxAge) {
         Cookie cookie = new Cookie(name, value);
         cookie.setPath("/");
@@ -42,18 +31,7 @@ public static void addCookieNotHttpOnly(HttpServletResponse response, String nam
         response.addCookie(cookie);
     }
 
-    public static void addSessionCookie(HttpServletResponse response, String name, String value) {
-        Cookie cookie = new Cookie(name, value);
-        cookie.setPath("/");
-        cookie.setDomain("tripvote.site");
-        cookie.setHttpOnly(false);
-        cookie.setSecure(true);
-        cookie.setAttribute("SameSite", "Lax");
-        response.addCookie(cookie);
-    }
-
-    // TODO: Remove before product
-    public static void addCookieForLocal(HttpServletResponse response, String name, String value, int maxAge) {
+    public static void addCookie(HttpServletResponse response, String name, String value, int maxAge) {
         Cookie cookie = new Cookie(name, value);
         cookie.setPath("/");
         cookie.setHttpOnly(true);
@@ -63,17 +41,7 @@ public static void addCookieForLocal(HttpServletResponse response, String name,
         response.addCookie(cookie);
     }
 
-    public static void addCookieNotHttpOnlyForLocal(HttpServletResponse response, String name, String value, int maxAge) {
-        Cookie cookie = new Cookie(name, value);
-        cookie.setPath("/");
-        cookie.setHttpOnly(false);
-        cookie.setSecure(true);
-        cookie.setAttribute("SameSite", "Lax");
-        cookie.setMaxAge(maxAge);
-        response.addCookie(cookie);
-    }
-
-    public static void addSessionCookieForLocal(HttpServletResponse response, String name, String value) {
+    public static void addSessionCookie(HttpServletResponse response, String name, String value) {
         Cookie cookie = new Cookie(name, value);
         cookie.setPath("/");
         cookie.setHttpOnly(false);