Port country creation from JPA to JDBC.

php-coder · php-coder · commit ab95ef641f06 · 2015-09-09T22:31:48.000+03:00
Addressed to #120 No functional changes.
diff --git a/src/main/java/ru/mystamps/web/config/ServicesConfig.java b/src/main/java/ru/mystamps/web/config/ServicesConfig.java
@@ -35,9 +35,6 @@
 @EnableAsync
 public class ServicesConfig {
 	
-	@Inject
-	private CountryDao countryDao;
-	
 	@Inject
 	private CategoryDao categoryDao;
 	
@@ -76,7 +73,7 @@ public class ServicesConfig {
 	
 	@Bean
 	public CountryService getCountryService() {
-		return new CountryServiceImpl(countryDao, daoConfig.getJdbcCountryDao());
+		return new CountryServiceImpl(daoConfig.getJdbcCountryDao());
 	}
 	
 	@Bean
diff --git a/src/main/java/ru/mystamps/web/dao/JdbcCountryDao.java b/src/main/java/ru/mystamps/web/dao/JdbcCountryDao.java
@@ -19,10 +19,12 @@
 
 import java.util.Map;
 
+import ru.mystamps.web.dao.dto.AddCountryDbDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SelectEntityDto;
 
 public interface JdbcCountryDao {
+	Integer add(AddCountryDbDto country);
 	long countAll();
 	long countByName(String name);
 	long countByNameRu(String name);
diff --git a/src/main/java/ru/mystamps/web/dao/dto/AddCountryDbDto.java b/src/main/java/ru/mystamps/web/dao/dto/AddCountryDbDto.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2009-2015 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * 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 lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@ToString(of = { "name", "nameRu"})
+public class AddCountryDbDto {
+	private String name;
+	private String nameRu;
+	private String slug;
+	private Date createdAt;
+	private Integer createdBy;
+	private Date updatedAt;
+	private Integer updatedBy;
+}
diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDaoImpl.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcCountryDaoImpl.java
@@ -22,12 +22,18 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.Validate;
+
 import org.springframework.beans.factory.annotation.Value;
+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.JdbcCountryDao;
+import ru.mystamps.web.dao.dto.AddCountryDbDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SelectEntityDto;
 
@@ -36,6 +42,9 @@ public class JdbcCountryDaoImpl implements JdbcCountryDao {
 	
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 	
+	@Value("${country.create}")
+	private String addCountrySql;
+	
 	@Value("${country.count_all_countries}")
 	private String countAllSql;
 	
@@ -57,6 +66,34 @@ public class JdbcCountryDaoImpl implements JdbcCountryDao {
 	@Value("${country.find_all_countries_names_with_slug}")
 	private String findCountriesNamesWithSlugSql;
 	
+	@Override
+	public Integer add(AddCountryDbDto country) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("name", country.getName());
+		params.put("name_ru", country.getNameRu());
+		params.put("slug", country.getSlug());
+		params.put("created_at", country.getCreatedAt());
+		params.put("created_by", country.getCreatedBy());
+		params.put("updated_at", country.getUpdatedAt());
+		params.put("updated_by", country.getUpdatedBy());
+		
+		KeyHolder holder = new GeneratedKeyHolder();
+		
+		int affected = jdbcTemplate.update(
+			addCountrySql,
+			new MapSqlParameterSource(params),
+			holder
+		);
+		
+		Validate.validState(
+			affected == 1,
+			"Unexpected number of affected rows after creation of country: %d",
+			affected
+		);
+		
+		return Integer.valueOf(holder.getKey().intValue());
+	}
+	
 	@Override
 	public long countAll() {
 		return jdbcTemplate.queryForObject(
diff --git a/src/main/java/ru/mystamps/web/service/CountryServiceImpl.java b/src/main/java/ru/mystamps/web/service/CountryServiceImpl.java
@@ -32,10 +32,9 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcCountryDao;
+import ru.mystamps.web.dao.dto.AddCountryDbDto;
 import ru.mystamps.web.entity.Collection;
-import ru.mystamps.web.entity.Country;
 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;
@@ -46,7 +45,6 @@
 public class CountryServiceImpl implements CountryService {
 	private static final Logger LOG = LoggerFactory.getLogger(CountryServiceImpl.class);
 	
-	private final CountryDao countryDao;
 	private final JdbcCountryDao jdbcCountryDao;
 	
 	@Override
@@ -58,7 +56,7 @@ public UrlEntityDto add(AddCountryDto dto, User user) {
 		Validate.isTrue(dto.getNameRu() != null, "Country name on Russian should be non null");
 		Validate.isTrue(user != null, "Current user must be non null");
 		
-		Country country = new Country();
+		AddCountryDbDto country = new AddCountryDbDto();
 		country.setName(dto.getName());
 		country.setNameRu(dto.getNameRu());
 
@@ -70,16 +68,17 @@ public UrlEntityDto add(AddCountryDto dto, User user) {
 		country.setSlug(slug);
 		
 		Date now = new Date();
-		country.getMetaInfo().setCreatedAt(now);
-		country.getMetaInfo().setUpdatedAt(now);
 		
-		country.getMetaInfo().setCreatedBy(user);
-		country.getMetaInfo().setUpdatedBy(user);
-
-		Country entity = countryDao.save(country);
-		LOG.info("Country has been created ({})", entity.toLongString());
+		country.setCreatedAt(now);
+		country.setCreatedBy(user.getId());
+		country.setUpdatedAt(now);
+		country.setUpdatedBy(user.getId());
+		
+		Integer id = jdbcCountryDao.add(country);
+		
+		LOG.info("Country #{} has been created ({})", id, country);
 		
-		return new UrlEntityDto(entity.getId(), entity.getSlug());
+		return new UrlEntityDto(id, slug);
 	}
 	
 	@Override
diff --git a/src/main/resources/sql/country_dao_queries.properties b/src/main/resources/sql/country_dao_queries.properties
@@ -1,3 +1,24 @@
+country.create = \
+INSERT \
+  INTO countries \
+     ( name \
+     , name_ru \
+     , slug \
+     , created_at \
+     , created_by \
+     , updated_at \
+     , updated_by \
+     ) \
+VALUES \
+     ( :name \
+     , :name_ru \
+     , :slug \
+     , :created_at \
+     , :created_by \
+     , :updated_at \
+     , :updated_by \
+     )
+
 country.count_all_countries = \
 SELECT COUNT(*) \
   FROM countries
diff --git a/src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy
@@ -20,8 +20,8 @@ package ru.mystamps.web.service
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import ru.mystamps.web.dao.CountryDao
 import ru.mystamps.web.dao.JdbcCountryDao
+import ru.mystamps.web.dao.dto.AddCountryDbDto
 import ru.mystamps.web.entity.Country
 import ru.mystamps.web.entity.Collection
 import ru.mystamps.web.entity.User
@@ -37,9 +37,8 @@ class CountryServiceImplTest extends Specification {
 	private AddCountryForm form
 	private User user
 	
-	private CountryDao countryDao = Mock()
 	private JdbcCountryDao jdbcCountryDao = Mock()
-	private CountryService service = new CountryServiceImpl(countryDao, jdbcCountryDao)
+	private CountryService service = new CountryServiceImpl(jdbcCountryDao)
 	
 	def setup() {
 		form = new AddCountryForm()
@@ -87,11 +86,15 @@ class CountryServiceImplTest extends Specification {
 	
 	def "add() should call dao"() {
 		given:
-			Country country = TestObjects.createCountry()
+			Integer expectedId = 7
 		and:
-			countryDao.save(_ as Country) >> country
+			form.setName("Example Country")
 		and:
-			UrlEntityDto expected = new UrlEntityDto(country.getId(), country.getSlug())
+			String expectedSlug = "example-country"
+		and:
+			jdbcCountryDao.add(_ as AddCountryDbDto) >> expectedId
+		and:
+			UrlEntityDto expected = new UrlEntityDto(expectedId, expectedSlug)
 		when:
 			UrlEntityDto actual = service.add(form, user)
 		then:
@@ -105,10 +108,10 @@ class CountryServiceImplTest extends Specification {
 		when:
 			service.add(form, user)
 		then:
-			1 * countryDao.save({ Country country ->
+			1 * jdbcCountryDao.add({ AddCountryDbDto country ->
 				assert country?.name == expectedCountryName
 				return true
-			}) >> TestObjects.createCountry()
+			}) >> 10
 	}
 	
 	def "add() should pass country name on Russian to dao"() {
@@ -118,10 +121,10 @@ class CountryServiceImplTest extends Specification {
 		when:
 			service.add(form, user)
 		then:
-			1 * countryDao.save({ Country country ->
+			1 * jdbcCountryDao.add({ AddCountryDbDto country ->
 				assert country?.nameRu == expectedCountryName
 				return true
-			}) >> TestObjects.createCountry()
+			}) >> 20
 	}
 	
 	def "add() should throw exception when name can't be converted to slug"() {
@@ -143,50 +146,50 @@ class CountryServiceImplTest extends Specification {
 		when:
 			service.add(form, user)
 		then:
-			1 * countryDao.save({ Country country ->
+			1 * jdbcCountryDao.add({ AddCountryDbDto country ->
 				assert country?.slug == slug
 				return true
-			}) >> TestObjects.createCountry()
+			}) >> 30
 	}
 	
 	def "add() should assign created at to current date"() {
 		when:
 			service.add(form, user)
 		then:
-			1 * countryDao.save({ Country country ->
-				assert DateUtils.roughlyEqual(country?.metaInfo?.createdAt, new Date())
+			1 * jdbcCountryDao.add({ AddCountryDbDto country ->
+				assert DateUtils.roughlyEqual(country?.createdAt, new Date())
 				return true
-			}) >> TestObjects.createCountry()
+			}) >> 40
 	}
 	
 	def "add() should assign updated at to current date"() {
 		when:
 			service.add(form, user)
 		then:
-			1 * countryDao.save({ Country country ->
-				assert DateUtils.roughlyEqual(country?.metaInfo?.updatedAt, new Date())
+			1 * jdbcCountryDao.add({ AddCountryDbDto country ->
+				assert DateUtils.roughlyEqual(country?.updatedAt, new Date())
 				return true
-			}) >> TestObjects.createCountry()
+			}) >> 50
 	}
 	
 	def "add() should assign created by to user"() {
 		when:
 			service.add(form, user)
 		then:
-			1 * countryDao.save({ Country country ->
-				assert country?.metaInfo?.createdBy == user
+			1 * jdbcCountryDao.add({ AddCountryDbDto country ->
+				assert country?.createdBy == user.id
 				return true
-			}) >> TestObjects.createCountry()
+			}) >> 60
 	}
 	
 	def "add() should assign updated by to user"() {
 		when:
 			service.add(form, user)
 		then:
-			1 * countryDao.save({ Country country ->
-				assert country?.metaInfo?.updatedBy == user
+			1 * jdbcCountryDao.add({ AddCountryDbDto country ->
+				assert country?.updatedBy == user.id
 				return true
-			}) >> TestObjects.createCountry()
+			}) >> 70
 	}
 	
 	//
