Skip to content

Commit 065ee85

Browse files
committed
Rename methods to clarify their purpose.
No functional changes.
1 parent f822b19 commit 065ee85

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public interface CountryDao {
3636
List<Object[]> getStatisticsOf(Integer collectionId, String lang);
3737
List<LinkEntityDto> findAllAsLinkEntities(String lang);
3838
LinkEntityDto findOneAsLinkEntity(String slug, String lang);
39-
String findLastCreatedByUser(Integer userId);
39+
String findCountryOfLastCreatedSeriesByUser(Integer userId);
4040
String findPopularCountryInCollection(Integer userId);
4141
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ public class JdbcCountryDao implements CountryDao {
7777
@Value("${country.find_country_link_info_by_slug}")
7878
private String findCountryLinkEntityBySlugSql;
7979

80-
@Value("${country.find_last_created_by_user}")
81-
private String findLastCreatedByUserSql;
80+
@SuppressWarnings("PMD.LongVariable")
81+
@Value("${country.find_from_last_created_series_by_user}")
82+
private String findFromLastCreatedSeriesByUserSql;
8283

8384
@SuppressWarnings("PMD.LongVariable")
8485
@Value("${country.find_popular_country_from_user_collection}")
@@ -216,12 +217,13 @@ public LinkEntityDto findOneAsLinkEntity(String slug, String lang) {
216217

217218
/**
218219
* @author Shkarin John
220+
* @author Slava Semushin
219221
*/
220222
@Override
221-
public String findLastCreatedByUser(Integer userId) {
223+
public String findCountryOfLastCreatedSeriesByUser(Integer userId) {
222224
try {
223225
return jdbcTemplate.queryForObject(
224-
findLastCreatedByUserSql,
226+
findFromLastCreatedSeriesByUserSql,
225227
Collections.singletonMap("created_by", userId),
226228
String.class
227229
);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ public List<Object[]> getStatisticsOf(Integer collectionId, String lang) {
174174
public String suggestCountryForUser(Integer userId) {
175175
Validate.isTrue(userId != null, "User id must be non null");
176176

177-
String slug = countryDao.findLastCreatedByUser(userId);
177+
String slug = countryDao.findCountryOfLastCreatedSeriesByUser(userId);
178178
if (slug != null) {
179179
LOG.info(
180-
"Country {} has been suggested to user #{} as a recently created",
180+
"Country {} has been suggested to user #{} from a recently created series",
181181
slug,
182182
userId
183183
);

src/main/resources/sql/country_dao_queries.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ country.find_country_link_info_by_slug = \
8282
WHERE c.slug = :slug \
8383
ORDER BY CASE WHEN 'ru' = :lang THEN COALESCE(c.name_ru, c.name) ELSE c.name END
8484

85-
country.find_last_created_by_user = \
85+
country.find_from_last_created_series_by_user = \
8686
SELECT c.slug \
8787
FROM series s \
8888
JOIN countries c \

0 commit comments

Comments
 (0)