Merge pull request #27 from Drink-Easy/feature/tastingNote2

#1 Refactor : tasting note 저장시 member 저장 안되는 것 및 노트조회 수정, SecurityConfig 인가 추가
Drink-Easy · Aug 11, 2024 · 0225ed6 · 0225ed6
2 parents ad38641 + bc9aa52
commit 0225ed6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/com/drinkeg/drinkeg/config/SecurityConfig.java b/src/main/java/com/drinkeg/drinkeg/config/SecurityConfig.java
@@ -98,12 +98,20 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         //.requestMatchers("/my").authenticated()
                         .requestMatchers("/", "/join", "/login").permitAll()
 
+                        // tasting note 인가
+                        .requestMatchers("tasting-note/**").hasRole("USER")
+
+                        // wine note 인가
+                        .requestMatchers(HttpMethod.GET, "wine-note/**").permitAll()
+                        .requestMatchers(HttpMethod.POST, "wine-note/**").hasRole("USER")
+                        .requestMatchers(HttpMethod.PATCH, "wine-note/**").hasRole("USER")
+
                         // wine class 인가
                         .requestMatchers(HttpMethod.POST, "wine-class/**").hasRole("ADMIN")
                         .requestMatchers(HttpMethod.PUT, "wine-class/**").hasRole("ADMIN")
                         .requestMatchers(HttpMethod.DELETE, "wine-class/**").hasRole("ADMIN")
 
-                        .requestMatchers("/", "/join", "/login","/reissue").permitAll()
+                        .requestMatchers("/", "/join", "/login", "/reissue").permitAll()
                         .requestMatchers("/api-docs/**", "/swagger-ui/**", "/swagger-ui.html/**", "/v3/api-docs/**", "/swagger-ui/index.html#/**").permitAll()
                         .anyRequest().authenticated());
 

diff --git a/src/main/java/com/drinkeg/drinkeg/converter/TastingNoteConverter.java b/src/main/java/com/drinkeg/drinkeg/converter/TastingNoteConverter.java
@@ -14,6 +14,8 @@ public class TastingNoteConverter {
     // NotNull은 null이 아님을 보장하는 어노테이션
     public static TastingNote toTastingNoteEntity(NoteRequestDTO noteRequestDTO, @NotNull Member member, @NotNull Wine wine) {
         return TastingNote.builder()
+                .member(member)
+
                 .wine(wine)
                 .color(noteRequestDTO.getColor())
 
@@ -60,6 +62,7 @@ public static NoteResponseDTO toTastingNoteResponseDTO(TastingNote tastingNote)
     // TastingNote Entity를 NotePriviewResponseDTO로 변환
     public static NotePriviewResponseDTO toTastingNotePreviewDTO(TastingNote tastingNote) {
         return NotePriviewResponseDTO.builder()
+                .noteId(tastingNote.getId())
                 .name(tastingNote.getWine().getName())
                 .picture(tastingNote.getWine().getPicture())
                 .build();