/series/import/request/{id}: show a link to imported series.

For now, only add a field to database and show a link on the page. Support for inserting a series id
after import will be added later.

Addressed to #700

Author: php-coder

src/main/java/ru/mystamps/web/dao/dto/ImportRequestDto.java

@@ -27,4 +27,5 @@
 public class ImportRequestDto {
 	private final String url;
 	private final String status;
+	private final Integer seriesId;
 }

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

@@ -274,7 +274,8 @@ public static TransactionParticipantDto forTransactionParticipantDto(ResultSet r
 	public static ImportRequestDto forImportRequestDto(ResultSet rs, int i) throws SQLException {
 		return new ImportRequestDto(
 			rs.getString("url"),
-			rs.getString("status")
+			rs.getString("status"),
+			JdbcUtils.getInteger(rs, "series_id")
 		);
 	}
 

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

@@ -39,5 +39,6 @@
 	<include file="0.4/2017-11-09--countries_aliases.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2017-11-14--separate_buyers_and_sellers.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2017-11-15--group_participants.xml" relativeToChangelogFile="true" />
+	<include file="0.4/2017-11-22--import_request_series_id.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4/2017-11-22--import_request_series_id.xml

@@ -0,0 +1,18 @@
+<?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.1.xsd">
+	
+	<changeSet id="connect-series_import_requests-and-series-table" author="php-coder" context="scheme">
+		
+		<addColumn tableName="series_import_requests">
+			<column name="series_id" type="INTEGER" afterColumn="status_id">
+				<constraints references="series(id)" foreignKeyName="fk_series_import_requests_series_id" />
+			</column>
+		</addColumn>
+		
+	</changeSet>
+	
+</databaseChangeLog>

src/main/resources/ru/mystamps/i18n/Messages.properties

@@ -194,5 +194,6 @@ t_submit_request = Submit request
 # series/import/info.html
 t_import_request = import request
 t_status = Status
+t_imported_series = Imported series
 t_gathered_data = Gathered data
 t_proceed_to_series_creation = Proceed to series creation

src/main/resources/ru/mystamps/i18n/Messages_ru.properties

@@ -194,5 +194,6 @@ t_submit_request = Создать запрос
 # series/import/info.html
 t_import_request = запрос на импорт
 t_status = Статус
+t_imported_series = Импортированная серия
 t_gathered_data = Собранные данные
 t_proceed_to_series_creation = Перейти к добавлению серии

src/main/resources/sql/series_import_request_dao_queries.properties

@@ -33,8 +33,9 @@ UPDATE series_import_requests r \
      )
 
 series_import_requests.find_by_id = \
-SELECT r.url, \
-       s.name AS status \
+SELECT r.url \
+     , s.name AS status \
+     , r.series_id \
   FROM series_import_requests r \
   JOIN series_import_request_statuses s \
     ON r.status_id = s.id \

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

@@ -156,14 +156,29 @@ <h3 th:text="#{t_gathered_data}">
 											type="submit"
 											class="btn btn-primary"
 											value="Proceed to series creation"
-											th:value="#{t_proceed_to_series_creation}" />
+											th:value="#{t_proceed_to_series_creation}"
+											th:disabled="${request.seriesId != null}" />
 									</td>
 								</tr>
 							</table>
 						</div>
 					</form>
 
 				</div>
+				
+				<!--/*/
+				<div class="col-sm-4 col-sm-offset-4" th:if="${request.seriesId != null}">
+					<h3 th:text="#{t_imported_series}">
+						Imported series
+					</h3>
+					
+					<div class="text-center">
+						<a th:href="@{${INFO_SERIES_PAGE}(id=${request.seriesId})}"
+						   th:text="@{${PUBLIC_URL} + ${INFO_SERIES_PAGE}(id=${request.seriesId})}"></a>
+					</div>
+				</div>
+				/*/-->
+				
 			</div>
 			<div class="row">
 				<footer class="col-sm-12 text-right">

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

@@ -183,7 +183,7 @@ public static EntityWithIdDto createEntityWithIdDto() {
 	}
 
 	public static ImportRequestDto createImportRequestDto() {
-		return new ImportRequestDto(Random.url(), Random.importRequestStatus());
+		return new ImportRequestDto(Random.url(), Random.importRequestStatus(), null);
 	}
 
 	public static ParsedDataDto createParsedDataDto() {