Merge pull request #107 from prgrms-web-devcourse-final-project/refactor#106

[refactor] 카카오 리다이렉트 url 매핑 수정 & 배포 설정 변경

Author: seungwookc97

src/main/java/com/back/domain/notification/controller/NotificationController.java

@@ -2,6 +2,10 @@
 
 import com.back.domain.notification.dto.NotificationGoResponseDto;
 import com.back.domain.notification.dto.NotificationListResponseDto;
+import com.back.domain.notification.dto.NotificationSettingDto;
+import com.back.domain.notification.service.NotificationSettingService;
+import com.back.domain.notification.dto.NotificationSettingUpdateRequestDto;
+import jakarta.validation.Valid;
 import com.back.domain.notification.service.NotificationService;
 import com.back.global.rsData.RsData;
 import jakarta.validation.constraints.Max;
@@ -21,6 +25,7 @@
 public class NotificationController {
 
     private final NotificationService notificationService;
+    private final NotificationSettingService notificationSettingService;
 
     @GetMapping("/notifications")
     public RsData<NotificationListResponseDto> getNotifications(
@@ -33,6 +38,23 @@ public RsData<NotificationListResponseDto> getNotifications(
         return RsData.successOf(body);
     }
 
+    @GetMapping("/notification-setting")
+    public RsData<NotificationSettingDto> getMyNotificationSetting(
+            @AuthenticationPrincipal(expression = "id") Long userId
+    ) {
+        NotificationSettingDto body = notificationSettingService.getMySetting(userId);
+        return RsData.successOf(body);
+    }
+
+    @PatchMapping("/notification-setting")
+    public RsData<NotificationSettingDto> setMyNotificationSetting(
+            @AuthenticationPrincipal(expression = "id") Long userId,
+            @Valid @RequestBody NotificationSettingUpdateRequestDto req
+    ) {
+        NotificationSettingDto body = notificationSettingService.setMySetting(userId, req.enabled());
+        return RsData.successOf(body);
+    }
+
     @PostMapping("/notifications/{id}")
     public RsData<NotificationGoResponseDto> goPostLink(
             @AuthenticationPrincipal(expression = "id") Long userId,

src/main/java/com/back/domain/notification/dto/NotificationSettingDto.java

@@ -0,0 +1,16 @@
+package com.back.domain.notification.dto;
+
+import com.back.domain.notification.entity.NotificationSetting;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class NotificationSettingDto {
+    private boolean enabled;
+
+    public static NotificationSettingDto from(NotificationSetting s) {
+        return new NotificationSettingDto(s.isEnabled());
+    }
+}
+

src/main/java/com/back/domain/notification/dto/NotificationSettingUpdateRequestDto.java

@@ -0,0 +1,8 @@
+package com.back.domain.notification.dto;
+
+import jakarta.validation.constraints.NotNull;
+
+public record NotificationSettingUpdateRequestDto(
+        @NotNull Boolean enabled
+) {}
+

src/main/java/com/back/domain/notification/entity/NotificationSetting.java

@@ -0,0 +1,44 @@
+package com.back.domain.notification.entity;
+
+import com.back.domain.user.entity.User;
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@Getter
+@Setter
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+public class NotificationSetting {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Setter
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false, unique = true)
+    private User user;
+
+    @Setter
+    @Builder.Default
+    private boolean enabled = true;
+
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    private LocalDateTime updatedAt;
+
+    public void toggle() {
+        this.enabled = !this.enabled;
+    }
+
+}

src/main/java/com/back/domain/notification/repository/NotificationSettingRepository.java

@@ -0,0 +1,18 @@
+package com.back.domain.notification.repository;
+
+import com.back.domain.notification.entity.NotificationSetting;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface NotificationSettingRepository extends JpaRepository<NotificationSetting, Long> {
+
+    @Query("""
+        select ns from NotificationSetting ns
+         where ns.user.id = :userId
+    """)
+    NotificationSetting findByUserId(@Param("userId") Long userId);
+}
+

src/main/java/com/back/domain/notification/service/NotificationSettingService.java

@@ -0,0 +1,46 @@
+package com.back.domain.notification.service;
+
+import com.back.domain.notification.dto.NotificationSettingDto;
+import com.back.domain.notification.entity.NotificationSetting;
+import com.back.domain.notification.repository.NotificationSettingRepository;
+import com.back.domain.user.entity.User;
+import com.back.domain.user.repository.UserRepository;
+import com.back.global.exception.ServiceException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class NotificationSettingService {
+
+    private final NotificationSettingRepository notificationSettingRepository;
+    private final UserRepository userRepository;
+
+    @Transactional(readOnly = true)
+    public NotificationSettingDto getMySetting(Long userId) {
+        NotificationSetting s = notificationSettingRepository.findByUserId(userId);
+        if (s == null) {
+            // Default when not created yet
+            return new NotificationSettingDto(true);
+        }
+        return NotificationSettingDto.from(s);
+    }
+
+    @Transactional
+    public NotificationSettingDto setMySetting(Long userId, boolean enabled) {
+        NotificationSetting s = notificationSettingRepository.findByUserId(userId);
+        if (s == null) {
+            User user = userRepository.findById(userId)
+                    .orElseThrow(() -> new ServiceException(404, "사용자를 찾을 수 없습니다."));
+            s = NotificationSetting.builder()
+                    .user(user)
+                    .enabled(enabled)
+                    .build();
+        } else {
+            s.setEnabled(enabled);
+        }
+        NotificationSetting saved = notificationSettingRepository.save(s);
+        return NotificationSettingDto.from(saved);
+    }
+}

src/main/java/com/back/global/jwt/refreshToken/service/RefreshTokenService.java

@@ -25,6 +25,7 @@ public class RefreshTokenService {
     private long refreshTokenExpiration;
 
     // 기존 리프레시 토큰 삭제하고 생성
+    @Transactional
     public String generateRefreshToken(Long userId, String email) {
         // 기존 토큰 삭제
         refreshTokenRepository.deleteByUserId(userId);
@@ -53,6 +54,7 @@ public boolean validateToken(String token) {
     }
 
     //기존 토큰 지우고 발급(회전)
+    @Transactional
     public String rotateToken(String oldToken) {
         Optional<RefreshToken> oldRefreshToken = refreshTokenRepository.findByToken(oldToken);
 
@@ -67,6 +69,7 @@ public String rotateToken(String oldToken) {
     }
 
     //삭제
+    @Transactional
     public void revokeToken(String token) {
         refreshTokenRepository.deleteByToken(token);
     }

src/main/java/com/back/global/security/CustomOAuth2LoginSuccessHandler.java

@@ -24,7 +24,6 @@ public class CustomOAuth2LoginSuccessHandler implements AuthenticationSuccessHan
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
         SecurityUser securityUser = (SecurityUser) authentication.getPrincipal();
-
         // Access Token과 Refresh Token 발급
         userAuthService.issueTokens(response, securityUser.getId(), securityUser.getEmail(), securityUser.getNickname());
 

src/main/java/com/back/global/security/SecurityConfig.java

@@ -1,5 +1,6 @@
 package com.back.global.security;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -18,6 +19,12 @@
 @EnableWebSecurity
 public class SecurityConfig {
 
+    @Value("${custom.site.frontUrl}")
+    private String frontUrl;
+
+    @Value("${custom.site.backUrl}")
+    private String backUrl;
+
     private final CustomOAuth2UserService customOAuth2UserService;
     private final CustomOAuth2LoginSuccessHandler oauth2SuccessHandler;
     private final CustomOAuth2LoginFailureHandler oauth2FailureHandler;
@@ -46,18 +53,16 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .authorizeHttpRequests(auth -> auth
                         .requestMatchers("/").permitAll()
                         .requestMatchers("/h2-console/**").permitAll()
+                        .requestMatchers("/actuator/**").permitAll()
                         .requestMatchers("/oauth2/**").permitAll()
                         .requestMatchers("/login/oauth2/**").permitAll()
                         .requestMatchers("/swagger-ui/**", "/api-docs/**").permitAll()
-                        .requestMatchers("/api/user/**").permitAll()
-                        .requestMatchers("/api/cocktail/**").permitAll()
-                        .requestMatchers("/api/chatbot/**").permitAll()
-                        .requestMatchers("/api/cocktails/**").permitAll()
-
+                        .requestMatchers("/user/**").permitAll()
+                        .requestMatchers("/cocktails/**").permitAll()
+                        .requestMatchers("/chatbot/**").permitAll()
 
                         // 회원 or 인증된 사용자만 가능
-                        .requestMatchers("/api/admin/**").hasRole("ADMIN")
-//                        .requestMatchers("/api/cocktail/detail~~").authenticated()
+                        .requestMatchers("/admin/**").hasRole("ADMIN")
 
                         //그 외에는 인증해야함
                         .anyRequest().authenticated()
@@ -95,9 +100,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
         configuration.setAllowedOrigins(Arrays.asList(
-                "http://localhost:3000",
-                "http://localhost:8080"
-                //나중에 운영환경 추가
+                frontUrl,
+                backUrl
         ));
         configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
         configuration.setAllowedHeaders(Arrays.asList("*"));

src/main/resources/application-prod.yml

@@ -19,7 +19,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: create-drop
     properties:
       hibernate:
         show_sql: false