/series/add: use slug instead of id in <select>.

Unbreak integration tests that failed because country was disappearing
after series creation.

Author: php-coder

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

@@ -113,9 +113,9 @@ public Iterable<SelectEntityDto> getCategories(Locale userLocale) {
 	}
 
 	@ModelAttribute("countries")
-	public Iterable<SelectEntityDto> getCountries(Locale userLocale) {
+	public Iterable<LinkEntityDto> getCountries(Locale userLocale) {
 		String lang = LocaleUtils.getLanguageOrNull(userLocale);
-		return countryService.findAllAsSelectEntities(lang);
+		return countryService.findAllAsLinkEntities(lang);
 	}
 
 	@RequestMapping(Url.ADD_SERIES_PAGE)

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

@@ -21,12 +21,10 @@
 
 import ru.mystamps.web.service.dto.AddCountryDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
 import ru.mystamps.web.service.dto.UrlEntityDto;
 
 public interface CountryService {
 	UrlEntityDto add(AddCountryDto dto, Integer userId);
-	Iterable<SelectEntityDto> findAllAsSelectEntities(String lang);
 	Iterable<LinkEntityDto> findAllAsLinkEntities(String lang);
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);
 	long countAll();

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

@@ -36,7 +36,6 @@
 import ru.mystamps.web.dao.dto.AddCountryDbDto;
 import ru.mystamps.web.service.dto.AddCountryDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
-import ru.mystamps.web.service.dto.SelectEntityDto;
 import ru.mystamps.web.service.dto.UrlEntityDto;
 import ru.mystamps.web.util.SlugUtils;
 
@@ -80,12 +79,6 @@ public UrlEntityDto add(AddCountryDto dto, Integer userId) {
 		return new UrlEntityDto(id, slug);
 	}
 
-	@Override
-	@Transactional(readOnly = true)
-	public Iterable<SelectEntityDto> findAllAsSelectEntities(String lang) {
-		return countryDao.findAllAsSelectEntities(lang);
-	}
-	
 	@Override
 	@Transactional(readOnly = true)
 	public Iterable<LinkEntityDto> findAllAsLinkEntities(String lang) {

src/main/webapp/WEB-INF/views/series/add.html

@@ -153,12 +153,12 @@ <h3 th:text="${#strings.capitalize(add_series)}">
 								<select id="country" class="form-control" th:field="*{country}">
 									<option value="" th:text="#{t_not_chosen}">Not chosen</option>
 									<!--/*/
-									<option th:each="country : ${countries}" th:value="${country.id}" th:text="${country.name}"></option>
+									<option th:each="country : ${countries}" th:value="${country.slug}" th:text="${country.name}"></option>
 									/*/-->
 									<!--/*-->
-									<option value="1">Russia</option>
-									<option value="2">Canada</option>
-									<option value="3">Italy</option>
+									<option value="russia">Russia</option>
+									<option value="canada">Canada</option>
+									<option value="italy">Italy</option>
 									<!--*/-->
 								</select>
 								<small sec:authorize="hasAuthority('CREATE_COUNTRY')">

src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy

@@ -24,7 +24,6 @@ import ru.mystamps.web.dao.JdbcCountryDao
 import ru.mystamps.web.dao.dto.AddCountryDbDto
 import ru.mystamps.web.model.AddCountryForm
 import ru.mystamps.web.service.dto.LinkEntityDto
-import ru.mystamps.web.service.dto.SelectEntityDto
 import ru.mystamps.web.service.dto.UrlEntityDto
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.util.SlugUtils
@@ -191,40 +190,6 @@ class CountryServiceImplTest extends Specification {
 			}) >> 80
 	}
 
-	//
-	// Tests for findAllAsSelectEntities(String)
-	//
-	
-	def "findAllAsSelectEntities(String) should call dao"() {
-		given:
-			SelectEntityDto country1 = new SelectEntityDto(1, 'First Country')
-		and:
-			SelectEntityDto country2 = new SelectEntityDto(2, 'Second Country')
-		and:
-			List<SelectEntityDto> expectedCountries = [ country1, country2 ]
-		and:
-			countryDao.findAllAsSelectEntities(_ as String) >> expectedCountries
-		when:
-			Iterable<SelectEntityDto> resultCountries = service.findAllAsSelectEntities('de')
-		then:
-			resultCountries == expectedCountries
-	}
-	
-	@Unroll
-	def "findAllAsSelectEntities(String) should pass language '#expectedLanguage' to dao"(String expectedLanguage) {
-		when:
-			service.findAllAsSelectEntities(expectedLanguage)
-		then:
-			1 * countryDao.findAllAsSelectEntities({ String language ->
-				assert language == expectedLanguage
-				return true
-			})
-		where:
-			expectedLanguage | _
-			'ru'             | _
-			null             | _
-	}
-	
 	//
 	// Tests for findAllAsLinkEntities(String)
 	//