test : CI/CD test #9

server/src/main/java/com/main/server/auth/filter/JwtVerificationFilter.java

@@ -34,7 +34,6 @@ protected void doFilterInternal(HttpServletRequest request,
                                     HttpServletResponse response,
                                     FilterChain filterChain) throws ServletException, IOException {
 
-
         try {
             Map<String, Object> claims = verifyJws(request, response);
             setAuthenticationToContext(claims);
@@ -64,16 +63,26 @@ private Map<String, Object> verifyJws(HttpServletRequest request,
             return claims;
         }
 
+        /**
+         * 계정이 있는지 없는지만 검증하고있다.
+         * 스케쥴러가 없어서 RefreshToken을  db에 저장하면 데이터가 정리가 안되고 계속해서 쌓일것.
+         * 보안 필요.
+         */
+
         String jws = request.getHeader("Refresh");
-        Member member = null;
-//                memberRepository.findByEmail(jwtTokenizer.getUsername(jws))
-//                .orElseThrow(() -> new BusinessLogicException(ExceptionCode.INVALID_TOKEN));
+        Member member =
+                memberService.findByEmail(jwtTokenizer.getUsername(jws));
 
         String accessToken =
                 jwtTokenizer.delegateAccessToken(
                         member.getEmail(),
                         authorityUtils.createRoles(member.getEmail()));
+
+        String refreshToken =
+                jwtTokenizer.delegateRefreshToken(member.getEmail());
+
         response.setHeader("Authorization", "Bearer " + accessToken);
+        response.setHeader("Refresh", refreshToken);
 
         Claims claims = jwtTokenizer.getClaims(accessToken).getBody();
         return claims;

server/src/main/java/com/main/server/chat/config/WebSocketConfig.java

@@ -8,7 +8,6 @@
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
-@EnableWebSocket
 @EnableWebSocketMessageBroker
 @RequiredArgsConstructor
 public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {

server/src/main/java/com/main/server/chat/service/ChatroomService.java

@@ -41,13 +41,4 @@ public Chatroom findVerifiedRoomId(Long chatroomId) {
     public Chatroom save(Chatroom chatroom) {
         return chatroomRepository.save(chatroom);
     }
-
-//    public <T> void sendMessage(WebSocketSession session, T message) {
-//        log.info("sendMessage is used");
-//        try {
-//            session.sendMessage(new TextMessage(objectMapper.writeValueAsString(message)));
-//        } catch (IOException e) {
-//            log.error(e.getMessage(), e);
-//        }
-//    }
 }

server/src/main/java/com/main/server/exception/ExceptionCode.java

@@ -9,7 +9,8 @@ public enum ExceptionCode {
     ALREADY_LIKED(400, "board not found"),
     MEMBER_EXISTS(400, "member exists"),
     INVALID_TOKEN(400, "invalid token"),
-    NO_PERMISSION(400, "no permission");
+    NO_PERMISSION(400, "no permission"),
+    PLAYLIST_NOT_FOUND(400, "playlist not found");
 
     @Getter
     private int status;

server/src/main/java/com/main/server/member/entity/Member.java

@@ -5,14 +5,12 @@
 import lombok.*;
 
 import javax.persistence.*;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+
 @Entity
 @Getter
-//@Setter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
- // 주석 = 바꿔야 할 부분
 public class Member extends Auditable {
 
     @Id
@@ -21,24 +19,17 @@ public class Member extends Auditable {
 
     @Column(length = 100, nullable = false, unique = true)
     private String nickname;
-    // length
 
     @Column(length = 100, nullable = false, unique = true)
     private String email;
-    // length
 
     @Column(length = 500)
     private String picture;
 
-//    @Column(length = 1000, nullable = false)
-//    private String password;
-//    // length
-
-    @ElementCollection(fetch = FetchType.EAGER)
+    @ElementCollection(fetch = FetchType.LAZY)
     private List<String> roles = new ArrayList<>();
 
 
-
     @Builder
     public Member( String nickname,
                    String email,
@@ -49,6 +40,4 @@ public Member( String nickname,
         this.picture = picture;
         this.roles = roles;
     }
-
-
 }

server/src/main/java/com/main/server/playlist/controller/PlaylistController.java

@@ -0,0 +1,33 @@
+package com.main.server.playlist.controller;
+
+import com.main.server.playlist.dto.PlaylistCreateDto;
+import com.main.server.playlist.dto.PlaylistResponseDto;
+import com.main.server.playlist.entity.Playlist;
+import com.main.server.playlist.service.PlaylistService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/playlists")
+public class PlaylistController {
+
+    private final PlaylistService playlistService;
+
+    @PostMapping
+    public ResponseEntity createPlaylist(@RequestBody PlaylistCreateDto dto, @AuthenticationPrincipal String email) {
+        Playlist playlist = playlistService.createPlaylist(dto, "admin@google.com");
+
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(PlaylistResponseDto.createByEntity(playlist));
+    }
+
+    @GetMapping("/{playlist-id}")
+    public ResponseEntity getPlaylist(@PathVariable("playlist-id") Long playlistId) {
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(PlaylistResponseDto.createByEntity(playlistService.findPlaylistById(playlistId)));
+    }
+}

server/src/main/java/com/main/server/playlist/dto/PlaylistCreateDto.java

@@ -0,0 +1,20 @@
+package com.main.server.playlist.dto;
+
+import com.main.server.song.dto.SongCreateDto;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PlaylistCreateDto {
+
+    private String title;
+
+    private String thumbnail;
+
+    private List<SongCreateDto> songList;
+}