Rename SaveParsedDataDbDto to AddSeriesParsedDataDbDto.

Prerequisite for #695

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/dao/SeriesImportDao.java

@@ -20,12 +20,12 @@
 import java.util.Date;
 import java.util.List;
 
+import ru.mystamps.web.dao.dto.AddSeriesParsedDataDbDto;
 import ru.mystamps.web.dao.dto.ImportRequestDto;
 import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
 import ru.mystamps.web.dao.dto.ImportRequestInfo;
 import ru.mystamps.web.dao.dto.ImportSeriesDbDto;
 import ru.mystamps.web.dao.dto.ParsedDataDto;
-import ru.mystamps.web.dao.dto.SaveParsedDataDbDto;
 
 public interface SeriesImportDao {
 	Integer add(ImportSeriesDbDto importRequest);
@@ -40,7 +40,7 @@ void setSeriesIdAndChangeStatus(
 	ImportRequestDto findById(Integer id);
 	void addRawContent(Integer requestId, Date createdAt, Date updatedAt, String content);
 	String findRawContentByRequestId(Integer requestId);
-	void addParsedContent(Integer requestId, SaveParsedDataDbDto data);
+	void addParsedContent(Integer requestId, AddSeriesParsedDataDbDto data);
 	ParsedDataDto findParsedDataByRequestId(Integer requestId, String lang);
 	ImportRequestInfo findRequestInfo(Integer seriesId);
 	List<ImportRequestFullInfo> findAll();

src/main/java/ru/mystamps/web/dao/dto/SaveParsedDataDbDto.java renamed to src/main/java/ru/mystamps/web/dao/dto/AddSeriesParsedDataDbDto.java

@@ -26,7 +26,7 @@
 @Getter
 @Setter
 @ToString(exclude = { "createdAt", "updatedAt" })
-public class SaveParsedDataDbDto {
+public class AddSeriesParsedDataDbDto {
 	private Integer categoryId;
 	private Integer countryId;
 	private String imageUrl;

src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesImportDao.java

@@ -35,12 +35,12 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.SeriesImportDao;
+import ru.mystamps.web.dao.dto.AddSeriesParsedDataDbDto;
 import ru.mystamps.web.dao.dto.ImportRequestDto;
 import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
 import ru.mystamps.web.dao.dto.ImportRequestInfo;
 import ru.mystamps.web.dao.dto.ImportSeriesDbDto;
 import ru.mystamps.web.dao.dto.ParsedDataDto;
-import ru.mystamps.web.dao.dto.SaveParsedDataDbDto;
 
 // it complains that "request_id" is present many times
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
@@ -202,7 +202,7 @@ public String findRawContentByRequestId(Integer requestId) {
 	}
 
 	@Override
-	public void addParsedContent(Integer requestId, SaveParsedDataDbDto data) {
+	public void addParsedContent(Integer requestId, AddSeriesParsedDataDbDto data) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("request_id", requestId);
 		params.put("category_id", data.getCategoryId());

src/main/java/ru/mystamps/web/service/SeriesImportServiceImpl.java

@@ -37,12 +37,12 @@
 import ru.mystamps.web.Db.SeriesImportRequestStatus;
 import ru.mystamps.web.controller.event.ParsingFailed;
 import ru.mystamps.web.dao.SeriesImportDao;
+import ru.mystamps.web.dao.dto.AddSeriesParsedDataDbDto;
 import ru.mystamps.web.dao.dto.ImportRequestDto;
 import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
 import ru.mystamps.web.dao.dto.ImportRequestInfo;
 import ru.mystamps.web.dao.dto.ImportSeriesDbDto;
 import ru.mystamps.web.dao.dto.ParsedDataDto;
-import ru.mystamps.web.dao.dto.SaveParsedDataDbDto;
 import ru.mystamps.web.service.dto.AddSeriesDto;
 import ru.mystamps.web.service.dto.RawParsedDataDto;
 import ru.mystamps.web.service.dto.RequestImportDto;
@@ -164,7 +164,7 @@ public void saveParsedData(Integer requestId, RawParsedDataDto data) {
 		Validate.isTrue(requestId != null, "Request id must be non null");
 		Validate.isTrue(data != null, "Parsed data must be non null");
 
-		SaveParsedDataDbDto processedData = new SaveParsedDataDbDto();
+		AddSeriesParsedDataDbDto processedData = new AddSeriesParsedDataDbDto();
 		processedData.setImageUrl(data.getImageUrl());
 		Date now = new Date();
 		processedData.setCreatedAt(now);

src/test/groovy/ru/mystamps/web/service/SeriesImportServiceImplTest.groovy

@@ -34,10 +34,10 @@ import ru.mystamps.web.Db.SeriesImportRequestStatus
 import ru.mystamps.web.dao.dto.ImportRequestDto
 import ru.mystamps.web.dao.dto.ParsedDataDto
 import ru.mystamps.web.dao.SeriesImportDao
+import ru.mystamps.web.dao.dto.AddSeriesParsedDataDbDto
 import ru.mystamps.web.dao.dto.ImportRequestInfo
 import ru.mystamps.web.dao.dto.ImportSeriesDbDto
 import ru.mystamps.web.dao.dto.ImportRequestFullInfo
-import ru.mystamps.web.dao.dto.SaveParsedDataDbDto
 import ru.mystamps.web.service.dto.AddSeriesDto
 import ru.mystamps.web.service.dto.RawParsedDataDto
 import ru.mystamps.web.tests.DateUtils
@@ -448,7 +448,7 @@ class SeriesImportServiceImplTest extends Specification {
 		then:
 			1 * seriesImportDao.addParsedContent(
 				expectedRequestId,
-				{ SaveParsedDataDbDto saveParsedData ->
+				{ AddSeriesParsedDataDbDto saveParsedData ->
 					assert saveParsedData?.imageUrl == expectedImageUrl
 					assert DateUtils.roughlyEqual(saveParsedData?.createdAt, new Date())
 					assert DateUtils.roughlyEqual(saveParsedData?.updatedAt, new Date())
@@ -494,7 +494,7 @@ class SeriesImportServiceImplTest extends Specification {
 		and:
 			1 * seriesImportDao.addParsedContent(
 				expectedRequestId,
-				{ SaveParsedDataDbDto saveParsedData ->
+				{ AddSeriesParsedDataDbDto saveParsedData ->
 					assert saveParsedData?.categoryId  == expectedCategoryId
 					assert saveParsedData?.countryId   == expectedCountryId
 					assert saveParsedData?.releaseYear == expectedReleaseYear