task: save parsed image URLs into series_import_parsed_image_urls table instead of the series_import_parsed_data.image_url field

Part of #698

Author: php-coder

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

@@ -22,10 +22,12 @@
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import ru.mystamps.web.common.JdbcUtils;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -44,6 +46,7 @@ public class JdbcSeriesImportDao implements SeriesImportDao {
 	private final String addRawContentSql;
 	private final String findRawContentSql;
 	private final String addParsedDataSql;
+	private final String addParsedImageUrlSql;
 	private final String findParsedDataSql;
 	private final String findRequestInfoSql;
 	private final String findAllSql;
@@ -58,6 +61,7 @@ public JdbcSeriesImportDao(Environment env, NamedParameterJdbcTemplate jdbcTempl
 		this.addRawContentSql              = env.getRequiredProperty("series_import_requests.add_raw_content");
 		this.findRawContentSql             = env.getRequiredProperty("series_import_requests.find_raw_content_by_request_id");
 		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.findRequestInfoSql            = env.getRequiredProperty("series_import_requests.find_request_info_by_series_id");
 		this.findAllSql                    = env.getRequiredProperty("series_import_requests.find_all");
@@ -185,9 +189,6 @@ public void addParsedData(Integer requestId, AddSeriesParsedDataDbDto data) {
 		params.put("request_id", requestId);
 		params.put("category_id", data.getCategoryId());
 		params.put("country_id", data.getCountryId());
-		List<String> imageUrls = data.getImageUrls();
-		String imageUrl = imageUrls == null || imageUrls.isEmpty() ? null : imageUrls.get(0);
-		params.put("image_url", imageUrl);
 		params.put("release_day", data.getReleaseDay());
 		params.put("release_month", data.getReleaseMonth());
 		params.put("release_year", data.getReleaseYear());
@@ -205,6 +206,43 @@ public void addParsedData(Integer requestId, AddSeriesParsedDataDbDto data) {
 			requestId,
 			affected
 		);
+		
+		// for backward compatibility
+		addParsedImageUrls(requestId, data.getImageUrls());
+	}
+	
+	@Override
+	@SuppressWarnings("checkstyle:linelength")
+	public void addParsedImageUrls(Integer requestId, List<String> imageUrls) {
+		if (imageUrls == null || imageUrls.isEmpty()) {
+			return;
+		}
+		
+		// manually construct SqlParameterSource[] instead of using
+		// SqlParameterSourceUtils.createBatch() in order to reduce a number of temporary objects.
+		// See also: https://www.baeldung.com/spring-jdbc-jdbctemplate#2-batch-operations-using-namedparameterjdbctemplate
+		SqlParameterSource[] batchedParams = imageUrls.stream()
+			.map(imageUrl -> new MapSqlParameterSource("request_id", requestId).addValue("url", imageUrl))
+			.toArray(size -> new SqlParameterSource[size]);
+		
+		int[] affected = jdbcTemplate.batchUpdate(addParsedImageUrlSql, batchedParams);
+		
+		Validate.validState(
+			affected.length == batchedParams.length,
+			"Unexpected number of batches after inserting parsed image urls of request #%d: %d (expected: %d)",
+			requestId,
+			affected.length,
+			batchedParams.length
+		);
+		
+		long affectedRows = Arrays.stream(affected).sum();
+		Validate.validState(
+			affectedRows == imageUrls.size(),
+			"Unexpected number of affected rows after inserting parsed image urls of request #%d: %d (expected: %d)",
+			requestId,
+			affectedRows,
+			imageUrls.size()
+		);
 	}
 
 	@Override

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

@@ -28,6 +28,7 @@ public interface SeriesImportDao {
 	void addRawContent(Integer requestId, Date createdAt, Date updatedAt, String content);
 	String findRawContentByRequestId(Integer requestId);
 	void addParsedData(Integer requestId, AddSeriesParsedDataDbDto data);
+	void addParsedImageUrls(Integer requestId, List<String> imageUrls);
 	SeriesParsedDataDto findParsedDataByRequestId(Integer requestId, String lang);
 	ImportRequestInfo findRequestInfo(Integer seriesId);
 	List<ImportRequestFullInfo> findAll();

src/main/resources/liquibase/test-data.xml

@@ -13,6 +13,9 @@
 	<!-- Depends on: series_import_requests, categories -->
 	<include file="test-data/series_import_parsed_data.xml" relativeToChangelogFile="true" />
 
+	<!-- Depends on: series_import_requests -->
+	<include file="test-data/series_import_parsed_image_urls.xml" relativeToChangelogFile="true" />
+	
 	<!-- Depends on: series_import_requests, transaction_participants -->
 	<include file="test-data/series_sales_import_parsed_data.xml" relativeToChangelogFile="true" />
 

src/main/resources/liquibase/test-data/series_import_parsed_data.xml

@@ -10,7 +10,6 @@
 		<insert tableName="series_import_parsed_data">
 			<column name="request_id" valueComputed="(SELECT id FROM series_import_requests WHERE url = 'http://example.com/issue/1256')" />
 			<column name="category_id" valueComputed="(SELECT id FROM categories WHERE slug = 'prehistoric-animals')" />
-			<column name="image_url" value="http://127.0.0.1:8080/image/1" />
 			<column name="quantity" valueNumeric="3" />
 			<column name="created_at" valueComputed="${NOW}" />
 			<column name="updated_at" valueComputed="${NOW}" />

src/main/resources/liquibase/test-data/series_import_parsed_image_urls.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd">
+	
+	<changeSet id="add-series-parsed-image-urls-for-gh1256" author="php-coder" context="test-data">
+		
+		<insert tableName="series_import_parsed_image_urls">
+			<column name="request_id" valueComputed="(SELECT id FROM series_import_requests WHERE url = 'http://example.com/issue/1256')" />
+			<column name="url" value="http://127.0.0.1:8080/image/1" />
+		</insert>
+		
+	</changeSet>
+	
+</databaseChangeLog>

src/main/resources/liquibase/version/0.4.7.xml

@@ -5,5 +5,6 @@
 	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
 		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd">
 
+	<include file="0.4.7/2021-07-18--series_import_parsed_image_urls.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4.7/2021-07-18--series_import_parsed_image_urls.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+		xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd">
+	
+	<changeSet id="create-series_import_parsed_image_urls-table" author="php-coder" context="scheme">
+		
+		<createTable tableName="series_import_parsed_image_urls">
+			<column name="request_id" type="INTEGER">
+				<constraints
+					nullable="false"
+					references="series_import_requests(id)"
+					foreignKeyName="fk_series_import_parsed_image_urls_series_import_requests_id" />
+			</column>
+			<column name="url" type="VARCHAR(255)">
+				<constraints nullable="false" />
+			</column>
+		</createTable>
+		
+		<addUniqueConstraint
+			tableName="series_import_parsed_image_urls"
+			columnNames="request_id, url"
+			constraintName="uc_series_import_parsed_image_urls_request_id_url" />
+		
+	</changeSet>
+	
+	<changeSet id="migrate-existing-image-urls" author="php-coder" context="test-data, prod-data">
+		<comment>Migrates data from series_import_parsed_data.image_url to series_import_parsed_image_urls</comment>
+		
+		<sql>
+			INSERT INTO series_import_parsed_image_urls(request_id, url)
+			     SELECT request_id, image_url
+			       FROM series_import_parsed_data
+			      WHERE image_url IS NOT NULL
+			   ORDER BY request_id
+		</sql>
+		
+		<rollback>
+			<sql>
+				DELETE FROM series_import_parsed_image_urls
+			</sql>
+		</rollback>
+		
+	</changeSet>
+	
+	<changeSet id="drop-image_url-column-from-series_import_parsed_data-table" author="php-coder" context="scheme">
+		<dropColumn tableName="series_import_parsed_data" columnName="image_url" />
+	</changeSet>
+	
+</databaseChangeLog>

src/main/resources/sql/series_import_request_dao_queries.properties

@@ -86,7 +86,6 @@ INSERT \
      ( request_id \
      , category_id \
      , country_id \
-     , image_url \
      , release_day \
      , release_month \
      , release_year \
@@ -100,7 +99,6 @@ VALUES \
      ( :request_id \
      , :category_id \
      , :country_id \
-     , :image_url \
      , :release_day \
      , :release_month \
      , :release_year \
@@ -111,8 +109,13 @@ VALUES \
      , :updated_at \
      )
 
+series_import_requests.add_series_parsed_image_url = \
+INSERT \
+  INTO series_import_parsed_image_urls(request_id, url) \
+VALUES (:request_id, :url)
+
 series_import_requests.find_series_parsed_data_by_request_id = \
-   SELECT pd.image_url \
+   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 \
         , cat.slug AS category_slug \
         , CASE WHEN 'ru' = :lang THEN COALESCE(cat.name_ru, cat.name) ELSE cat.name END AS category_name \