Import series: connect import request with created series.

Fix #700

Author: php-coder

src/main/java/ru/mystamps/web/controller/SeriesImportController.java

@@ -182,7 +182,7 @@ public String processImportSeriesForm(
 			return "series/import/info";
 		}
 
-		Integer seriesId = seriesImportService.addSeries(form, currentUserId);
+		Integer seriesId = seriesImportService.addSeries(form, requestId, currentUserId);
 
 		return redirectTo(Url.INFO_SERIES_PAGE, seriesId);
 	}

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

@@ -26,6 +26,7 @@
 
 public interface SeriesImportDao {
 	Integer add(ImportSeriesDbDto importRequest);
+	void setSeriesIdOnRequest(Integer requestId, Integer seriesId, Date updatedAt);
 	void changeStatus(Integer requestId, Date date, String oldStatus, String newStatus);
 	ImportRequestDto findById(Integer id);
 	void addRawContent(Integer requestId, Date createdAt, Date updatedAt, String content);

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

@@ -49,6 +49,9 @@ public class JdbcSeriesImportDao implements SeriesImportDao {
 	@Value("${series_import_requests.create}")
 	private String createSeriesImportRequestSql;
 
+	@Value("${series_import_requests.set_series_id}")
+	private String setSeriesIdSql;
+	
 	@Value("${series_import_requests.change_status}")
 	private String changeStatusSql;
 
@@ -93,6 +96,23 @@ public Integer add(ImportSeriesDbDto importRequest) {
 		return Integer.valueOf(holder.getKey().intValue());
 	}
 
+	@Override
+	public void setSeriesIdOnRequest(Integer requestId, Integer seriesId, Date updatedAt) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("id", requestId);
+		params.put("series_id", seriesId);
+		params.put("date", updatedAt);
+		
+		int affected = jdbcTemplate.update(setSeriesIdSql, params);
+		
+		Validate.validState(
+			affected == 1,
+			"Unexpected number of affected rows after setting series id on request #%d: %d",
+			requestId,
+			affected
+		);
+	}
+	
 	// TODO: introduce dao
 	@Override
 	public void changeStatus(Integer requestId, Date date, String oldStatus, String newStatus) {

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

@@ -25,7 +25,7 @@
 
 public interface SeriesImportService {
 	Integer addRequest(RequestImportDto dto, Integer userId);
-	Integer addSeries(AddSeriesDto dto, Integer userId);
+	Integer addSeries(AddSeriesDto dto, Integer requestId, Integer userId);
 	void changeStatus(Integer requestId, String oldStatus, String newStatus);
 	ImportRequestDto findById(Integer requestId);
 	void saveDownloadedContent(Integer requestId, String content);

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

@@ -51,6 +51,7 @@ public class SeriesImportServiceImpl implements SeriesImportService {
 	private static final String UNPROCESSED = "Unprocessed";
 	private static final String DOWNLOADING_SUCCEEDED = "DownloadingSucceeded";
 	private static final String PARSING_SUCCEEDED = "ParsingSucceeded";
+	private static final String IMPORT_SUCCEEDED = "ImportSucceeded";
 
 	private final Logger log;
 	private final SeriesImportDao seriesImportDao;
@@ -85,8 +86,17 @@ public Integer addRequest(RequestImportDto dto, Integer userId) {
 	@Override
 	@Transactional
 	@PreAuthorize(HasAuthority.IMPORT_SERIES)
-	public Integer addSeries(AddSeriesDto dto, Integer userId) {
+	public Integer addSeries(AddSeriesDto dto, Integer requestId, Integer userId) {
 		Integer seriesId = seriesService.add(dto, userId, false);
+		
+		Date now = new Date();
+		
+		// @todo #700 Reduce number of SQL queries by one.
+		//  Here we're updating series_import_requests twice: when we set series_id field
+		//  and later when we change status_id. It's possible to do this in one-shot
+		seriesImportDao.setSeriesIdOnRequest(requestId, seriesId, now);
+		changeStatus(requestId, PARSING_SUCCEEDED, IMPORT_SUCCEEDED);
+		
 		return seriesId;
 	}
 

src/main/resources/sql/series_import_request_dao_queries.properties

@@ -15,6 +15,12 @@ SELECT :url \
   FROM series_import_request_statuses st \
  WHERE st.name = :status
 
+series_import_requests.set_series_id = \
+UPDATE series_import_requests \
+   SET series_id = :series_id \
+     , updated_at = :date \
+ WHERE id = :id
+
 series_import_requests.change_status = \
 UPDATE series_import_requests r \
    SET status_id = \

src/main/webapp/WEB-INF/views/series/import/info.html

@@ -297,6 +297,7 @@ <h3 th:text="#{t_gathered_data}">
 									<td></td>
 									<td>
 										<input
+											id="create-series-btn"
 											type="submit"
 											class="btn btn-primary"
 											value="Import"

src/test/robotframework/series/import/request-logic.robot

@@ -1,6 +1,7 @@
 *** Settings ***
 Documentation    Verify scenarios of importing a series from an external site
 Library          Selenium2Library
+Library          String
 Resource         ../../auth.steps.robot
 Suite Setup      Before Test Suite
 Suite Teardown   After Test Suite
@@ -12,8 +13,8 @@ Import series from an external site (in English, use category, country and date
 	[Documentation]              Verify import from a page in English and with different locators
 	Input Text                   id=url  http://127.0.0.1:8080/series/2?lang=en
 	Submit Form                  id=import-series-form
-	${location}=                 Get Location
-	Should Match Regexp          ${location}  /series/import/request/\\d+
+	${requestLocation}=          Get Location
+	Should Match Regexp          ${requestLocation}  /series/import/request/\\d+
 	${category}=                 Get Selected List Label  id=category
 	${country}=                  Get Selected List Label  id=country
 	# We can't use "Textfield Value Should Be" because it causes NPE on inputs of type url/number:
@@ -31,14 +32,20 @@ Import series from an external site (in English, use category, country and date
 	Should Be Equal              ${year}            2000
 	Input Text                   id=quantity  1
 	Submit Form                  id=create-series-form
-	${location}=                 Get Location
-	Should Match Regexp          ${location}  /series/\\d+
+	${seriesLocation}=           Get Location
+	Should Match Regexp          ${seriesLocation}  /series/\\d+
 	Element Text Should Be       id=category_name  Prehistoric animals
 	Element Text Should Be       id=country_name   Italy
 	Element Text Should Be       id=issue_date     2000
 	Element Text Should Be       id=quantity       1
 	Element Text Should Be       id=perforated     Yes
 	Page Should Contain Image    id=series-image-1
+	Go To                        ${requestLocation}
+	Element Text Should Be       id=request-status  ImportSucceeded
+	Element Should Be Disabled   id=create-series-btn
+	# @todo #700 /series/import/request/{id}: link to imported series should not use fixed domain
+	${expectedSeriesLink}=       Replace String  ${seriesLocation}  ${SITE_URL}  https://my-stamps.ru
+	Page Should Contain Link     link=${expectedSeriesLink}
 
 Import series from an external site (in Russian, use description locator)
 	[Documentation]              Verify import from a page in Russian and shared locator