[DEV-8] Apply Conventions

src/main/java/com/plzgraduate/myongjigraduatebe/auth/api/signin/SignInController.java

@@ -24,7 +24,7 @@ public class SignInController implements SignInApiPresentation {
 
 	@PostMapping("/sign-in")
 	public TokenResponse signIn(@Valid @RequestBody SignInRequest signInRequest) {
-		return signInUseCase.signIn(signInRequest.toCommand());
+		return signInUseCase.signIn(signInRequest.getAuthId(), signInRequest.getPassword());
 	}
 
 	@GetMapping("/check-login")

src/main/java/com/plzgraduate/myongjigraduatebe/auth/api/signin/dto/request/SignInRequest.java

@@ -2,8 +2,6 @@
 
 import javax.validation.constraints.NotBlank;
 
-import com.plzgraduate.myongjigraduatebe.auth.application.usecase.signin.SignInCommand;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Getter;
@@ -27,11 +25,4 @@ private SignInRequest(String authId, String password) {
 		this.password = password;
 	}
 
-	public SignInCommand toCommand() {
-		return SignInCommand
-			.builder()
-			.authId(authId)
-			.password(password)
-			.build();
-	}
 }

src/main/java/com/plzgraduate/myongjigraduatebe/auth/api/token/TokenApiPresentation.java

@@ -12,5 +12,5 @@
 @Tag(name = "Token", description = "토큰 발급 API")
 public interface TokenApiPresentation {
 
-	AccessTokenResponse newToken(@Valid @RequestBody TokenRequest tokenRequest);
+	AccessTokenResponse createNewToken(@Valid @RequestBody TokenRequest tokenRequest);
 }

src/main/java/com/plzgraduate/myongjigraduatebe/auth/api/token/TokenController.java

@@ -21,7 +21,7 @@ public class TokenController implements TokenApiPresentation {
 	private final TokenUseCase tokenUseCase;
 
 	@PostMapping("/token")
-	public AccessTokenResponse newToken(@Valid @RequestBody TokenRequest tokenRequest) {
-		return tokenUseCase.createNewToken(TokenRequest.toCommand(tokenRequest.getRefreshToken()));
+	public AccessTokenResponse createNewToken(@Valid @RequestBody TokenRequest tokenRequest) {
+		return tokenUseCase.generateNewToken(tokenRequest.getRefreshToken());
 	}
 }

src/main/java/com/plzgraduate/myongjigraduatebe/auth/api/token/dto/request/TokenRequest.java

@@ -2,8 +2,6 @@
 
 import javax.validation.constraints.NotBlank;
 
-import com.plzgraduate.myongjigraduatebe.auth.application.usecase.token.TokenCommand;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Getter;
@@ -22,9 +20,4 @@ private TokenRequest(String refreshToken) {
 		this.refreshToken = refreshToken;
 	}
 
-	public static TokenCommand toCommand(String refreshToken) {
-		return TokenCommand.builder()
-			.refreshToken(refreshToken)
-			.build();
-	}
 }

src/main/java/com/plzgraduate/myongjigraduatebe/auth/application/service/signin/SignInService.java

@@ -5,10 +5,9 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.plzgraduate.myongjigraduatebe.auth.application.usecase.signin.SignInUseCase;
-import com.plzgraduate.myongjigraduatebe.auth.application.usecase.signin.SignInCommand;
 import com.plzgraduate.myongjigraduatebe.auth.api.signin.dto.response.TokenResponse;
 import com.plzgraduate.myongjigraduatebe.auth.application.port.SaveRefreshTokenPort;
+import com.plzgraduate.myongjigraduatebe.auth.application.usecase.signin.SignInUseCase;
 import com.plzgraduate.myongjigraduatebe.auth.security.JwtAuthenticationToken;
 import com.plzgraduate.myongjigraduatebe.auth.security.TokenProvider;
 import com.plzgraduate.myongjigraduatebe.core.meta.UseCase;
@@ -25,18 +24,18 @@ class SignInService implements SignInUseCase {
 	private final SaveRefreshTokenPort saveRefreshTokenPort;
 
 	@Override
-	public TokenResponse signIn(SignInCommand signInCommand) {
-		Authentication authentication = authenticateCommand(signInCommand);
+	public TokenResponse signIn(String authId, String password) {
+		Authentication authentication = authenticateCommand(authId, password);
 		Long userId = (Long) authentication.getPrincipal();
 		String accessToken = tokenProvider.generateToken(userId);
 		String refreshToken = tokenProvider.generateRefreshToken();
 		saveRefreshTokenPort.saveRefreshToken(refreshToken, userId);
 		return TokenResponse.from(accessToken, refreshToken);
 	}
 
-	private Authentication authenticateCommand(SignInCommand signInCommand) {
+	private Authentication authenticateCommand(String authId, String password) {
 		JwtAuthenticationToken authenticationToken =
-			new JwtAuthenticationToken(signInCommand.getAuthId(), signInCommand.getPassword());
+			new JwtAuthenticationToken(authId, password);
 		Authentication authentication = authenticationManager.authenticate(authenticationToken);
 		SecurityContextHolder.getContext().setAuthentication(authentication);
 		return authentication;

src/main/java/com/plzgraduate/myongjigraduatebe/auth/application/service/token/TokenService.java

@@ -1,9 +1,8 @@
 package com.plzgraduate.myongjigraduatebe.auth.application.service.token;
 
 import com.plzgraduate.myongjigraduatebe.auth.api.token.dto.response.AccessTokenResponse;
-import com.plzgraduate.myongjigraduatebe.auth.application.usecase.token.TokenCommand;
-import com.plzgraduate.myongjigraduatebe.auth.application.usecase.token.TokenUseCase;
 import com.plzgraduate.myongjigraduatebe.auth.application.port.FindRefreshTokenPort;
+import com.plzgraduate.myongjigraduatebe.auth.application.usecase.token.TokenUseCase;
 import com.plzgraduate.myongjigraduatebe.auth.security.TokenProvider;
 import com.plzgraduate.myongjigraduatebe.core.meta.UseCase;
 
@@ -17,8 +16,8 @@ public class TokenService implements TokenUseCase {
 
 	private final FindRefreshTokenPort findRefreshTokenPort;
 	@Override
-	public AccessTokenResponse createNewToken(TokenCommand tokenCommand) {
-		Long userId = findByRefreshToken(tokenCommand.getRefreshToken());
+	public AccessTokenResponse generateNewToken(String refreshToken) {
+		Long userId = findByRefreshToken(refreshToken);
 		String accessToken = tokenProvider.generateToken(userId);
 		return AccessTokenResponse.from(accessToken);
 	}

src/main/java/com/plzgraduate/myongjigraduatebe/auth/application/usecase/signin/SignInUseCase.java

@@ -3,5 +3,5 @@
 import com.plzgraduate.myongjigraduatebe.auth.api.signin.dto.response.TokenResponse;
 
 public interface SignInUseCase {
-	TokenResponse signIn(SignInCommand signInCommand);
+	TokenResponse signIn(String authId, String password);
 }

src/main/java/com/plzgraduate/myongjigraduatebe/auth/application/usecase/token/TokenUseCase.java

@@ -3,5 +3,5 @@
 import com.plzgraduate.myongjigraduatebe.auth.api.token.dto.response.AccessTokenResponse;
 
 public interface TokenUseCase {
-	AccessTokenResponse createNewToken(TokenCommand tokenCommand);
+	AccessTokenResponse generateNewToken(String refreshToken);
 }

src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/SearchLectureController.java

@@ -8,7 +8,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter;
-import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureCommand;
 import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.SearchLectureResponse;
 import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureUseCase;
 
@@ -27,6 +26,6 @@ public SearchLectureResponse searchLecture(
 		@RequestParam(defaultValue = "name") String type,
 		@RequestParam @Size(min = 2, message = "검색어를 2자리 이상 입력해주세요.") String keyword
 	) {
-		return searchLectureUseCase.searchLectures(SearchLectureCommand.toCommand(type, keyword));
+		return SearchLectureResponse.from(searchLectureUseCase.searchLectures(type, keyword));
 	}
 }

src/main/java/com/plzgraduate/myongjigraduatebe/lecture/api/dto/response/SearchLectureResponse.java

@@ -1,6 +1,9 @@
 package com.plzgraduate.myongjigraduatebe.lecture.api.dto.response;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
+import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -17,9 +20,9 @@ private SearchLectureResponse(List<LectureResponse> lectures) {
 		this.lectures = lectures;
 	}
 
-	public static SearchLectureResponse from(List<LectureResponse> lectures) {
+	public static SearchLectureResponse from(List<Lecture> lectures) {
 		return SearchLectureResponse.builder()
-			.lectures(lectures)
+			.lectures(lectures.stream().map(LectureResponse::of).collect(Collectors.toList()))
 			.build();
 	}
 }

src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/FindLecturesByLectureCodeService.java → src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/FindLecturesService.java

@@ -5,7 +5,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import com.plzgraduate.myongjigraduatebe.core.meta.UseCase;
-import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesByLectureCodeUseCase;
+import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.FindLecturesUseCase;
 import com.plzgraduate.myongjigraduatebe.lecture.application.port.FindLecturePort;
 import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture;
 
@@ -14,9 +14,15 @@
 @UseCase
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
-public class FindLecturesByLectureCodeService implements FindLecturesByLectureCodeUseCase {
+// FindLecturesByLectureCodeService와 통합하는게 나아보임
+public class FindLecturesService implements FindLecturesUseCase {
 
 	private final FindLecturePort findLecturePort;
+	@Override
+	public List<Lecture> findLecturesByIds(List<Long> lectureIds) {
+		return findLecturePort.findLecturesByIds(lectureIds);
+	}
+
 	@Override
 	public List<Lecture> findLecturesByLectureCodes(List<String> lectureCodes) {
 		return findLecturePort.findLecturesByLectureCodes(lectureCodes);

src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/service/SearchLectureService.java

@@ -1,14 +1,10 @@
 package com.plzgraduate.myongjigraduatebe.lecture.application.service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import com.plzgraduate.myongjigraduatebe.core.meta.UseCase;
-import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureCommand;
-import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.LectureResponse;
-import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.SearchLectureResponse;
-import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureUseCase;
 import com.plzgraduate.myongjigraduatebe.lecture.application.port.SearchLecturePort;
+import com.plzgraduate.myongjigraduatebe.lecture.application.usecase.SearchLectureUseCase;
 import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture;
 
 import lombok.RequiredArgsConstructor;
@@ -18,10 +14,9 @@
 public class SearchLectureService implements SearchLectureUseCase {
 
 	private final SearchLecturePort searchLecturePort;
+
 	@Override
-	public SearchLectureResponse searchLectures(SearchLectureCommand searchLectureCommand) {
-		List<Lecture> lectures = searchLecturePort.searchLectureByNameOrCode(
-			searchLectureCommand.getType(), searchLectureCommand.getKeyword());
-		return SearchLectureResponse.from(lectures.stream().map(LectureResponse::of).collect(Collectors.toList()));
+	public List<Lecture> searchLectures(String type, String keyword) {
+		return searchLecturePort.searchLectureByNameOrCode(type, keyword);
 	}
 }

src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/FindLecturesByLectureCodeUseCase.java → src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/FindLecturesUseCase.java

@@ -4,6 +4,8 @@
 
 import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture;
 
-public interface FindLecturesByLectureCodeUseCase {
+public interface FindLecturesUseCase {
+	List<Lecture> findLecturesByIds(List<Long> lectureIds);
+
 	List<Lecture> findLecturesByLectureCodes(List<String> lectureCodes);
 }

src/main/java/com/plzgraduate/myongjigraduatebe/lecture/application/usecase/SearchLectureUseCase.java

@@ -1,7 +1,9 @@
 package com.plzgraduate.myongjigraduatebe.lecture.application.usecase;
 
-import com.plzgraduate.myongjigraduatebe.lecture.api.dto.response.SearchLectureResponse;
+import java.util.List;
+
+import com.plzgraduate.myongjigraduatebe.lecture.domain.model.Lecture;
 
 public interface SearchLectureUseCase {
-	SearchLectureResponse searchLectures(SearchLectureCommand searchLectureCommand);
+	List<Lecture> searchLectures(String type, String keyword);
 }

src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/ParsingTextController.java

@@ -9,7 +9,6 @@
 import com.plzgraduate.myongjigraduatebe.core.meta.LoginUser;
 import com.plzgraduate.myongjigraduatebe.core.meta.WebAdapter;
 import com.plzgraduate.myongjigraduatebe.parsing.api.dto.request.ParsingTextRequest;
-import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextCommand;
 import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextHistoryUseCase;
 import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextUseCase;
 
@@ -25,12 +24,11 @@ public class ParsingTextController implements ParsingTextApiPresentation{
 
 	@PostMapping
 	public void enrollParsingText(@LoginUser Long userId, @Valid @RequestBody ParsingTextRequest parsingTextRequest) {
-		ParsingTextCommand command = parsingTextRequest.toCommand(userId);
 		try {
-			parsingTextUseCase.enrollParsingText(command);
-			parsingTextHistoryUseCase.saveParsingTextHistoryIfSuccess(command);
+			parsingTextUseCase.enrollParsingText(userId, parsingTextRequest.getParsingText());
+			parsingTextHistoryUseCase.generateSucceedParsingTextHistory(userId, parsingTextRequest.getParsingText());
 		} catch (Exception e) {
-			parsingTextHistoryUseCase.saveParsingTextHistoryIfFail(command);
+			parsingTextHistoryUseCase.generateFailedParsingTextHistory(userId, parsingTextRequest.getParsingText());
 			throw e;
 		}
 	}

src/main/java/com/plzgraduate/myongjigraduatebe/parsing/api/dto/request/ParsingTextRequest.java

@@ -2,8 +2,6 @@
 
 import javax.validation.constraints.NotNull;
 
-import com.plzgraduate.myongjigraduatebe.parsing.application.usecase.ParsingTextCommand;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Getter;
@@ -22,10 +20,4 @@ private ParsingTextRequest(String parsingText) {
 		this.parsingText = parsingText;
 	}
 
-	public ParsingTextCommand toCommand(Long userId) {
-		return ParsingTextCommand.builder()
-			.userId(userId)
-			.parsingText(parsingText)
-			.build();
-	}
 }