Port category creation from JPA to JDBC.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -35,9 +35,6 @@
 @EnableAsync
 public class ServicesConfig {
 
-	@Inject
-	private CategoryDao categoryDao;
-	
 	@Inject
 	private DaoConfig daoConfig;
 
@@ -78,7 +75,7 @@ public CountryService getCountryService() {
 
 	@Bean
 	public CategoryService getCategoryService() {
-		return new CategoryServiceImpl(categoryDao, daoConfig.getJdbcCategoryDao());
+		return new CategoryServiceImpl(daoConfig.getJdbcCategoryDao());
 	}
 
 	@Bean

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

@@ -19,10 +19,12 @@
 
 import java.util.Map;
 
+import ru.mystamps.web.dao.dto.AddCategoryDbDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SelectEntityDto;
 
 public interface JdbcCategoryDao {
+	Integer add(AddCategoryDbDto category);
 	long countAll();
 	long countByName(String name);
 	long countByNameRu(String name);

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2009-2015 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;
+
+@Getter
+@Setter
+@ToString(of = { "name", "nameRu"})
+public class AddCategoryDbDto {
+	private String name;
+	private String nameRu;
+	private String slug;
+	private Date createdAt;
+	private Integer createdBy;
+	private Date updatedAt;
+	private Integer updatedBy;
+}

src/main/java/ru/mystamps/web/dao/impl/JdbcCategoryDaoImpl.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.JdbcCategoryDao;
+import ru.mystamps.web.dao.dto.AddCategoryDbDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SelectEntityDto;
 
@@ -36,6 +42,9 @@ public class JdbcCategoryDaoImpl implements JdbcCategoryDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
 
+	@Value("${category.create}")
+	private String addCategorySql;
+	
 	@Value("${category.count_all_categories}")
 	private String countAllSql;
 
@@ -57,6 +66,34 @@ public class JdbcCategoryDaoImpl implements JdbcCategoryDao {
 	@Value("${category.find_all_categories_names_with_slug}")
 	private String findCategoriesNamesWithSlugSql;
 
+	@Override
+	public Integer add(AddCategoryDbDto category) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("name", category.getName());
+		params.put("name_ru", category.getNameRu());
+		params.put("slug", category.getSlug());
+		params.put("created_at", category.getCreatedAt());
+		params.put("created_by", category.getCreatedBy());
+		params.put("updated_at", category.getUpdatedAt());
+		params.put("updated_by", category.getUpdatedBy());
+		
+		KeyHolder holder = new GeneratedKeyHolder();
+		
+		int affected = jdbcTemplate.update(
+			addCategorySql,
+			new MapSqlParameterSource(params),
+			holder
+		);
+		
+		Validate.validState(
+			affected == 1,
+			"Unexpected number of affected rows after creation of category: %d",
+			affected
+		);
+		
+		return Integer.valueOf(holder.getKey().intValue());
+	}
+	
 	@Override
 	public long countAll() {
 		return jdbcTemplate.queryForObject(

src/main/java/ru/mystamps/web/entity/Category.java

@@ -67,18 +67,6 @@ public String toString() {
 		return String.valueOf(id);
 	}
 
-	public String toLongString() {
-		return new StringBuilder()
-			.append("Category(id=")
-			.append(id)
-			.append(", name=")
-			.append(name)
-			.append(", nameRu=")
-			.append(nameRu)
-			.append(')')
-			.toString();
-	}
-	
 	@Override
 	public String getLocalizedName(Locale locale) {
 		return LocaleUtils.getLocalizedName(locale, this);

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

@@ -32,10 +32,10 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcCategoryDao;
+import ru.mystamps.web.dao.dto.AddCategoryDbDto;
 import ru.mystamps.web.entity.Category;
 import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.User;
-import ru.mystamps.web.dao.CategoryDao;
 import ru.mystamps.web.service.dto.AddCategoryDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.SelectEntityDto;
@@ -46,7 +46,6 @@
 public class CategoryServiceImpl implements CategoryService {
 	private static final Logger LOG = LoggerFactory.getLogger(CategoryServiceImpl.class);
 
-	private final CategoryDao categoryDao;
 	private final JdbcCategoryDao jdbcCategoryDao;
 
 	@Override
@@ -58,7 +57,7 @@ public UrlEntityDto add(AddCategoryDto dto, User user) {
 		Validate.isTrue(dto.getNameRu() != null, "Russian category name should be non null");
 		Validate.isTrue(user != null, "Current user must be non null");
 
-		Category category = new Category();
+		AddCategoryDbDto category = new AddCategoryDbDto();
 		category.setName(dto.getName());
 		category.setNameRu(dto.getNameRu());
 
@@ -70,16 +69,16 @@ public UrlEntityDto add(AddCategoryDto dto, User user) {
 		category.setSlug(slug);
 
 		Date now = new Date();
-		category.getMetaInfo().setCreatedAt(now);
-		category.getMetaInfo().setUpdatedAt(now);
+		category.setCreatedAt(now);
+		category.setUpdatedAt(now);
 
-		category.getMetaInfo().setCreatedBy(user);
-		category.getMetaInfo().setUpdatedBy(user);
+		category.setCreatedBy(user.getId());
+		category.setUpdatedBy(user.getId());
 
-		Category entity = categoryDao.save(category);
-		LOG.info("Category has been created ({})", entity.toLongString());
+		Integer id = jdbcCategoryDao.add(category);
+		LOG.info("Category #{} has been created ({})", id, category);
 
-		return new UrlEntityDto(entity.getId(), entity.getSlug());
+		return new UrlEntityDto(id, slug);
 	}
 
 	@Override

src/main/resources/sql/category_dao_queries.properties

@@ -1,3 +1,24 @@
+category.create = \
+INSERT \
+  INTO categories \
+     ( 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 \
+     )
+
 category.count_all_categories = \
 SELECT COUNT(*) \
   FROM categories

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

@@ -20,8 +20,8 @@ package ru.mystamps.web.service
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import ru.mystamps.web.dao.CategoryDao
 import ru.mystamps.web.dao.JdbcCategoryDao
+import ru.mystamps.web.dao.dto.AddCategoryDbDto
 import ru.mystamps.web.entity.Category
 import ru.mystamps.web.entity.Collection
 import ru.mystamps.web.entity.User
@@ -37,9 +37,8 @@ class CategoryServiceImplTest extends Specification {
 	private AddCategoryForm form
 	private User user
 
-	private CategoryDao categoryDao = Mock()
 	private JdbcCategoryDao jdbcCategoryDao = Mock()
-	private CategoryService service = new CategoryServiceImpl(categoryDao, jdbcCategoryDao)
+	private CategoryService service = new CategoryServiceImpl(jdbcCategoryDao)
 
 	def setup() {
 		form = new AddCategoryForm()
@@ -87,11 +86,15 @@ class CategoryServiceImplTest extends Specification {
 
 	def "add() should call dao"() {
 		given:
-			Category category = TestObjects.createCategory()
+			Integer expectedId = 10
 		and:
-			categoryDao.save(_ as Category) >> category
+			form.setName('Example Category')
 		and:
-			UrlEntityDto expected = new UrlEntityDto(category.getId(), category.getSlug())
+			String expectedSlug = 'example-category'
+		and:
+			jdbcCategoryDao.add(_ as AddCategoryDbDto) >> expectedId
+		and:
+			UrlEntityDto expected = new UrlEntityDto(expectedId, expectedSlug)
 		when:
 			UrlEntityDto actual = service.add(form, user)
 		then:
@@ -105,10 +108,10 @@ class CategoryServiceImplTest extends Specification {
 		when:
 			service.add(form, user)
 		then:
-			1 * categoryDao.save({ Category category ->
+			1 * jdbcCategoryDao.add({ AddCategoryDbDto category ->
 				assert category?.name == expectedCategoryName
 				return true
-			}) >> TestObjects.createCategory()
+			}) >> 20
 	}
 
 	def "add() should pass Russian category name to dao"() {
@@ -118,10 +121,10 @@ class CategoryServiceImplTest extends Specification {
 		when:
 			service.add(form, user)
 		then:
-			1 * categoryDao.save({ Category category ->
+			1 * jdbcCategoryDao.add({ AddCategoryDbDto category ->
 				assert category?.nameRu == expectedCategoryName
 				return true
-			}) >> TestObjects.createCategory()
+			}) >> 30
 	}
 
 	def "add() should throw exception when name can't be converted to slug"() {
@@ -143,50 +146,50 @@ class CategoryServiceImplTest extends Specification {
 		when:
 			service.add(form, user)
 		then:
-			1 * categoryDao.save({ Category category ->
+			1 * jdbcCategoryDao.add({ AddCategoryDbDto category ->
 				assert category?.slug == slug
 				return true
-			}) >> TestObjects.createCategory()
+			}) >> 40
 	}
 
 	def "add() should assign created at to current date"() {
 		when:
 			service.add(form, user)
 		then:
-			1 * categoryDao.save({ Category category ->
-				assert DateUtils.roughlyEqual(category?.metaInfo?.createdAt, new Date())
+			1 * jdbcCategoryDao.add({ AddCategoryDbDto category ->
+				assert DateUtils.roughlyEqual(category?.createdAt, new Date())
 				return true
-			}) >> TestObjects.createCategory()
+			}) >> 50
 	}
 
 	def "add() should assign updated at to current date"() {
 		when:
 			service.add(form, user)
 		then:
-			1 * categoryDao.save({ Category category ->
-				assert DateUtils.roughlyEqual(category?.metaInfo?.updatedAt, new Date())
+			1 * jdbcCategoryDao.add({ AddCategoryDbDto category ->
+				assert DateUtils.roughlyEqual(category?.updatedAt, new Date())
 				return true
-			}) >> TestObjects.createCategory()
+			}) >> 60
 	}
 
 	def "add() should assign created by to user"() {
 		when:
 			service.add(form, user)
 		then:
-			1 * categoryDao.save({ Category category ->
-				assert category?.metaInfo?.createdBy == user
+			1 * jdbcCategoryDao.add({ AddCategoryDbDto category ->
+				assert category?.createdBy == user.id
 				return true
-			}) >> TestObjects.createCategory()
+			}) >> 70
 	}
 
 	def "add() should assign updated by to user"() {
 		when:
 			service.add(form, user)
 		then:
-			1 * categoryDao.save({ Category category ->
-				assert category?.metaInfo?.updatedBy == user
+			1 * jdbcCategoryDao.add({ AddCategoryDbDto category ->
+				assert category?.updatedBy == user.id
 				return true
-			}) >> TestObjects.createCategory()
+			}) >> 80
 	}
 
 	//