refactor(SeriesImportService.saveParsedData): modify to accept multiple image URLs

Part of #698

Author: php-coder

src/main/java/ru/mystamps/web/feature/series/importing/RawParsedDataDto.java

@@ -40,11 +40,4 @@ public class RawParsedDataDto {
 	private final String altCurrency;
 	private final String condition;
 
-	// for backward compatibility
-	public String getImageUrl() {
-		if (imageUrls == null || imageUrls.isEmpty()) {
-			return null;
-		}
-		return imageUrls.get(0);
-	}
 }

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportService.java

@@ -37,7 +37,7 @@ Integer addSeries(
 	ImportRequestDto findById(Integer requestId);
 	void saveDownloadedContent(Integer requestId, String content, boolean retry);
 	String getDownloadedContent(Integer requestId);
-	void saveParsedData(Integer requestId, SeriesExtractedInfo seriesInfo, String imageUrl);
+	void saveParsedData(Integer requestId, SeriesExtractedInfo seriesInfo, List<String> imageUrls);
 	SeriesParsedDataDto getParsedData(Integer requestId, String lang);
 	ImportRequestInfo findRequestInfo(Integer seriesId);
 	List<ImportRequestFullInfo> findAll();

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportServiceImpl.java

@@ -174,16 +174,19 @@ public String getDownloadedContent(Integer requestId) {
 		return seriesImportDao.findRawContentByRequestId(requestId);
 	}
 
+	// CheckStyle: ignore LineLength for next 3 lines
 	@Override
 	@Transactional
-	public void saveParsedData(Integer requestId, SeriesExtractedInfo seriesInfo, String imageUrl) {
+	public void saveParsedData(Integer requestId, SeriesExtractedInfo seriesInfo, List<String> imageUrls) {
 		Validate.isTrue(requestId != null, "Request id must be non null");
 		Validate.isTrue(seriesInfo != null, "Series info must be non null");
+		Validate.isTrue(imageUrls != null, "Image URLs must be non null");
 
 		Integer categoryId = getFirstElement(seriesInfo.getCategoryIds());
 		Integer countryId = getFirstElement(seriesInfo.getCountryIds());
 
 		AddSeriesParsedDataDbDto seriesParsedData = new AddSeriesParsedDataDbDto();
+		String imageUrl = getFirstElement(imageUrls);
 		seriesParsedData.setImageUrl(imageUrl);
 		Date now = new Date();
 		seriesParsedData.setCreatedAt(now);
@@ -291,7 +294,7 @@ public List<ImportRequestFullInfo> findAll() {
 		return seriesImportDao.findAll();
 	}
 
-	private static Integer getFirstElement(List<Integer> list) {
+	private static <T> T getFirstElement(List<T> list) {
 		if (list.isEmpty()) {
 			return null;
 		}

src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceededEventListener.java

@@ -104,7 +104,7 @@ public void onApplicationEvent(DownloadingSucceeded event) {
 
 		SeriesExtractedInfo seriesInfo = extractorService.extract(event.getUrl(), data);
 
-		seriesImportService.saveParsedData(requestId, seriesInfo, data.getImageUrl());
+		seriesImportService.saveParsedData(requestId, seriesInfo, data.getImageUrls());
 	}
 
 }

src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy

@@ -472,26 +472,42 @@ class SeriesImportServiceImplTest extends Specification {
 
 	def 'saveParsedData() should throw exception when request id is null'() {
 		when:
-			service.saveParsedData(null, TestObjects.createEmptySeriesExtractedInfo(), Random.url())
+			service.saveParsedData(
+				null,
+				TestObjects.createEmptySeriesExtractedInfo(),
+				Collections.singletonList(Random.url())
+			)
 		then:
 			IllegalArgumentException ex = thrown()
 			ex.message == 'Request id must be non null'
 	}
 
 	def 'saveParsedData() should throw exception when series info is null'() {
 		when:
-			service.saveParsedData(Random.id(), null, Random.url())
+			service.saveParsedData(Random.id(), null, Collections.singletonList(Random.url()))
 		then:
 			IllegalArgumentException ex = thrown()
 			ex.message == 'Series info must be non null'
 	}
 
+	def 'saveParsedData() should throw exception when image urls are null'() {
+		when:
+			service.saveParsedData(Random.id(), TestObjects.createEmptySeriesExtractedInfo(), null)
+		then:
+			IllegalArgumentException ex = thrown()
+			ex.message == 'Image URLs must be non null'
+	}
+	
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
 	def 'saveParsedData() should publish ParsingFailed event when all series fields are empty'() {
 		given:
 			Integer expectedRequestId = Random.id()
 		when:
-			service.saveParsedData(expectedRequestId, TestObjects.createEmptySeriesExtractedInfo(), null)
+			service.saveParsedData(
+				expectedRequestId,
+				TestObjects.createEmptySeriesExtractedInfo(),
+				Collections.emptyList()
+			)
 		then:
 			1 * eventPublisher.publishEvent({ ParsingFailed event ->
 				assert event?.requestId == expectedRequestId
@@ -505,7 +521,11 @@ class SeriesImportServiceImplTest extends Specification {
 			Integer expectedRequestId = Random.id()
 			String expectedImageUrl = Random.url()
 		when:
-			service.saveParsedData(expectedRequestId, TestObjects.createSeriesExtractedInfo(), expectedImageUrl)
+			service.saveParsedData(
+				expectedRequestId,
+				TestObjects.createSeriesExtractedInfo(),
+				Collections.singletonList(expectedImageUrl)
+			)
 		then:
 			1 * seriesImportDao.addParsedData(
 				expectedRequestId,
@@ -524,7 +544,11 @@ class SeriesImportServiceImplTest extends Specification {
 		given:
 			Integer expectedRequestId = Random.id()
 		when:
-			service.saveParsedData(expectedRequestId, TestObjects.createSeriesExtractedInfo(), Random.url())
+			service.saveParsedData(
+				expectedRequestId,
+				TestObjects.createSeriesExtractedInfo(),
+				Collections.singletonList(Random.url())
+			)
 		then:
 			1 * seriesSalesImportService.saveParsedData(
 				expectedRequestId,
@@ -555,7 +579,7 @@ class SeriesImportServiceImplTest extends Specification {
 			BigDecimal expectedPrice     = expectedSeriesInfo.getPrice()
 			String expectedCurrency      = expectedSeriesInfo.getCurrency()
 		when:
-			service.saveParsedData(Random.id(), expectedSeriesInfo, Random.url())
+			service.saveParsedData(Random.id(), expectedSeriesInfo, Collections.singletonList(Random.url()))
 		then:
 			1 * seriesImportDao.addParsedData(
 				_ as Integer,
@@ -588,7 +612,11 @@ class SeriesImportServiceImplTest extends Specification {
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
 	def 'saveParsedData() should change request status'() {
 		when:
-			service.saveParsedData(Random.id(), TestObjects.createEmptySeriesExtractedInfo(), Random.url())
+			service.saveParsedData(
+				Random.id(),
+				TestObjects.createEmptySeriesExtractedInfo(),
+				Collections.singletonList(Random.url())
+			)
 		then:
 			1 * seriesImportDao.changeStatus({ UpdateImportRequestStatusDbDto status ->
 					assert DateUtils.roughlyEqual(status.date, new Date())