UserServiceImpl.registerUser(): port to JDBC.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -25,8 +25,8 @@
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-// CheckStyle: ignore AvoidStarImportCheck for next 2 lines
-import ru.mystamps.web.dao.*; // NOPMD: UnusedImports
+import ru.mystamps.web.dao.ImageDao;
+// CheckStyle: ignore AvoidStarImportCheck for next 1 line
 import ru.mystamps.web.service.*; // NOPMD: UnusedImports
 import ru.mystamps.web.support.spring.security.SecurityConfig;
 
@@ -40,9 +40,6 @@ public class ServicesConfig {
 	@Autowired
 	private SecurityConfig securityConfig;
 
-	@Autowired
-	private UserDao userDao;
-	
 	@Autowired
 	private StrategiesConfig strategiesConfig;
 
@@ -132,7 +129,6 @@ public SiteService getSiteService() {
 	@Bean
 	public UserService getUserService() {
 		return new UserServiceImpl(
-			userDao,
 			daoConfig.getJdbcUserDao(),
 			getUsersActivationService(),
 			getCollectionService(),

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

@@ -17,9 +17,11 @@
  */
 package ru.mystamps.web.dao;
 
+import ru.mystamps.web.dao.dto.AddUserDbDto;
 import ru.mystamps.web.dao.dto.UserDetails;
 
 public interface JdbcUserDao {
     long countByLogin(String login);
     UserDetails findUserDetailsByLogin(String login);
+	Integer add(AddUserDbDto user);
 }

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.dao.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import static ru.mystamps.web.dao.dto.UserDetails.Role;
+
+@Getter
+@Setter
+@ToString(exclude = {"registeredAt", "activatedAt", "hash"})
+public class AddUserDbDto {
+	private String login;
+	private Role role;
+	private String name;
+	private String email;
+	private Date registeredAt;
+	private Date activatedAt;
+	private String hash;
+}

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

@@ -18,14 +18,22 @@
 package ru.mystamps.web.dao.impl;
 
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.Validate;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
 
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcUserDao;
+import ru.mystamps.web.dao.dto.AddUserDbDto;
 import ru.mystamps.web.dao.dto.UserDetails;
 
 @RequiredArgsConstructor
@@ -39,6 +47,9 @@ public class JdbcUserDaoImpl implements JdbcUserDao {
 	@Value("${user.find_user_details_by_login}")
 	private String findUserDetailsByLoginSql;
 
+	@Value("${user.create}")
+	private String addUserSql;
+	
 	@Override
 	public long countByLogin(String login) {
 		return jdbcTemplate.queryForObject(
@@ -61,4 +72,32 @@ public UserDetails findUserDetailsByLogin(String login) {
 		}
 	}
 
+	@Override
+	public Integer add(AddUserDbDto user) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("login", user.getLogin());
+		params.put("role", String.valueOf(user.getRole()));
+		params.put("name", user.getName());
+		params.put("email", user.getEmail());
+		params.put("registered_at", user.getRegisteredAt());
+		params.put("activated_at", user.getActivatedAt());
+		params.put("hash", user.getHash());
+		
+		KeyHolder holder = new GeneratedKeyHolder();
+		
+		int affected = jdbcTemplate.update(
+			addUserSql,
+			new MapSqlParameterSource(params),
+			holder
+		);
+		
+		Validate.validState(
+			affected == 1,
+			"Unexpected number of affected rows after creation of user: %d",
+			affected
+		);
+		
+		return Integer.valueOf(holder.getKey().intValue());
+	}
+	
 }

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

@@ -32,20 +32,18 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcUserDao;
-import ru.mystamps.web.dao.UserDao;
+import ru.mystamps.web.dao.dto.AddUserDbDto;
 import ru.mystamps.web.dao.dto.UserDetails;
 import ru.mystamps.web.dao.dto.UsersActivationDto;
-import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.ActivateAccountDto;
 
-import static ru.mystamps.web.entity.User.Role.USER;
+import static ru.mystamps.web.dao.dto.UserDetails.Role.USER;
 
 @RequiredArgsConstructor
 public class UserServiceImpl implements UserService {
 
 	private static final Logger LOG = LoggerFactory.getLogger(UserServiceImpl.class);
 
-	private final UserDao userDao;
 	private final JdbcUserDao jdbcUserDao;
 	private final UsersActivationService usersActivationService;
 	private final CollectionService collectionService;
@@ -84,7 +82,7 @@ public void registerUser(ActivateAccountDto dto) {
 
 		Date now = new Date();
 
-		User user = new User();
+		AddUserDbDto user = new AddUserDbDto();
 		user.setLogin(login);
 		user.setRole(USER);
 		user.setName(finalName);
@@ -93,12 +91,12 @@ public void registerUser(ActivateAccountDto dto) {
 		user.setActivatedAt(now);
 		user.setHash(hash);
 
-		user = userDao.save(user);
+		Integer id = jdbcUserDao.add(user);
 		usersActivationService.remove(activationKey);
 
-		LOG.info("User has been created ({})", user);
+		LOG.info("User #{} has been created ({})", id, user);
 
-		collectionService.createCollection(user.getId(), user.getLogin());
+		collectionService.createCollection(id, user.getLogin());
 	}
 
 	@Override

src/main/resources/sql/user_dao_queries.properties

@@ -15,3 +15,24 @@ SELECT u.id \
   JOIN collections c \
     ON c.user_id = u.id \
  WHERE u.login = :login
+
+user.create = \
+INSERT \
+  INTO users \
+     ( login \
+     , role \
+     , name \
+     , email \
+     , registered_at \
+     , activated_at \
+     , hash \
+     ) \
+VALUES \
+     ( :login \
+     , :role \
+     , :name \
+     , :email \
+     , :registered_at \
+     , :activated_at \
+     , :hash \
+     )

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

@@ -57,7 +57,7 @@ class SeriesServiceImplTest extends Specification {
 
 		imageForm = new AddImageForm()
 
-		userId = TestObjects.createUser().getId()
+		userId = TestObjects.TEST_USER_ID
 
 		imageService.save(_) >> ANY_IMAGE_ID