refactor(SeriesParsedDataDto): modify to support multiple image URLs

Part of #698

Author: php-coder

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

@@ -48,6 +48,7 @@ public class JdbcSeriesImportDao implements SeriesImportDao {
 	private final String addParsedDataSql;
 	private final String addParsedImageUrlSql;
 	private final String findParsedDataSql;
+	private final String findParsedImageUrlsSql;
 	private final String findRequestInfoSql;
 	private final String findAllSql;
 
@@ -63,6 +64,7 @@ public JdbcSeriesImportDao(Environment env, NamedParameterJdbcTemplate jdbcTempl
 		this.addParsedDataSql              = env.getRequiredProperty("series_import_requests.add_series_parsed_data");
 		this.addParsedImageUrlSql          = env.getRequiredProperty("series_import_requests.add_series_parsed_image_url");
 		this.findParsedDataSql             = env.getRequiredProperty("series_import_requests.find_series_parsed_data_by_request_id");
+		this.findParsedImageUrlsSql        = env.getRequiredProperty("series_import_requests.find_series_parsed_image_urls_by_request_id");
 		this.findRequestInfoSql            = env.getRequiredProperty("series_import_requests.find_request_info_by_series_id");
 		this.findAllSql                    = env.getRequiredProperty("series_import_requests.find_all");
 	}
@@ -252,11 +254,23 @@ public SeriesParsedDataDto findParsedDataByRequestId(Integer requestId, String l
 			params.put("request_id", requestId);
 			params.put("lang", lang);
 
-			return jdbcTemplate.queryForObject(
+			SeriesParsedDataDto parsedData = jdbcTemplate.queryForObject(
 				findParsedDataSql,
 				params,
 				RowMappers::forSeriesParsedDataDto
 			);
+			if (parsedData == null) {
+				return null;
+			}
+			
+			List<String> imageUrls = jdbcTemplate.queryForList(
+				findParsedImageUrlsSql,
+				Collections.singletonMap("request_id", requestId),
+				String.class
+			);
+			parsedData.setImageUrls(imageUrls);
+			
+			return parsedData;
 
 		} catch (EmptyResultDataAccessException ignored) {
 			return null;

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

@@ -57,7 +57,6 @@ private RowMappers() {
 			"country_name"
 		);
 
-		String imageUrl = rs.getString("image_url");
 		Integer releaseDay = JdbcUtils.getInteger(rs, "release_day");
 		Integer releaseMonth = JdbcUtils.getInteger(rs, "release_month");
 		Integer releaseYear = JdbcUtils.getInteger(rs, "release_year");
@@ -68,7 +67,6 @@ private RowMappers() {
 		return new SeriesParsedDataDto(
 			category,
 			country,
-			imageUrl,
 			releaseDay,
 			releaseMonth,
 			releaseYear,

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

@@ -19,18 +19,29 @@
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 import ru.mystamps.web.common.LinkEntityDto;
 
+import java.util.List;
+
 @Getter
 @RequiredArgsConstructor
 public class SeriesParsedDataDto {
 	private final LinkEntityDto category;
 	private final LinkEntityDto country;
-	private final String imageUrl;
 	private final Integer issueDay;
 	private final Integer issueMonth;
 	private final Integer issueYear;
 	private final Integer quantity;
 	private final Boolean perforated;
 	private final String michelNumbers;
+	
+	@Setter
+	private List<String> imageUrls;
+	
+	// for backward compatibility
+	public String getImageUrl() {
+		return imageUrls == null || imageUrls.isEmpty() ? null : imageUrls.get(0);
+	}
+	
 }

src/main/resources/sql/series_import_request_dao_queries.properties

@@ -115,8 +115,7 @@ INSERT \
 VALUES (:request_id, :url)
 
 series_import_requests.find_series_parsed_data_by_request_id = \
-   SELECT (SELECT pu.url FROM series_import_parsed_image_urls pu WHERE pu.request_id = :request_id LIMIT 1) AS image_url \
-        , cat.id AS category_id \
+   SELECT cat.id AS category_id \
         , cat.slug AS category_slug \
         , CASE WHEN 'ru' = :lang THEN COALESCE(cat.name_ru, cat.name) ELSE cat.name END AS category_name \
         , count.id AS country_id \
@@ -135,6 +134,11 @@ LEFT JOIN countries count \
        ON count.id = pd.country_id \
  WHERE pd.request_id = :request_id
 
+series_import_requests.find_series_parsed_image_urls_by_request_id = \
+SELECT url \
+  FROM series_import_parsed_image_urls \
+ WHERE request_id = :request_id
+
 series_import_requests.find_request_info_by_series_id = \
 SELECT id \
      , url \

src/test/java/ru/mystamps/web/service/TestObjects.java

@@ -263,17 +263,18 @@ public static SeriesParsedDataDto createSeriesParsedDataDto() {
 			month = Random.monthOfYear();
 		}
 
-		return new SeriesParsedDataDto(
+		SeriesParsedDataDto dto = new SeriesParsedDataDto(
 			new LinkEntityDto(Random.id(), categorySlug, categoryName),
 			new LinkEntityDto(Random.id(), countrySlug, countryName),
-			Random.url(),
 			day,
 			month,
 			Random.issueYear(),
 			Random.quantity(),
 			Random.perforated(),
 			String.join(",", Random.michelNumbers())
 		);
+		dto.setImageUrls(Collections.singletonList(Random.url()));
+		return dto;
 	}
 
 	public static RawParsedDataDto createRawParsedDataDto() {