Import series: assign a group during seller creation.

Fix #857

Author: php-coder

src/main/java/ru/mystamps/web/config/ControllersConfig.java

@@ -119,6 +119,7 @@ public SeriesImportController getSeriesImportController() {
 			servicesConfig.getSeriesSalesService(),
 			servicesConfig.getSeriesSalesImportService(),
 			getSeriesController(),
+			servicesConfig.getTransactionParticipantService(),
 			eventPublisher
 		);
 	}

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

@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 
 import javax.servlet.http.HttpServletRequest;
@@ -46,12 +47,14 @@
 import ru.mystamps.web.controller.dto.RequestImportForm;
 import ru.mystamps.web.controller.editor.ExpandCatalogNumbersEditor;
 import ru.mystamps.web.controller.event.ImportRequestCreated;
+import ru.mystamps.web.dao.dto.EntityWithIdDto;
 import ru.mystamps.web.dao.dto.ImportRequestDto;
 import ru.mystamps.web.dao.dto.SeriesParsedDataDto;
 import ru.mystamps.web.dao.dto.SeriesSaleParsedDataDto;
 import ru.mystamps.web.service.SeriesImportService;
 import ru.mystamps.web.service.SeriesSalesImportService;
 import ru.mystamps.web.service.SeriesSalesService;
+import ru.mystamps.web.service.TransactionParticipantService;
 import ru.mystamps.web.util.CatalogUtils;
 import ru.mystamps.web.util.LocaleUtils;
 
@@ -65,6 +68,7 @@ public class SeriesImportController {
 	private final SeriesSalesService seriesSalesService;
 	private final SeriesSalesImportService seriesSalesImportService;
 	private final SeriesController seriesController;
+	private final TransactionParticipantService participantService;
 	private final ApplicationEventPublisher eventPublisher;
 
 	@InitBinder("requestImportForm")
@@ -154,12 +158,17 @@ public String showRequestAndImportSeriesForm(
 			ImportSellerForm sellerForm = new ImportSellerForm();
 			sellerForm.setName(seriesSale.getSellerName());
 			sellerForm.setUrl(seriesSale.getSellerUrl());
+			sellerForm.setGroupId(seriesSale.getSellerGroupId());
 
 			form.setSeller(sellerForm);
 			form.setSeriesSale(seriesSaleForm);
 
 			if (seriesSale.getSellerId() != null) {
 				seriesController.addSellersToModel(model);
+			} else {
+				// required for displaying seller group
+				List<EntityWithIdDto> groups = participantService.findAllGroups();
+				model.addAttribute("groups", groups);
 			}
 		}
 
@@ -214,6 +223,10 @@ public String processImportSeriesForm(
 		ImportSeriesSalesForm seriesSaleForm = form.getSeriesSale();
 		if (seriesSaleForm != null) {
 			seriesController.addSellersToModel(model);
+			
+			// required for displaying seller group
+			List<EntityWithIdDto> groups = participantService.findAllGroups();
+			model.addAttribute("groups", groups);
 		}
 
 		if (result.hasErrors()) {

src/main/java/ru/mystamps/web/controller/dto/ImportSellerForm.java

@@ -36,10 +36,9 @@ public class ImportSellerForm implements AddParticipantDto {
 	// @todo #695 /series/import/request/{id}(seller.url): add validation against long values
 	private String url;
 
-	@Override
-	public Integer getGroupId() {
-		return null;
-	}
+	// @todo #857 /series/import/request/{id}(seller.group): add validation against negative values
+	// @todo #857 /series/import/request/{id}(seller.group): add validation for existing group
+	private Integer groupId;
 
 	@Override
 	public Boolean getBuyer() {

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

@@ -29,4 +29,5 @@ public interface TransactionParticipantDao {
 	List<EntityWithParentDto> findSellersWithParents();
 	Integer findSellerId(String name, String url);
 	List<EntityWithIdDto> findAllGroups();
+	Integer findGroupIdByName(String name);
 }

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

@@ -26,6 +26,7 @@
 @RequiredArgsConstructor
 public class SeriesSaleParsedDataDto {
 	private final Integer sellerId;
+	private final Integer sellerGroupId;
 	private final String sellerName;
 	private final String sellerUrl;
 	private final BigDecimal price;

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

@@ -29,6 +29,7 @@
 @ToString(exclude = { "createdAt", "updatedAt" })
 public class SeriesSalesParsedDataDbDto {
 	private Integer sellerId;
+	private Integer sellerGroupId;
 	private String sellerName;
 	private String sellerUrl;
 	private BigDecimal price;

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

@@ -52,6 +52,7 @@ public void addParsedData(Integer requestId, SeriesSalesParsedDataDbDto data) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("request_id", requestId);
 		params.put("seller_id", data.getSellerId());
+		params.put("seller_group_id", data.getSellerGroupId());
 		params.put("seller_name", data.getSellerName());
 		params.put("seller_url", data.getSellerUrl());
 		params.put("price", data.getPrice());

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

@@ -17,6 +17,7 @@
  */
 package ru.mystamps.web.dao.impl;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +58,9 @@ public class JdbcTransactionParticipantDao implements TransactionParticipantDao
 	@Value("${transaction_participant_group.find_all}")
 	private String findAllGroupsSql;
 
+	@Value("${transaction_participant_group.find_id_by_name}")
+	private String findGroupIdByNameSql;
+	
 	@Override
 	public Integer add(AddParticipantDbDto participant) {
 		Map<String, Object> params = new HashMap<>();
@@ -117,4 +121,18 @@ public List<EntityWithIdDto> findAllGroups() {
 		return jdbcTemplate.query(findAllGroupsSql, RowMappers::forEntityWithIdDto);
 	}
 
+	@Override
+	public Integer findGroupIdByName(String name) {
+		try {
+			return jdbcTemplate.queryForObject(
+				findGroupIdByNameSql,
+				Collections.singletonMap("name", name),
+				Integer.class
+			);
+			
+		} catch (EmptyResultDataAccessException ignored) {
+			return null;
+		}
+	}
+	
 }

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

@@ -363,12 +363,20 @@ public static SeriesSaleParsedDataDto forSeriesSaleParsedDataDto(ResultSet rs, i
 		throws SQLException {
 
 		Integer sellerId = JdbcUtils.getInteger(rs, "seller_id");
+		Integer sellerGroupId = JdbcUtils.getInteger(rs, "seller_group_id");
 		String sellerName = rs.getString("seller_name");
 		String sellerUrl = rs.getString("seller_url");
 		BigDecimal price = rs.getBigDecimal("price");
 		Currency currency = JdbcUtils.getCurrency(rs, "currency");
 
-		return new SeriesSaleParsedDataDto(sellerId, sellerName, sellerUrl, price, currency);
+		return new SeriesSaleParsedDataDto(
+			sellerId,
+			sellerGroupId,
+			sellerName,
+			sellerUrl,
+			price,
+			currency
+		);
 	}
 
 	public static ImportRequestInfo forImportRequestInfo(ResultSet rs, int unused)

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

@@ -216,10 +216,12 @@ public void saveParsedData(Integer requestId, RawParsedDataDto data) {
 			seriesParsedData.setMichelNumbers(shortenedNumbers);
 		}
 
+		// @todo #857 SeriesImportServiceImpl.saveParsedData(): add unit test for seller group
 		SeriesSalesParsedDataDbDto seriesSalesParsedData = new SeriesSalesParsedDataDbDto();
 		seriesSalesParsedData.setCreatedAt(now);
 		seriesSalesParsedData.setUpdatedAt(now);
 		seriesSalesParsedData.setSellerId(seriesInfo.getSellerId());
+		seriesSalesParsedData.setSellerGroupId(seriesInfo.getSellerGroupId());
 		seriesSalesParsedData.setSellerName(seriesInfo.getSellerName());
 		seriesSalesParsedData.setSellerUrl(seriesInfo.getSellerUrl());
 		seriesSalesParsedData.setPrice(seriesInfo.getPrice());

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

@@ -18,6 +18,8 @@
 package ru.mystamps.web.service;
 
 import java.math.BigDecimal;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -88,6 +90,7 @@ public SeriesExtractedInfo extract(RawParsedDataDto data) {
 		Boolean perforated = extractPerforated(data.getPerforated());
 		Set<String> michelNumbers = extractMichelNumbers(data.getMichelNumbers());
 		Integer sellerId = extractSeller(data.getSellerName(), data.getSellerUrl());
+		Integer sellerGroupId = extractSellerGroup(sellerId, data.getSellerUrl());
 		String sellerName = extractSellerName(sellerId, data.getSellerName());
 		String sellerUrl = extractSellerUrl(sellerId, data.getSellerUrl());
 		BigDecimal price = extractPrice(data.getPrice());
@@ -101,6 +104,7 @@ public SeriesExtractedInfo extract(RawParsedDataDto data) {
 			perforated,
 			michelNumbers,
 			sellerId,
+			sellerGroupId,
 			sellerName,
 			sellerUrl,
 			price,
@@ -311,6 +315,31 @@ public Integer extractSeller(String name, String url) {
 		return null;
 	}
 
+	// @todo #857 SeriesInfoExtractorServiceImpl.extractSellerGroup(): add unit tests
+	public Integer extractSellerGroup(Integer id, String sellerUrl) {
+		// we need a group ony for a new seller (id == null)
+		if (id != null) {
+			return null;
+		}
+		
+		log.debug("Determining seller group by seller url '{}'", sellerUrl);
+		
+		try {
+			String name = new URL(sellerUrl).getHost();
+			log.debug("Determining seller group: looking for a group named '{}'", name);
+			
+			Integer groupId = transactionParticipantService.findGroupIdByName(name);
+			if (groupId != null) {
+				log.debug("Found seller group: #{}", groupId);
+			}
+			return groupId;
+			
+		} catch (MalformedURLException ex) {
+			log.debug("Could not extract seller group: {}", ex.getMessage());
+			return null;
+		}
+	}
+	
 	// @todo #695 SeriesInfoExtractorServiceImpl.extractSellerName(): add unit tests
 	protected String extractSellerName(Integer id, String name) {
 		if (id != null) {

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

@@ -29,4 +29,5 @@ public interface TransactionParticipantService {
 	List<EntityWithParentDto> findSellersWithParents();
 	Integer findSellerId(String name, String url);
 	List<EntityWithIdDto> findAllGroups();
+	Integer findGroupIdByName(String name);
 }

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

@@ -96,4 +96,14 @@ public List<EntityWithIdDto> findAllGroups() {
 		return transactionParticipantDao.findAllGroups();
 	}
 
+	// @todo #857 TransactionParticipantServiceImpl.findGroupIdByName(): add unit tests
+	// @todo #857 TransactionParticipantServiceImpl.findGroupIdByName(): move to a separate service
+	@Override
+	@Transactional(readOnly = true)
+	public Integer findGroupIdByName(String name) {
+		Validate.isTrue(StringUtils.isNotBlank(name), "Group name must be non-blank");
+		
+		return transactionParticipantDao.findGroupIdByName(name);
+	}
+	
 }

src/main/java/ru/mystamps/web/service/dto/SeriesExtractedInfo.java

@@ -34,6 +34,7 @@ public class SeriesExtractedInfo {
 	private final Boolean perforated;
 	private final Set<String> michelNumbers;
 	private final Integer sellerId;
+	private final Integer sellerGroupId;
 	private final String sellerName;
 	private final String sellerUrl;
 	private final BigDecimal price;

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

@@ -53,5 +53,6 @@
 	<include file="0.4/2018-06-15--add_price_to_collections_series.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2018-06-18--test_paid_user.xml" relativeToChangelogFile="true" />
 	<include file="0.4/2018-07-05--series_import_parsed_data_michel_numbers_field.xml" relativeToChangelogFile="true" />
+	<include file="0.4/2018-07-15--series_import_parsed_data_group_id_field.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>

src/main/resources/liquibase/version/0.4/2017-11-15--group_participants.xml

@@ -43,7 +43,7 @@
 	<changeSet id="add-movies-characters-participant-group" author="php-coder" context="test-data">
 
 		<insert tableName="transaction_participant_groups">
-			<column name="name" value="Movies characters" />
+			<column name="name" value="example.com" />
 			<column name="created_at" valueComputed="${NOW}" />
 			<column name="created_by" valueComputed="(SELECT id FROM users WHERE role = 'ADMIN' ORDER by id LIMIT 1)" />
 			<column name="updated_at" valueComputed="${NOW}" />

src/main/resources/liquibase/version/0.4/2018-07-15--series_import_parsed_data_group_id_field.xml

@@ -0,0 +1,22 @@
+<?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="add-seller_group_id-column-to-series_sales_import_parsed_data-table" author="php-coder" context="scheme">
+		
+		<addColumn tableName="series_sales_import_parsed_data">
+			<column name="seller_group_id"
+				type="INTEGER"
+				beforeColumn="seller_name">
+				
+				<constraints references="transaction_participant_groups(id)"
+					foreignKeyName="fk_series_sales_import_parsed_data_seller_group_id" />
+			</column>
+		</addColumn>
+		
+	</changeSet>
+	
+</databaseChangeLog>

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

@@ -216,6 +216,7 @@ t_gathered_data = Gathered data
 t_import = Import
 t_seller_url = Seller URL
 t_seller_name = Seller name
+t_seller_group = Seller group
 
 # series/import/list.html
 t_no_import_requests = No import requests

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

@@ -215,6 +215,7 @@ t_gathered_data = Собранные данные
 t_import = Импортировать
 t_seller_url = Страница продавца
 t_seller_name = Имя продавца
+t_seller_group = Группа продавца
 
 # series/import/list.html
 t_no_import_requests = Нет запросов на импорт

src/main/resources/sql/series_import_request_dao_queries.properties

@@ -147,6 +147,7 @@ INSERT \
   INTO series_sales_import_parsed_data \
      ( request_id \
      , seller_id \
+     , seller_group_id \
      , seller_url \
      , seller_name \
      , price \
@@ -157,6 +158,7 @@ INSERT \
 VALUES \
      ( :request_id \
      , :seller_id \
+     , :seller_group_id \
      , :seller_url \
      , :seller_name \
      , :price \
@@ -167,6 +169,7 @@ VALUES \
 
 series_import_requests.find_series_sale_parsed_data_by_request_id = \
 SELECT seller_id \
+      , seller_group_id \
       , seller_url \
       , seller_name \
       , price \

src/main/resources/sql/transaction_participants_dao_queries.properties

@@ -47,3 +47,8 @@ transaction_participant_group.find_all = \
        , name \
     FROM transaction_participant_groups \
 ORDER BY name
+
+transaction_participant_group.find_id_by_name = \
+SELECT id \
+  FROM transaction_participant_groups \
+ WHERE name = :name

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

@@ -351,6 +351,36 @@ <h3 th:text="#{t_gathered_data}">
 								</tr>
 								/*/-->
 
+								<tr th:if="${hasSellerInfo and importSeriesForm.seller.groupId != null}" th:classappend="${#fields.hasErrors('seller.groupId') ? 'has-error' : ''}">
+									<th>
+										<label for="seller-group" class="control-label" th:text="#{t_seller_group}">
+											Seller group
+										</label>
+									</th>
+									<td>
+										<select id="seller-group" class="form-control" th:field="*{seller.groupId}" th:disabled="${disabled}">
+											<option value="" th:text="#{t_not_chosen}">Not chosen</option>
+											<!--/*/
+											<option th:each="group : ${groups}"
+												th:value="${group.id}"
+												th:text="${group.name}"
+												th:selected="${importSeriesForm.seller.groupId == group.id}">
+											</option>
+											/*/-->
+											<!--/*-->
+											<option value="1" selected="selected">example.com</option>
+											<!--*/-->
+										</select>
+										<!--/*/
+										<span id="seller-group.errors"
+											class="help-block"
+											th:if="${#fields.hasErrors('seller.groupId')}"
+											th:each="error : ${#fields.errors('seller.groupId')}"
+											th:text="${error}"></span>
+										/*/-->
+									</td>
+								</tr>
+								
 								<tr th:if="${hasSellerInfo and importSeriesForm.seller.name != null}" th:classappend="${#fields.hasErrors('seller.name') ? 'has-error' : ''}">
 									<th>
 										<label for="seller-name" class="control-label" th:text="#{t_seller_name}">