Merge pull request #23 from One-armed-boy/revert-22-test/webMvc

Revert "Controller 레이어 테스트를 위한 mockMvc 테스트 도입"

src/main/java/com/stream/configuration/SecurityConfig.java

@@ -10,18 +10,15 @@
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
 import com.stream.domain.role.RolesEnum;
-import com.stream.security.jwt.JwtAuthFailFilter;
 import com.stream.security.jwt.JwtAuthenticationFilter;
 
 @Configuration
 public class SecurityConfig {
 	private final JwtAuthenticationFilter jwtAuthenticationFilter;
-	private final JwtAuthFailFilter jwtAuthFailFilter;
 
 	@Autowired
-	public SecurityConfig(JwtAuthenticationFilter jwtAuthenticationFilter, JwtAuthFailFilter jwtAuthFailFilter) {
+	public SecurityConfig(JwtAuthenticationFilter jwtAuthenticationFilter) {
 		this.jwtAuthenticationFilter = jwtAuthenticationFilter;
-		this.jwtAuthFailFilter = jwtAuthFailFilter;
 	}
 
 	@Bean
@@ -35,7 +32,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 		http.csrf(csrf -> csrf.disable())
 			.httpBasic(c -> c.disable())
 			.addFilterAfter(jwtAuthenticationFilter, BasicAuthenticationFilter.class)
-			.addFilterBefore(jwtAuthFailFilter, JwtAuthenticationFilter.class)
 			.authorizeHttpRequests(c -> {
 				c.requestMatchers("/login", "/sign-up").permitAll()
 					.anyRequest()

src/main/java/com/stream/controller/LoginController.java

@@ -10,13 +10,17 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.stream.controller.dto.login.LoginRequest;
-import com.stream.controller.dto.login.LoginResponse;
+import com.stream.domain.member.dto.login.LoginCommand;
 import com.stream.domain.member.dto.login.LoginResult;
 import com.stream.facade.LoginFacade;
 import com.stream.security.jwt.JwtMetadata;
 
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -48,4 +52,35 @@ private ResponseCookie createCookie(LoginResult result) {
 				Duration.ofMillis(result.getAccessTokenExpireMs()))
 			.build();
 	}
+
+	@Getter
+	@ToString
+	public static class LoginRequest {
+		@NotNull(message = "이메일을 입력해주세요.")
+		@Email(message = "유효한 이메일을 입력해주세요.")
+		private String email;
+
+		@NotNull(message = "비밀번호를 입력해주세요.")
+		private String inputPassword;
+
+		@Builder
+		public LoginRequest(String email, String inputPassword) {
+			this.email = email;
+			this.inputPassword = inputPassword;
+		}
+
+		public LoginCommand toCommand() {
+			return LoginCommand.builder().email(email).inputPassword(inputPassword).build();
+		}
+	}
+
+	@Getter
+	@ToString
+	public static class LoginResponse {
+		private String accessToken;
+
+		public LoginResponse(String accessToken) {
+			this.accessToken = accessToken;
+		}
+	}
 }

src/main/java/com/stream/controller/SignupController.java

@@ -1,17 +1,23 @@
 package com.stream.controller;
 
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.stream.controller.dto.signup.SignupRequest;
-import com.stream.controller.dto.signup.SignupResponse;
+import com.stream.domain.member.dto.signup.SignupCommand;
 import com.stream.domain.member.dto.signup.SignupResult;
 import com.stream.facade.SignupFacade;
 
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -32,4 +38,36 @@ public ResponseEntity<SignupResponse> signup(@Valid @RequestBody final SignupReq
 
 		return ResponseEntity.ok().body(new SignupResponse(result.getEmail(), result.getSignupDate()));
 	}
+
+	@Getter
+	@ToString
+	public static class SignupRequest {
+		@NotNull(message = "이메일을 입력해주세요.")
+		@Email(message = "유효한 이메일을 입력해주세요.")
+		private String email;
+
+		@NotNull(message = "비밀번호를 입력해주세요.")
+		private String inputPassword;
+
+		@Builder
+		public SignupRequest(String email, String inputPassword) {
+			this.email = email;
+			this.inputPassword = inputPassword;
+		}
+
+		public SignupCommand toCommand() {
+			return SignupCommand.builder().email(email).password(inputPassword).build();
+		}
+	}
+
+	public static class SignupResponse {
+		private String email;
+		private Date signupDate;
+
+		public SignupResponse(String email, Date signupDate) {
+			this.email = email;
+			this.signupDate = signupDate;
+		}
+	}
+
 }

src/main/java/com/stream/controller/VideoController.java

@@ -1,14 +1,15 @@
 package com.stream.controller;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.stream.controller.dto.video.GetVideoResponse;
-import com.stream.controller.dto.video.ListVideoResponse;
 import com.stream.domain.video.VideoService;
+import com.stream.domain.video.dto.VideoDto;
 
 @RestController
 public class VideoController {
@@ -20,17 +21,14 @@ public VideoController(VideoService videoService) {
 	}
 
 	@GetMapping(path = "/videos")
-	public ResponseEntity<ListVideoResponse> listVideo() {
-		return ResponseEntity.ok()
-			.body(ListVideoResponse.builder()
-				.videos(videoService.listVideo())
-				.build());
+	public ResponseEntity<List<VideoDto>> listVideo() {
+		List<VideoDto> videoDtoList = videoService.listVideo();
+		return ResponseEntity.ok().body(videoDtoList);
 	}
 
 	@GetMapping(path = "/videos", params = "id")
-	public ResponseEntity<GetVideoResponse> getVideo(@RequestParam long id) {
-		return ResponseEntity.ok()
-			.body(GetVideoResponse.convertDtoToResponse(videoService.getVideoMetadata(id)));
+	public ResponseEntity<VideoDto> getVideo(@RequestParam long id) {
+		return ResponseEntity.ok().body(videoService.getVideoMetadata(id));
 
 	}
 }

src/main/java/com/stream/domain/video/VideoService.java

@@ -41,7 +41,7 @@ private Video getVideoById(long id) {
 	}
 
 	@Transactional
-	public List<Video> createVideo(Video... video) {
-		return videoRepository.saveAll(List.of(video));
+	public void createVideo(Video... video) {
+		videoRepository.saveAll(List.of(video));
 	}
 }

src/main/java/com/stream/domain/video/dto/VideoDto.java

@@ -5,15 +5,11 @@
 import com.stream.domain.video.Video;
 
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 @Getter
 @ToString
-@NoArgsConstructor
-@EqualsAndHashCode
 public class VideoDto {
 	private long id;
 	private String fileTag;