diff --git a/src/main/java/com/stream/controller/LoginController.java b/src/main/java/com/stream/controller/LoginController.java index aec1004..5b5070f 100644 --- a/src/main/java/com/stream/controller/LoginController.java +++ b/src/main/java/com/stream/controller/LoginController.java @@ -18,15 +18,15 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; +import lombok.ToString; import lombok.extern.slf4j.Slf4j; @Slf4j @RestController public class LoginController { - private LoginFacade loginFacade; + private final LoginFacade loginFacade; @Autowired public LoginController(LoginFacade loginFacade) { @@ -53,8 +53,8 @@ private ResponseCookie createCookie(LoginResult result) { .build(); } - @Builder @Getter + @ToString public static class LoginRequest { @NotNull(message = "이메일을 입력해주세요.") @Email(message = "유효한 이메일을 입력해주세요.") @@ -63,14 +63,24 @@ public static class LoginRequest { @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 - @AllArgsConstructor + @ToString public static class LoginResponse { private String accessToken; + + public LoginResponse(String accessToken) { + this.accessToken = accessToken; + } } } diff --git a/src/main/java/com/stream/controller/SignupController.java b/src/main/java/com/stream/controller/SignupController.java index 0b71f64..d64ae21 100644 --- a/src/main/java/com/stream/controller/SignupController.java +++ b/src/main/java/com/stream/controller/SignupController.java @@ -15,15 +15,15 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; +import lombok.ToString; import lombok.extern.slf4j.Slf4j; @Slf4j @RestController public class SignupController { - private SignupFacade signupFacade; + private final SignupFacade signupFacade; @Autowired public SignupController(SignupFacade signupFacade) { @@ -39,8 +39,8 @@ public ResponseEntity signup(@Valid @RequestBody final SignupReq return ResponseEntity.ok().body(new SignupResponse(result.getEmail(), result.getSignupDate())); } - @Builder @Getter + @ToString public static class SignupRequest { @NotNull(message = "이메일을 입력해주세요.") @Email(message = "유효한 이메일을 입력해주세요.") @@ -49,15 +49,25 @@ public static class SignupRequest { @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(); } } - @AllArgsConstructor public static class SignupResponse { private String email; private Date signupDate; + + public SignupResponse(String email, Date signupDate) { + this.email = email; + this.signupDate = signupDate; + } } } diff --git a/src/main/java/com/stream/domain/member/Member.java b/src/main/java/com/stream/domain/member/Member.java index 8a74da8..732fb92 100644 --- a/src/main/java/com/stream/domain/member/Member.java +++ b/src/main/java/com/stream/domain/member/Member.java @@ -15,13 +15,14 @@ import jakarta.persistence.Table; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) @Table(name = "members") -@NoArgsConstructor @Getter public class Member { @Id diff --git a/src/main/java/com/stream/domain/member/MemberService.java b/src/main/java/com/stream/domain/member/MemberService.java index aea4851..296535e 100644 --- a/src/main/java/com/stream/domain/member/MemberService.java +++ b/src/main/java/com/stream/domain/member/MemberService.java @@ -12,7 +12,7 @@ @Service @Transactional(readOnly = true) public class MemberService { - private MemberRepository memberRepository; + private final MemberRepository memberRepository; @Autowired public MemberService(MemberRepository memberRepository) { diff --git a/src/main/java/com/stream/domain/member/dto/CreateMemberCommand.java b/src/main/java/com/stream/domain/member/dto/CreateMemberCommand.java index d0f5e09..91a9566 100644 --- a/src/main/java/com/stream/domain/member/dto/CreateMemberCommand.java +++ b/src/main/java/com/stream/domain/member/dto/CreateMemberCommand.java @@ -4,11 +4,19 @@ import lombok.Builder; import lombok.Getter; +import lombok.ToString; -@Builder @Getter +@ToString public class CreateMemberCommand { private String email; private String encryptedPassword; private Role role; + + @Builder + public CreateMemberCommand(String email, String encryptedPassword, Role role) { + this.email = email; + this.encryptedPassword = encryptedPassword; + this.role = role; + } } diff --git a/src/main/java/com/stream/domain/member/dto/login/LoginCommand.java b/src/main/java/com/stream/domain/member/dto/login/LoginCommand.java index d821a8c..02b81d7 100644 --- a/src/main/java/com/stream/domain/member/dto/login/LoginCommand.java +++ b/src/main/java/com/stream/domain/member/dto/login/LoginCommand.java @@ -2,10 +2,17 @@ import lombok.Builder; import lombok.Getter; +import lombok.ToString; -@Builder @Getter +@ToString public class LoginCommand { private String email; private String inputPassword; + + @Builder + public LoginCommand(String email, String inputPassword) { + this.email = email; + this.inputPassword = inputPassword; + } } diff --git a/src/main/java/com/stream/domain/member/dto/login/LoginResult.java b/src/main/java/com/stream/domain/member/dto/login/LoginResult.java index 5a1c038..b407a76 100644 --- a/src/main/java/com/stream/domain/member/dto/login/LoginResult.java +++ b/src/main/java/com/stream/domain/member/dto/login/LoginResult.java @@ -1,11 +1,16 @@ package com.stream.domain.member.dto.login; -import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.ToString; @Getter -@AllArgsConstructor +@ToString public class LoginResult { private String accessToken; private int accessTokenExpireMs; + + public LoginResult(String accessToken, int accessTokenExpireMs) { + this.accessToken = accessToken; + this.accessTokenExpireMs = accessTokenExpireMs; + } } diff --git a/src/main/java/com/stream/domain/member/dto/signup/SignupCommand.java b/src/main/java/com/stream/domain/member/dto/signup/SignupCommand.java index 6abbafd..1070915 100644 --- a/src/main/java/com/stream/domain/member/dto/signup/SignupCommand.java +++ b/src/main/java/com/stream/domain/member/dto/signup/SignupCommand.java @@ -2,10 +2,17 @@ import lombok.Builder; import lombok.Getter; +import lombok.ToString; -@Builder @Getter +@ToString public class SignupCommand { private String email; private String password; + + @Builder + public SignupCommand(String email, String password) { + this.email = email; + this.password = password; + } } diff --git a/src/main/java/com/stream/domain/role/Role.java b/src/main/java/com/stream/domain/role/Role.java index 3abe947..e7a3078 100644 --- a/src/main/java/com/stream/domain/role/Role.java +++ b/src/main/java/com/stream/domain/role/Role.java @@ -8,12 +8,13 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; +import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) @Table(name = "roles") -@NoArgsConstructor @Getter public class Role { @Id diff --git a/src/main/java/com/stream/domain/role/RoleService.java b/src/main/java/com/stream/domain/role/RoleService.java index 8b4b9cf..7fb2b3a 100644 --- a/src/main/java/com/stream/domain/role/RoleService.java +++ b/src/main/java/com/stream/domain/role/RoleService.java @@ -10,7 +10,7 @@ @Service @Transactional(readOnly = true) public class RoleService { - private RoleRepository roleRepository; + private final RoleRepository roleRepository; @Autowired public RoleService(RoleRepository roleRepository) { diff --git a/src/main/java/com/stream/domain/role/dto/CreateRoleCommand.java b/src/main/java/com/stream/domain/role/dto/CreateRoleCommand.java index 615d142..9f29ed9 100644 --- a/src/main/java/com/stream/domain/role/dto/CreateRoleCommand.java +++ b/src/main/java/com/stream/domain/role/dto/CreateRoleCommand.java @@ -2,11 +2,15 @@ import com.stream.domain.role.RolesEnum; -import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.ToString; -@AllArgsConstructor @Getter +@ToString public class CreateRoleCommand { private RolesEnum roleName; + + public CreateRoleCommand(RolesEnum rolesEnum) { + this.roleName = rolesEnum; + } } diff --git a/src/main/java/com/stream/domain/video/Video.java b/src/main/java/com/stream/domain/video/Video.java index 6a7c5f8..6af712f 100644 --- a/src/main/java/com/stream/domain/video/Video.java +++ b/src/main/java/com/stream/domain/video/Video.java @@ -13,13 +13,14 @@ import jakarta.persistence.Table; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) @Table(name = "videos") -@NoArgsConstructor @Getter public class Video { @Id diff --git a/src/main/java/com/stream/domain/video/dto/UploadVideoDto.java b/src/main/java/com/stream/domain/video/dto/UploadVideoDto.java index a86442c..e5ad290 100644 --- a/src/main/java/com/stream/domain/video/dto/UploadVideoDto.java +++ b/src/main/java/com/stream/domain/video/dto/UploadVideoDto.java @@ -3,15 +3,21 @@ import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; +import lombok.ToString; -@Builder @Getter +@ToString public class UploadVideoDto { @NotNull(message = "확장자를 제외한 파일명을 입력해주세요. (ex. ~)") private String fileName; - @NotNull(message = "확장자를 입력해주세요. (ex. MOV)") private String extension; - private String description; + + @Builder + public UploadVideoDto(String fileName, String extension, String description) { + this.fileName = fileName; + this.extension = extension; + this.description = description; + } } diff --git a/src/main/java/com/stream/domain/video/dto/VideoDto.java b/src/main/java/com/stream/domain/video/dto/VideoDto.java index 01eb17a..0a873b0 100644 --- a/src/main/java/com/stream/domain/video/dto/VideoDto.java +++ b/src/main/java/com/stream/domain/video/dto/VideoDto.java @@ -4,16 +4,12 @@ import com.stream.domain.video.Video; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; -import lombok.NoArgsConstructor; +import lombok.ToString; -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor -@Builder @Getter +@ToString public class VideoDto { private long id; private String fileTag; @@ -22,6 +18,16 @@ public class VideoDto { private String description; private Date createdAt; + @Builder + public VideoDto(long id, String fileTag, String extension, long size, String description, Date createdAt) { + this.id = id; + this.fileTag = fileTag; + this.extension = extension; + this.size = size; + this.description = description; + this.createdAt = createdAt; + } + public static VideoDto convertDomainToDto(Video video) { return VideoDto.builder() .id(video.getId()) diff --git a/src/main/java/com/stream/facade/LoginFacade.java b/src/main/java/com/stream/facade/LoginFacade.java index e897327..374f607 100644 --- a/src/main/java/com/stream/facade/LoginFacade.java +++ b/src/main/java/com/stream/facade/LoginFacade.java @@ -18,9 +18,9 @@ @Service public class LoginFacade { - private MemberService memberService; - private PasswordEncoder passwordEncoder; - private JwtManager jwtManager; + private final MemberService memberService; + private final PasswordEncoder passwordEncoder; + private final JwtManager jwtManager; @Autowired public LoginFacade(MemberService memberService, PasswordEncoder passwordEncoder, JwtManager jwtManager) { diff --git a/src/main/java/com/stream/facade/SignupFacade.java b/src/main/java/com/stream/facade/SignupFacade.java index b0db742..bc2182f 100644 --- a/src/main/java/com/stream/facade/SignupFacade.java +++ b/src/main/java/com/stream/facade/SignupFacade.java @@ -15,9 +15,9 @@ @Service public class SignupFacade { - private MemberService memberService; - private RoleService roleService; - private PasswordEncoder passwordEncoder; + private final MemberService memberService; + private final RoleService roleService; + private final PasswordEncoder passwordEncoder; @Autowired public SignupFacade(MemberService memberService, RoleService roleService, PasswordEncoder passwordEncoder) { diff --git a/src/main/java/com/stream/security/jwt/DecodedJwtAccessToken.java b/src/main/java/com/stream/security/jwt/DecodedJwtAccessToken.java index d1a46e1..e063f37 100644 --- a/src/main/java/com/stream/security/jwt/DecodedJwtAccessToken.java +++ b/src/main/java/com/stream/security/jwt/DecodedJwtAccessToken.java @@ -2,12 +2,17 @@ import com.stream.domain.role.Role; -import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.ToString; @Getter -@AllArgsConstructor +@ToString public class DecodedJwtAccessToken { private String email; private Role role; + + public DecodedJwtAccessToken(String email, Role role) { + this.email = email; + this.role = role; + } } diff --git a/src/main/java/com/stream/security/jwt/JwtAuthenticationFilter.java b/src/main/java/com/stream/security/jwt/JwtAuthenticationFilter.java index df8d47f..ea2bca3 100644 --- a/src/main/java/com/stream/security/jwt/JwtAuthenticationFilter.java +++ b/src/main/java/com/stream/security/jwt/JwtAuthenticationFilter.java @@ -47,7 +47,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse SecurityContextHolder.getContext().setAuthentication(auth); logger.debug( - "Jwt Auth Success (path: " + request.getServletPath() + ", email: " + email + ", role: " + roleName + " )"); + "Jwt Auth Success (path: " + request.getServletPath() + " token: " + decodedToken + " )"); filterChain.doFilter(request, response); } diff --git a/src/test/java/com/stream/domain/member/MemberServiceTest.java b/src/test/java/com/stream/domain/member/MemberServiceTest.java index c202a9d..d1b66b7 100644 --- a/src/test/java/com/stream/domain/member/MemberServiceTest.java +++ b/src/test/java/com/stream/domain/member/MemberServiceTest.java @@ -22,11 +22,11 @@ @SpringBootTest public class MemberServiceTest { - private MemberService memberService; - private MemberRepository memberRepository; - private RoleService roleService; - private RoleRepository roleRepository; - private PasswordEncoder passwordEncoder; + private final MemberService memberService; + private final MemberRepository memberRepository; + private final RoleService roleService; + private final RoleRepository roleRepository; + private final PasswordEncoder passwordEncoder; @Autowired public MemberServiceTest(MemberService memberService, MemberRepository memberRepository, RoleService roleService, diff --git a/src/test/java/com/stream/domain/video/VideoServiceTest.java b/src/test/java/com/stream/domain/video/VideoServiceTest.java index ce350e1..6066898 100644 --- a/src/test/java/com/stream/domain/video/VideoServiceTest.java +++ b/src/test/java/com/stream/domain/video/VideoServiceTest.java @@ -15,8 +15,8 @@ @SpringBootTest class VideoServiceTest { - private VideoService videoService; - private VideoRepository videoRepository; + private final VideoService videoService; + private final VideoRepository videoRepository; @Autowired public VideoServiceTest(VideoService videoService, VideoRepository videoRepository) { diff --git a/src/test/java/com/stream/facade/LoginFacadeTest.java b/src/test/java/com/stream/facade/LoginFacadeTest.java index 2f0a1b0..210caa4 100644 --- a/src/test/java/com/stream/facade/LoginFacadeTest.java +++ b/src/test/java/com/stream/facade/LoginFacadeTest.java @@ -24,11 +24,11 @@ @SpringBootTest public class LoginFacadeTest { - private LoginFacade loginFacade; - private SignupFacade signupFacade; - private MemberService memberService; - private MemberRepository memberRepository; - private RoleRepository roleRepository; + private final LoginFacade loginFacade; + private final SignupFacade signupFacade; + private final MemberService memberService; + private final MemberRepository memberRepository; + private final RoleRepository roleRepository; @Autowired public LoginFacadeTest(LoginFacade loginFacade, SignupFacade signupFacade, MemberService memberService, diff --git a/src/test/java/com/stream/facade/SignupFacadeTest.java b/src/test/java/com/stream/facade/SignupFacadeTest.java index ddf988c..3a2e315 100644 --- a/src/test/java/com/stream/facade/SignupFacadeTest.java +++ b/src/test/java/com/stream/facade/SignupFacadeTest.java @@ -21,11 +21,11 @@ @SpringBootTest public class SignupFacadeTest { - private SignupFacade signupFacade; - private MemberService memberService; - private MemberRepository memberRepository; - private RoleRepository roleRepository; - private PasswordEncoder passwordEncoder; + private final SignupFacade signupFacade; + private final MemberService memberService; + private final MemberRepository memberRepository; + private final RoleRepository roleRepository; + private final PasswordEncoder passwordEncoder; @Autowired public SignupFacadeTest(SignupFacade signupFacade, MemberService memberService, MemberRepository memberRepository, diff --git a/src/test/java/com/stream/facade/StreamingFacadeTest.java b/src/test/java/com/stream/facade/StreamingFacadeTest.java index 9a396d7..50f20ce 100644 --- a/src/test/java/com/stream/facade/StreamingFacadeTest.java +++ b/src/test/java/com/stream/facade/StreamingFacadeTest.java @@ -17,16 +17,14 @@ @SpringBootTest public class StreamingFacadeTest { - private StreamingFacade streamingFacade; - private VideoService videoService; - private VideoRepository videoRepository; + private final StreamingFacade streamingFacade; + private final VideoRepository videoRepository; @Autowired - public StreamingFacadeTest(VideoService videoService, VideoRepository videoRepository) { + public StreamingFacadeTest(VideoRepository videoRepository, VideoService videoService) { this.videoRepository = videoRepository; - this.videoService = videoService; StorageStrategy storageStrategy = new DummyStorageStrategy(); - this.streamingFacade = new StreamingFacade(this.videoService, storageStrategy); + this.streamingFacade = new StreamingFacade(videoService, storageStrategy); } @AfterEach diff --git a/src/test/java/com/stream/facade/UploadFacadeTest.java b/src/test/java/com/stream/facade/UploadFacadeTest.java index 00bd430..82ab7fa 100644 --- a/src/test/java/com/stream/facade/UploadFacadeTest.java +++ b/src/test/java/com/stream/facade/UploadFacadeTest.java @@ -20,16 +20,14 @@ @SpringBootTest public class UploadFacadeTest { - private VideoService videoService; - private VideoRepository videoRepository; - private UploadFacade uploadFacade; + private final VideoRepository videoRepository; + private final UploadFacade uploadFacade; @Autowired - public UploadFacadeTest(VideoService videoService, VideoRepository videoRepository) { + public UploadFacadeTest(VideoRepository videoRepository, VideoService videoService) { this.videoRepository = videoRepository; - this.videoService = videoService; StorageStrategy storageStrategy = new DummyStorageStrategy(); - this.uploadFacade = new UploadFacade(this.videoService, storageStrategy); + this.uploadFacade = new UploadFacade(videoService, storageStrategy); } @AfterEach diff --git a/src/test/java/com/stream/security/jwt/JwtManagerTest.java b/src/test/java/com/stream/security/jwt/JwtManagerTest.java index 0d0708f..e5264d0 100644 --- a/src/test/java/com/stream/security/jwt/JwtManagerTest.java +++ b/src/test/java/com/stream/security/jwt/JwtManagerTest.java @@ -11,7 +11,7 @@ @SpringBootTest public class JwtManagerTest { - private JwtManager jwtManager; + private final JwtManager jwtManager; @Autowired public JwtManagerTest(JwtManager jwtManager) {