CollectionService.createCollection(): change arguments to getting rid of usage of User entity.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -17,12 +17,11 @@
  */
 package ru.mystamps.web.service;
 
-import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.UrlEntityDto;
 
 public interface CollectionService {
-	void createCollection(User user);
+	void createCollection(Integer ownerId, String ownerLogin);
 	UrlEntityDto addToCollection(Integer userId, Integer seriesId);
 	UrlEntityDto removeFromCollection(Integer userId, Integer seriesId);
 	boolean isSeriesInCollection(Integer userId, Integer seriesId);

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

@@ -29,7 +29,6 @@
 
 import ru.mystamps.web.dao.JdbcCollectionDao;
 import ru.mystamps.web.dao.dto.AddCollectionDbDto;
-import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.UrlEntityDto;
 import ru.mystamps.web.util.SlugUtils;
@@ -42,14 +41,15 @@ public class CollectionServiceImpl implements CollectionService {
 
 	@Override
 	@Transactional
-	public void createCollection(User user) {
-		Validate.isTrue(user != null, "User must be non null");
+	public void createCollection(Integer ownerId, String ownerLogin) {
+		Validate.isTrue(ownerId != null, "Owner id must be non null");
+		Validate.isTrue(ownerLogin != null, "Owner login must be non null");
 
 		AddCollectionDbDto collection = new AddCollectionDbDto();
-		collection.setOwnerId(user.getId());
+		collection.setOwnerId(ownerId);
 
-		String slug = SlugUtils.slugify(user.getLogin());
-		Validate.isTrue(slug != null, "Slug for string '%s' is null", user.getLogin());
+		String slug = SlugUtils.slugify(ownerLogin);
+		Validate.isTrue(slug != null, "Slug for string '%s' is null", ownerLogin);
 		collection.setSlug(slug);
 
 		Integer id = collectionDao.add(collection);

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

@@ -96,7 +96,7 @@ public void registerUser(ActivateAccountDto dto) {
 
 		LOG.info("User has been created ({})", user);
 
-		collectionService.createCollection(user);
+		collectionService.createCollection(user.getId(), user.getLogin());
 	}
 
 	@Override

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

@@ -72,7 +72,7 @@ class UserServiceImplTest extends Specification {
 		when:
 			service.registerUser(activationForm)
 		then:
-			1 * userDao.save(_ as User)
+			1 * userDao.save(_ as User) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should delete registration request"() {
@@ -87,6 +87,8 @@ class UserServiceImplTest extends Specification {
 				assert actualActivation == expectedActivation
 				return true
 			})
+		and:
+			userDao.save(_ as User) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should throw exception when activation key is null"() {
@@ -118,7 +120,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.save({ User user ->
 				assert user?.name == expectedUserName
 				return true
-			})
+			}) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should pass login instead of name when name is null"() {
@@ -131,7 +133,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.save({ User user ->
 				assert user?.name == expectedUserLogin
 				return true
-			})
+			}) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should pass login instead of name when name is empty"() {
@@ -145,7 +147,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.save({ User user ->
 				assert user?.name == expectedUserLogin
 				return true
-			})
+			}) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should fill role field"() {
@@ -155,7 +157,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.save({ User user ->
 				assert user?.role == Role.USER
 				return true
-			})
+			}) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should use email from registration request"() {
@@ -169,7 +171,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.save({ User user ->
 				assert user?.email == activation.email
 				return true
-			})
+			}) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should use registration date from registration request"() {
@@ -183,7 +185,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.save({ User user ->
 				assert user?.registeredAt == activation.createdAt
 				return true
-			})
+			}) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should throw exception when password is null"() {
@@ -204,7 +206,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.save({ User user ->
 				assert user?.hash == expectedHash
 				return true
-			})
+			}) >> TestObjects.createUser()
 		and:
 			1 * encoder.encode({ String password ->
 				assert password == TestObjects.TEST_PASSWORD
@@ -239,7 +241,7 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.save({ User user ->
 				assert user?.login == expectedUserLogin
 				return true
-			})
+			}) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should assign activated at to current date"() {
@@ -249,23 +251,27 @@ class UserServiceImplTest extends Specification {
 			1 * userDao.save({ User user ->
 				assert DateUtils.roughlyEqual(user?.activatedAt, new Date())
 				return true
-			})
+			}) >> TestObjects.createUser()
 	}
 
 	def "registerUser() should create collection for user"() {
 		given:
-			userDao.save(_ as User) >> TestObjects.createUser()
+			Integer expectedId = 909;
+			String expectedLogin = "foobar"
+		and:
+			User user = TestObjects.createUser();
+			user.setId(expectedId)
+			user.setLogin(expectedLogin)
+		and:
+			userDao.save(_ as User) >> user
 		when:
 			service.registerUser(activationForm)
 		then:
-			1 * collectionService.createCollection({ User user ->
-				assert user?.login == activationForm.login
-				assert user?.role == Role.USER
-				assert user?.name == activationForm.name
-				assert user?.email != null
-				assert user?.registeredAt != null
-				assert DateUtils.roughlyEqual(user?.activatedAt, new Date())
-				assert user?.hash != null
+			1 * collectionService.createCollection({ Integer ownerId ->
+				assert ownerId == expectedId
+				return true
+			}, { String ownerLogin ->
+				assert ownerLogin == expectedLogin
 				return true
 			})
 	}