Guess Country

Guess Country

gh571_prediction_country add guess country

fixes after merge

fix query

cleaning and return String

check style

check style

fixes

fixes

fixes

remarks

style

add try

togglz for link

SuggestionController

add HasAuthority

remarks

rename

Author: Shkarin

src/main/java/ru/mystamps/web/Url.java

@@ -51,6 +51,7 @@ public final class Url {
 	public static final String INFO_SERIES_PAGE         = "/series/{id}";
 	public static final String ADD_IMAGE_SERIES_PAGE    = "/series/{id}/image";
 	public static final String SEARCH_SERIES_BY_CATALOG = "/series/search/by_catalog";
+	public static final String INFO_COUNTRY_SERIES_PAGE	= "/suggest/series_country";
 
 	public static final String ADD_CATEGORY_PAGE     = "/category/add";
 	public static final String LIST_CATEGORIES_PAGE  = "/category/list";
@@ -125,6 +126,7 @@ public static Map<String, String> asMap(boolean serveContentFromSingleHost) {
 		map.put("INFO_SERIES_PAGE", INFO_SERIES_PAGE);
 		map.put("ADD_IMAGE_SERIES_PAGE", ADD_IMAGE_SERIES_PAGE);
 		map.put("SEARCH_SERIES_BY_CATALOG", SEARCH_SERIES_BY_CATALOG);
+		map.put("INFO_COUNTRY_SERIES_PAGE", INFO_COUNTRY_SERIES_PAGE);
 		map.put("ADD_CATEGORY_PAGE", ADD_CATEGORY_PAGE);
 		map.put("INFO_CATEGORY_PAGE", INFO_CATEGORY_PAGE);
 		map.put("LIST_CATEGORIES_PAGE", LIST_CATEGORIES_PAGE);

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

@@ -110,5 +110,12 @@ public SiteController getSiteController() {
 	public SitemapController getSitemapController() {
 		return new SitemapController(servicesConfig.getSeriesService());
 	}
+
+	@Bean
+	public SuggestionController getSuggestionController() { 
+		return new SuggestionController(
+			servicesConfig.getCountryService()
+		);
+	}
 
 }

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

@@ -133,6 +133,7 @@ public void showForm(
 		model.addAttribute("countries", countries);
 
 		model.addAttribute("years", YEARS);
+		model.addAttribute("suggestCountryUrl", Url.INFO_COUNTRY_SERIES_PAGE);
 
 		AddSeriesForm addSeriesForm = new AddSeriesForm();
 		addSeriesForm.setPerforated(true);

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

@@ -0,0 +1,29 @@
+package ru.mystamps.web.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import ru.mystamps.web.Url;
+import ru.mystamps.web.controller.converter.annotation.CurrentUser;
+import ru.mystamps.web.service.CountryService;
+import ru.mystamps.web.support.spring.security.HasAuthority;
+
+@Controller
+@RequiredArgsConstructor
+@SuppressWarnings({ "PMD.AvoidDuplicateLiterals", "PMD.TooManyMethods", "PMD.GodClass" })
+public class SuggestionController {
+	
+	private final CountryService countryService;
+	/**
+	 * @author John Shkarin
+	 */
+	@ResponseBody
+	@GetMapping(Url.INFO_COUNTRY_SERIES_PAGE)
+	@PreAuthorize(HasAuthority.CREATE_SERIES)
+	public String suggestCountryForUser(@CurrentUser Integer currentUserId) {
+		return countryService.suggestCountryForUser(currentUserId);
+	}
+	
+}

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

@@ -35,4 +35,6 @@ public interface CountryDao {
 	List<Object[]> getStatisticsOf(Integer collectionId, String lang);
 	List<LinkEntityDto> findAllAsLinkEntities(String lang);
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);
+
+	String suggestCountryForUser(Integer userId);
 }

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

@@ -30,6 +30,7 @@
 @SuppressWarnings("PMD.TooManyMethods")
 public interface SeriesDao {
 	Integer add(AddSeriesDbDto series);
+	
 	void markAsModified(Integer seriesId, Date updateAt, Integer updatedBy);
 	List<SitemapInfoDto> findAllForSitemap();
 	List<SeriesInfoDto> findLastAdded(int quantity, String lang);

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

@@ -76,6 +76,12 @@ public class JdbcCountryDao implements CountryDao {
 
 	@Value("${country.find_country_link_info_by_slug}")
 	private String findCountryLinkEntityBySlugSql;
+
+	@Value("${country.find_last_country_by_id}")
+	private String findLastCountryByIdSql;
+
+	@Value("${country.find_popular_country}")
+	private String findPopularCountrySql;
 
 	@Override
 	public Integer add(AddCountryDbDto country) {
@@ -206,5 +212,26 @@ public LinkEntityDto findOneAsLinkEntity(String slug, String lang) {
 			return null;
 		}
 	}
-	
+
+	@Override
+	public String suggestCountryForUser(Integer userId) {
+		
+		try {
+			return jdbcTemplate.queryForObject(
+				findLastCountryByIdSql,
+				Collections.singletonMap("created_by", userId),
+				String.class);
+		} catch (EmptyResultDataAccessException ignored) {
+			try {
+				return jdbcTemplate.queryForObject(
+					findPopularCountrySql,
+					Collections.<String, Object>emptyMap(),
+					String.class
+				);
+
+			} catch (EmptyResultDataAccessException ex) {
+				return null;
+			}
+		}
+	}
 }

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

@@ -23,8 +23,10 @@
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.AddCountryDto;
 
+@SuppressWarnings("PMD.TooManyMethods")
 public interface CountryService {
 	String add(AddCountryDto dto, Integer userId);
+	String suggestCountryForUser(Integer userId);
 	List<LinkEntityDto> findAllAsLinkEntities(String lang);
 	LinkEntityDto findOneAsLinkEntity(String slug, String lang);
 	long countAll();

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

@@ -162,5 +162,15 @@ public List<Object[]> getStatisticsOf(Integer collectionId, String lang) {
 
 		return countryDao.getStatisticsOf(collectionId, lang);
 	}
-	
+
+	/**
+	 * @author Shkarin John
+	 */
+	@Override
+	@Transactional(readOnly = true)
+	public String suggestCountryForUser(Integer userId) {
+		Validate.isTrue(userId != null, "UserId must be non null");
+
+		return countryDao.suggestCountryForUser(userId);
+	}
 }

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

@@ -31,6 +31,7 @@
 @SuppressWarnings("PMD.TooManyMethods")
 public interface SeriesService {
 	Integer add(AddSeriesDto dto, Integer userId, boolean userCanAddComments);
+	
 	void addImageToSeries(AddImageDto dto, Integer seriesId, Integer userId);
 	long countAll();
 	long countAllStamps();

src/main/java/ru/mystamps/web/support/togglz/Features.java

@@ -74,7 +74,11 @@ public enum Features implements Feature {
 
 	@Label("View site events")
 	@EnabledByDefault
-	VIEW_SITE_EVENTS;
+	VIEW_SITE_EVENTS,
+
+	@Label("/series/add: show link with auto-suggestions")
+	@EnabledByDefault
+	INFO_COUNTRY_SERIES;
 
 	public boolean isActive() {
 		return FeatureContext.getFeatureManager().isActive(this);

src/main/javascript/series/add.js

@@ -2,7 +2,7 @@
 // IMPORTANT:
 // You have to update Url.RESOURCES_VERSION each time whenever you're modified this file!
 //
-function initPage() {
+function initPage(suggestCountryUrl) {
 	$('#country').selectize();
 
 	$('.js-catalog-numbers').on('blur', function() {
@@ -21,4 +21,19 @@ function initPage() {
 	$('.js-with-tooltip').tooltip({
 		'placement': 'right'
 	});
+
+	$.get(suggestCountryUrl, function (slug){
+		if (slug == null)
+			return;
+		
+		var country = $("#guess_country");
+		country.show();
+		country.click(function() {
+			$(this).hide();
+
+			var select_country = $("#country").selectize();
+			var selectize = select_country[0].selectize;
+			selectize.setValue(slug);
+		});
+	});
 }

src/main/resources/liquibase/sql/test-add-countries.sql

@@ -0,0 +1,12 @@
+--
+-- Auto-generated by Maven, based on values from src/main/resources/test/spring/test-data.properties
+--
+
+INSERT INTO countries(name, created_at, created_by, updated_at, updated_by, name_ru, slug) VALUES
+	('Russia', NOW(), 3, NOW(), 3, 'Россия', 'russia');
+	
+INSERT INTO countries(name, created_at, created_by, updated_at, updated_by, name_ru, slug) VALUES
+	('Germany', NOW(), 3, NOW(), 3, 'Германия', 'germany');
+
+INSERT INTO countries(name, created_at, created_by, updated_at, updated_by, name_ru, slug) VALUES
+	('France', NOW(), 3, NOW(), 3, 'Франция', 'france');

src/main/resources/liquibase/sql/test-add-series.sql

@@ -0,0 +1,18 @@
+--
+-- Auto-generated by Maven, based on values from src/main/resources/test/spring/test-data.properties
+--
+
+INSERT INTO series(id, quantity, perforated, country_id, created_at, created_by, updated_at, updated_by, category_id) VALUES
+	(2, 1, 1, 2, NOW() + 1, 1, NOW(), 4, 1);
+
+INSERT INTO series(id, quantity, perforated, country_id, created_at, created_by, updated_at, updated_by, category_id) VALUES
+	(3, 1, 1, 2, NOW() + 2, 1, NOW(), 4, 1);
+	
+INSERT INTO series(id, quantity, perforated, country_id, created_at, created_by, updated_at, updated_by, category_id) VALUES
+	(4, 1, 1, 2, NOW() + 3, 1, NOW(), 4, 1);
+
+INSERT INTO series(id, quantity, perforated, country_id, created_at, created_by, updated_at, updated_by, category_id) VALUES
+	(5, 1, 1, 2, NOW() + 4, 1, NOW(), 4, 1);
+
+INSERT INTO series(id, quantity, perforated, country_id, created_at, created_by, updated_at, updated_by, category_id) VALUES
+	(6, 1, 1, 4, NOW() + 5, 1, NOW(), 4, 1);

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

@@ -121,6 +121,7 @@ t_add_more_images_hint = Later you will be able to add additional images
 t_not_chosen = Not chosen
 t_create_category_hint = You can also <a tabindex="-1" href="{0}">add a new category</a>
 t_create_country_hint = You can also <a tabindex="-1" href="{0}">add a new country</a>
+t_guess_country = Guess a country
 
 # series/info.html
 t_series_info = Info about series

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

@@ -121,6 +121,7 @@ t_add_more_images_hint = Вы сможете добавить дополните
 t_not_chosen = Не выбрана
 t_create_category_hint = Вы также можете <a tabindex="-1" href="{0}">добавить новую категорию</a>
 t_create_country_hint = Вы также можете <a tabindex="-1" href="{0}">добавить новую страну</a>
+t_guess_country = Угадать страну
 
 # series/info.html
 t_series_info = Информация о серии

src/main/resources/sql/country_dao_queries.properties

@@ -81,3 +81,17 @@ country.find_country_link_info_by_slug = \
     FROM countries c \
    WHERE c.slug = :slug \
 ORDER BY CASE WHEN 'ru' = :lang THEN COALESCE(c.name_ru, c.name) ELSE c.name END
+
+country.find_last_country_by_id = \
+   SELECT slug \
+     FROM series s \
+LEFT JOIN countries c ON c.id = s.country_id \
+    WHERE series.created_by = :created_by \
+ ORDER BY series.created_at DESC LIMIT 1
+
+country.find_popular_country = \
+   SELECT slug \
+	 FROM series s \
+LEFT JOIN countries c ON c.id = s.country_id \
+ GROUP BY country_id \
+ ORDER BY COUNT(*) DESC LIMIT 1

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

@@ -15,7 +15,7 @@
 		<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
 		<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.12.3/css/selectize.bootstrap3.min.css" th:href="${SELECTIZE_CSS}" />
 	</head>
-	<body onload="initPage()">
+	<body onload="initPage(${suggestCountryUrl})">
 		<div class="container-fluid">
 			<div class="row" id="header">
 				<div id="logo" class="col-sm-9 vcenter">
@@ -202,6 +202,10 @@ <h3 th:text="${#strings.capitalize(add_series)}">
 								<span id="country.errors" class="help-block" th:if="${#fields.hasErrors('country')}" th:each="error : ${#fields.errors('country')}" th:text="${error}"></span>
 								/*/-->
 							</div>
+							
+							<small togglz:active="INFO_COUNTRY_SERIES" id="guess_country" style="display: none;">
+								<a tabindex="-1" th:text="#{t_guess_country}" href="javascript:void(0)">Guess a country</a>
+							</small>
 						</div>
 
 						<div class="form-group form-group-sm" th:classappend="${#fields.hasErrors('quantity') ? 'has-error' : ''}">