Implement a page with list of countries.

php-coder · php-coder · commit 93ecb1b7ec46 · 2015-08-09T14:34:42.000+03:00
Fix #103
diff --git a/src/main/java/ru/mystamps/web/Url.java b/src/main/java/ru/mystamps/web/Url.java
@@ -63,6 +63,7 @@ public final class Url {
 	
 	public static final String ADD_COUNTRY_PAGE      = "/country/add";
 	public static final String INFO_COUNTRY_PAGE     = "/country/{id}/{slug}";
+	public static final String LIST_COUNTRIES_PAGE   = "/country/list";
 	
 	public static final String INFO_COLLECTION_PAGE  = "/collection/{id}/{slug}";
 	
@@ -111,6 +112,7 @@ public static Map<String, String> asMap(boolean serveContentFromSingleHost) {
 		map.put("LIST_CATEGORIES_PAGE", LIST_CATEGORIES_PAGE);
 		map.put("ADD_COUNTRY_PAGE", ADD_COUNTRY_PAGE);
 		map.put("INFO_COUNTRY_PAGE", INFO_COUNTRY_PAGE);
+		map.put("LIST_COUNTRIES_PAGE", LIST_COUNTRIES_PAGE);
 		map.put("INFO_COLLECTION_PAGE", INFO_COLLECTION_PAGE);
 		
 		if (serveContentFromSingleHost) {
diff --git a/src/main/java/ru/mystamps/web/controller/CountryController.java b/src/main/java/ru/mystamps/web/controller/CountryController.java
@@ -100,5 +100,11 @@ public String showInfo(@PathVariable("id") Country country, Model model, Locale
 		return "country/info";
 	}
 	
+	@RequestMapping(Url.LIST_COUNTRIES_PAGE)
+	public void list(Model model, Locale userLocale) {
+		String lang = LocaleUtils.getLanguageOrNull(userLocale);
+		model.addAttribute("countries", countryService.findAllAsLinkEntities(lang));
+	}
+	
 }
 
diff --git a/src/main/java/ru/mystamps/web/dao/JdbcCountryDao.java b/src/main/java/ru/mystamps/web/dao/JdbcCountryDao.java
@@ -19,6 +19,7 @@
 
 import java.util.Map;
 
+import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SelectEntityDto;
 
 public interface JdbcCountryDao {
@@ -28,4 +29,5 @@ public interface JdbcCountryDao {
 	long countCountriesOfCollection(Integer collectionId);
 	Map<String, Integer> getStatisticsOf(Integer collectionId, String lang);
 	Iterable<SelectEntityDto> findAllAsSelectEntries(String lang);
+	Iterable<LinkEntityDto> findAllAsLinkEntities(String lang);
 }
diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDaoImpl.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDaoImpl.java
@@ -30,12 +30,16 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcCountryDao;
+import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SelectEntityDto;
 
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 @RequiredArgsConstructor
 public class JdbcCountryDaoImpl implements JdbcCountryDao {
 	
+	private static final RowMapper<LinkEntityDto> LINK_ENTITY_DTO_ROW_MAPPER =
+		new LinkEntityDtoRowMapper();
+	
 	private static final RowMapper<Pair<String, Integer>> NAME_AND_COUNTER_ROW_MAPPER =
 		new StringIntegerPairRowMapper("name", "counter");
 	
@@ -62,6 +66,9 @@ public class JdbcCountryDaoImpl implements JdbcCountryDao {
 	@Value("${country.find_all_countries_names_with_ids}")
 	private String findCountriesNamesWithIdsSql;
 	
+	@Value("${country.find_all_countries_names_with_slug}")
+	private String findCountriesNamesWithSlugSql;
+	
 	@Override
 	public long countAll() {
 		return jdbcTemplate.queryForObject(
@@ -137,4 +144,13 @@ public Iterable<SelectEntityDto> findAllAsSelectEntries(String lang) {
 		return result;
 	}
 	
+	@Override
+	public Iterable<LinkEntityDto> findAllAsLinkEntities(String lang) {
+		return jdbcTemplate.query(
+			findCountriesNamesWithSlugSql,
+			Collections.singletonMap("lang", lang),
+			LINK_ENTITY_DTO_ROW_MAPPER
+		);
+	}
+	
 }
diff --git a/src/main/java/ru/mystamps/web/service/CountryService.java b/src/main/java/ru/mystamps/web/service/CountryService.java
@@ -22,12 +22,14 @@
 import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.User;
 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, User user);
 	Iterable<SelectEntityDto> findAll(String lang);
+	Iterable<LinkEntityDto> findAllAsLinkEntities(String lang);
 	long countAll();
 	long countCountriesOf(Collection collection);
 	long countByName(String name);
diff --git a/src/main/java/ru/mystamps/web/service/CountryServiceImpl.java b/src/main/java/ru/mystamps/web/service/CountryServiceImpl.java
@@ -37,6 +37,7 @@
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.dao.CountryDao;
 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;
@@ -87,6 +88,12 @@ public Iterable<SelectEntityDto> findAll(String lang) {
 		return jdbcCountryDao.findAllAsSelectEntries(lang);
 	}
 	
+	@Override
+	@Transactional(readOnly = true)
+	public Iterable<LinkEntityDto> findAllAsLinkEntities(String lang) {
+		return jdbcCountryDao.findAllAsLinkEntities(lang);
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public long countAll() {
diff --git a/src/main/java/ru/mystamps/web/support/togglz/Features.java b/src/main/java/ru/mystamps/web/support/togglz/Features.java
@@ -54,7 +54,11 @@ public enum Features implements Feature {
 	
 	@Label("Show link to list of categories on index page")
 	@EnabledByDefault
-	LIST_CATEGORIES;
+	LIST_CATEGORIES,
+	
+	@Label("Show link to list of countries on index page")
+	@EnabledByDefault
+	LIST_COUNTRIES;
 	
 	public boolean isActive() {
 		return FeatureContext.getFeatureManager().isActive(this);
diff --git a/src/main/resources/ru/mystamps/i18n/Messages.properties b/src/main/resources/ru/mystamps/i18n/Messages.properties
@@ -31,6 +31,7 @@ t_write_email = Write e-mail
 t_index_title = create your own virtual collection!
 t_you_may = You may
 t_show_categories_list = show list of categories
+t_show_countries_list = show list of countries
 t_in_db = In our database
 t_categories_amount = Amount of categories
 t_countries_amount = Amount of countries
@@ -127,6 +128,9 @@ t_add_country_ucfirst = Add country
 t_country_info = Country info
 t_country_just_added = Country has been added.<br />Now you could <a href="{0}" class="alert-link">proceed with creating series</a>.
 
+# country/list.html
+t_country_list = country list
+
 # collection/info.html
 t_collection_of = {0}'s collection
 t_collection_just_added = Series has been added to your collection
diff --git a/src/main/resources/ru/mystamps/i18n/Messages_ru.properties b/src/main/resources/ru/mystamps/i18n/Messages_ru.properties
@@ -31,6 +31,7 @@ t_write_email = Написать письмо
 t_index_title = создай свою виртуальную коллекцию!
 t_you_may = Вы можете
 t_show_categories_list = посмотреть список категорий
+t_show_countries_list = посмотреть список стран
 t_in_db = В нашей базе
 t_categories_amount = Категорий
 t_countries_amount = Стран
@@ -127,6 +128,9 @@ t_add_country_ucfirst = Добавить страну
 t_country_info = Информация о стране
 t_country_just_added = Страна добавлена. Теперь вы можете <a href="{0}" class="alert-link">создать серию</a>.
 
+# country/list.html
+t_country_list = список стран
+
 # collection/info.html
 t_collection_of = Коллекция пользователя {0}
 t_collection_just_added = Серия добавлена в вашу коллекцию
diff --git a/src/main/resources/sql/country_dao_queries.properties b/src/main/resources/sql/country_dao_queries.properties
@@ -35,3 +35,10 @@ country.find_all_countries_names_with_ids = \
        , c.id \
     FROM countries c \
 ORDER BY CASE WHEN 'ru' = :lang THEN c.name_ru ELSE c.name END
+
+country.find_all_countries_names_with_slug = \
+  SELECT CASE WHEN 'ru' = :lang THEN c.name_ru ELSE c.name END AS name \
+       , c.slug \
+       , c.id \
+    FROM countries c \
+ORDER BY CASE WHEN 'ru' = :lang THEN c.name_ru ELSE c.name END
diff --git a/src/main/webapp/WEB-INF/views/country/list.html b/src/main/webapp/WEB-INF/views/country/list.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+		<title th:text="|MyStamps: #{t_country_list}|">MyStamps: country list</title>
+		<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
+		<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
+		<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
+	</head>
+	<body lang="en" th:lang="${#locale.language == 'ru' ? 'ru' : 'en'}">
+		<div class="container-fluid">
+			<div class="row" id="header">
+				<div id="logo" class="col-sm-10">
+					<a href="../site/index.html" th:href="'/'" th:text="#{t_my_stamps}">My stamps</a>
+				</div>
+				
+				<div id="user_bar" class="col-sm-2">
+					<ul class="list-unstyled">
+						<!--/*/
+						<li sec:authorize="isAuthenticated()">
+							<i class="glyphicon glyphicon-user"></i>
+							<a sec:authentication="principal.user.name"
+								href="../collection/info.html"
+								title="Open my collection"
+								th:title="#{t_open_my_collection}"
+								th:href="@{${INFO_COLLECTION_PAGE}(id=${#authentication.principal.user.collection.id},slug=${#authentication.principal.user.collection.slug})}">
+								John Doe
+							</a>
+						</li>
+						/*/-->
+						<li sec:authorize="isAnonymous()">
+							<a href="../account/auth.html" th:href="@{${AUTHENTICATION_PAGE}}" th:text="#{t_enter}">Sign in</a>
+						</li>
+						<!--/*/
+						<li sec:authorize="isAuthenticated()">
+							<form id="LogoutForm" method="get" action="../site/index.html" class="no-margin" th:method="post" th:action="@{${LOGOUT_PAGE}}">
+								<i class="glyphicon glyphicon-share"></i>&nbsp;<input type="submit" value="Sign out" class="btn btn-link no-padding" th:value="#{t_logout}" />
+							</form>
+						</li>
+						/*/-->
+						<li sec:authorize="isAnonymous()">
+							<a href="../account/register.html" th:href="@{${REGISTRATION_PAGE}}" th:text="#{t_register}">Register</a>
+						</li>
+					</ul>
+				</div>
+			</div>
+			<div class="row">
+				<div id="content" class="col-sm-12" th:with="country_list=#{t_country_list}">
+					<h3 th:text="${#strings.capitalize(country_list)}">
+						Country list
+					</h3>
+					
+					<ul th:if="${not #lists.isEmpty(countries)}">
+						<li th:each="country : ${countries}">
+							<a href="../country/info.html" th:href="@{${INFO_COUNTRY_PAGE}(id=${country.id},slug=${country.slug})}" th:text="${country.name}">Italy</a>
+						</li>
+					</ul>
+				</div>
+			</div>
+			<div class="row">
+				<footer class="col-sm-12 text-right">
+					<i class="glyphicon glyphicon-envelope"></i>
+					<a href="mailto:slava.semushin@gmail.com" title="Write e-mail" th:href="|mailto:#{t_site_author_email}|" th:title="#{t_write_email}" th:text="#{t_site_author_name}">Slava Semushin</a>, 2009-2015
+				</footer>
+			</div>
+		</div>
+		
+		<!-- Placed at the end of the document so the pages load faster -->
+		<script src="http://yandex.st/jquery/1.9.1/jquery.min.js" th:src="${JQUERY_JS}"></script>
+		<script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" th:src="${BOOTSTRAP_JS}"></script>
+	</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/views/site/index.html b/src/main/webapp/WEB-INF/views/site/index.html
@@ -56,6 +56,9 @@
 							<li togglz:active="LIST_CATEGORIES">
 								<a th:href="@{${LIST_CATEGORIES_PAGE}}" th:text="#{t_show_categories_list}" href="../category/list.html">show list of categories</a>
 							</li>
+							<li togglz:active="LIST_COUNTRIES">
+								<a th:href="@{${LIST_COUNTRIES_PAGE}}" th:text="#{t_show_countries_list}" href="../country/list.html">show list of countries</a>
+							</li>
 							<li sec:authorize="hasAuthority('CREATE_SERIES')">
 								<a th:href="@{${ADD_SERIES_PAGE}}" th:text="#{t_add_series}" href="../series/add.html">add stamp series</a>
 							</li>
diff --git a/src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy
@@ -26,6 +26,7 @@ import ru.mystamps.web.entity.Country
 import ru.mystamps.web.entity.Collection
 import ru.mystamps.web.entity.User
 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
@@ -222,6 +223,40 @@ class CountryServiceImplTest extends Specification {
 			null             | _
 	}
 	
+	//
+	// Tests for findAllAsLinkEntities(String)
+	//
+	
+	def "findAllAsLinkEntities(String) should call dao"() {
+		given:
+			LinkEntityDto country1 = new LinkEntityDto(1, 'first-country', 'First Country')
+		and:
+			LinkEntityDto country2 = new LinkEntityDto(2, 'second-country', 'Second Country')
+		and:
+			List<LinkEntityDto> expectedCountries = [ country1, country2 ]
+		and:
+			jdbcCountryDao.findAllAsLinkEntities(_ as String) >> expectedCountries
+		when:
+			Iterable<LinkEntityDto> resultCountries = service.findAllAsLinkEntities('de')
+		then:
+			resultCountries == expectedCountries
+	}
+	
+	@Unroll
+	def "findAllAsLinkEntities(String) should pass language '#expectedLanguage' to dao"(String expectedLanguage) {
+		when:
+			service.findAllAsLinkEntities(expectedLanguage)
+		then:
+			1 * jdbcCountryDao.findAllAsLinkEntities({ String language ->
+				assert language == expectedLanguage
+				return true
+			})
+		where:
+			expectedLanguage | _
+			'ru'             | _
+			null             | _
+	}
+	
 	//
 	// Tests for countAll()
 	//
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAdminAtIndexPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAdminAtIndexPage.java
@@ -77,6 +77,13 @@ public void shouldExistsLinkForAddingCountries() {
 			.isTrue();
 	}
 	
+	@Test(groups = "misc", dependsOnGroups = "std")
+	public void shouldExistsLinkForListingCountries() {
+		assertThat(page.linkWithLabelExists(tr("t_show_countries_list")))
+			.overridingErrorMessage("should exists link to page for listing countries")
+			.isTrue();
+	}
+	
 	@Test(groups = "misc", dependsOnGroups = "std")
 	public void shouldExistsLinkForAddingCategories() {
 		assertThat(page.linkWithLabelExists(tr("t_create_category")))
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAtIndexPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAtIndexPage.java
@@ -55,6 +55,13 @@ public void shouldExistsLinkForListingCategories() {
 			.isTrue();
 	}
 	
+	@Test(groups = "misc", dependsOnGroups = "std")
+	public void shouldExistsLinkForListingCountries() {
+		assertThat(page.linkWithLabelExists(tr("t_show_countries_list")))
+			.overridingErrorMessage("should exists link to page for listing countries")
+			.isTrue();
+	}
+	
 	@Test(groups = "misc", dependsOnGroups = "std")
 	public void linkForAddingSeriesShouldBeAbsent() {
 		assertThat(page.linkWithLabelExists(tr("t_add_series")))
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenUserAtIndexPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenUserAtIndexPage.java
@@ -91,6 +91,13 @@ public void linkForAddingCountriesShouldBeAbsent() {
 			.isFalse();
 	}
 	
+	@Test(groups = "misc", dependsOnGroups = "std")
+	public void shouldExistsLinkForListingCountries() {
+		assertThat(page.linkWithLabelExists(tr("t_show_countries_list")))
+			.overridingErrorMessage("should exists link to page for listing countries")
+			.isTrue();
+	}
+	
 	@Override
 	protected void shouldHaveUserBar() {
 		// Ignore this check because when user authenticated there is no links for login/register.

Original file line number	Diff line number	Diff line change
`@@ -100,5 +100,11 @@ public String showInfo(@PathVariable("id") Country country, Model model, Locale`
`100`	`100`	`return "country/info";`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ @RequestMapping(Url.LIST_COUNTRIES_PAGE)`
	`104`	`+ public void list(Model model, Locale userLocale) {`
	`105`	`+ String lang = LocaleUtils.getLanguageOrNull(userLocale);`
	`106`	`+ model.addAttribute("countries", countryService.findAllAsLinkEntities(lang));`
	`107`	`+ }`
	`108`	`+`
`103`	`109`	`}`
`104`	`110`