CollectionService.addToCollection(): don't return UrlEntityDto.

Addressed to #440

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/controller/SeriesController.java

@@ -48,6 +48,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
@@ -66,6 +68,7 @@
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.service.dto.SeriesDto;
 import ru.mystamps.web.support.spring.security.Authority;
+import ru.mystamps.web.support.spring.security.CustomUserDetails;
 import ru.mystamps.web.support.spring.security.SecurityContextUtils;
 import ru.mystamps.web.util.CatalogUtils;
 import ru.mystamps.web.util.LocaleUtils;
@@ -260,7 +263,7 @@ public String processImage(
 	)
 	public String addToCollection(
 		@PathVariable("id") Integer seriesId,
-		@CurrentUser Integer currentUserId,
+		@AuthenticationPrincipal CustomUserDetails currentUserDetails,
 		RedirectAttributes redirectAttributes,
 		HttpServletResponse response)
 		throws IOException {
@@ -276,12 +279,14 @@ public String addToCollection(
 			return null;
 		}
 
-		UrlEntityDto collection = collectionService.addToCollection(currentUserId, seriesId);
+		Integer userId = currentUserDetails.getUserId();
+		collectionService.addToCollection(userId, seriesId);
 
 		redirectAttributes.addFlashAttribute("justAddedSeries", true);
 		redirectAttributes.addFlashAttribute("justAddedSeriesId", seriesId);
-		
-		return redirectTo(Url.INFO_COLLECTION_PAGE, collection.getSlug());
+
+		String collectionSlug = currentUserDetails.getUserCollectionSlug();
+		return redirectTo(Url.INFO_COLLECTION_PAGE, collectionSlug);
 	}
 
 	@RequestMapping(

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

@@ -30,7 +30,7 @@ public interface CollectionDao {
 	Integer add(AddCollectionDbDto collection);
 	boolean isSeriesInUserCollection(Integer userId, Integer seriesId);
 	UrlEntityDto findCollectionUrlEntityByUserId(Integer userId);
-	void addSeriesToCollection(String collectionSlug, Integer seriesId);
+	void addSeriesToUserCollection(Integer userId, Integer seriesId);
 	void removeSeriesFromCollection(Integer collectionId, Integer seriesId);
 	CollectionInfoDto findCollectionInfoBySlug(String slug);
 }

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

@@ -138,17 +138,19 @@ public UrlEntityDto findCollectionUrlEntityByUserId(Integer userId) {
 	}
 
 	@Override
-	public void addSeriesToCollection(String collectionSlug, Integer seriesId) {
+	public void addSeriesToUserCollection(Integer userId, Integer seriesId) {
 		Map<String, Object> params = new HashMap<>();
-		params.put("collection_slug", collectionSlug);
+		params.put("user_id", userId);
 		params.put("series_id", seriesId);
 
 		int affected = jdbcTemplate.update(addSeriesToCollectionSql, params);
+		
+		// CheckStyle: ignore LineLength for next 3 lines
 		Validate.validState(
 			affected == 1,
-			"Unexpected number of affected rows after adding series #%d to collection '%s': %d",
+			"Unexpected number of affected rows after adding series #%d to collection of user #%d: %d",
 			seriesId,
-			collectionSlug,
+			userId,
 			affected
 		);
 	}

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

@@ -25,7 +25,7 @@
 
 public interface CollectionService {
 	void createCollection(Integer ownerId, String ownerLogin);
-	UrlEntityDto addToCollection(Integer userId, Integer seriesId);
+	void addToCollection(Integer userId, Integer seriesId);
 	UrlEntityDto removeFromCollection(Integer userId, Integer seriesId);
 	boolean isSeriesInCollection(Integer userId, Integer seriesId);
 	long countCollectionsOfUsers();

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

@@ -69,22 +69,13 @@ public void createCollection(Integer ownerId, String ownerLogin) {
 	@Override
 	@Transactional
 	@PreAuthorize(HasAuthority.UPDATE_COLLECTION)
-	public UrlEntityDto addToCollection(Integer userId, Integer seriesId) {
+	public void addToCollection(Integer userId, Integer seriesId) {
 		Validate.isTrue(userId != null, "User id must be non null");
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 
-		UrlEntityDto url = collectionDao.findCollectionUrlEntityByUserId(userId);
-		String collectionSlug = url.getSlug();
-		
-		collectionDao.addSeriesToCollection(collectionSlug, seriesId);
-		
-		LOG.info(
-			"Series #{} has been added to collection of user #{}",
-			seriesId,
-			userId
-		);
+		collectionDao.addSeriesToUserCollection(userId, seriesId);
 
-		return url;
+		LOG.info("Series #{} has been added to collection of user #{}", seriesId, userId);
 	}
 
 	@Override

src/main/resources/sql/collection_dao_queries.properties

@@ -49,7 +49,7 @@ INSERT \
 SELECT c.id AS collection_id \
       , :series_id AS series_id \
   FROM collections c \
- WHERE c.slug = :collection_slug
+ WHERE c.user_id = :user_id
 
 collection.remove_series_from_collection = \
 DELETE \

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

@@ -104,50 +104,22 @@ class CollectionServiceImplTest extends Specification {
 			thrown IllegalArgumentException
 	}
 
-	def "addToCollection() should find collection by user id"() {
+	def "addToCollection() should pass arguments to dao"() {
 		given:
 			Integer expectedUserId = 123
-		when:
-			service.addToCollection(expectedUserId, 321)
-		then:
-			1 * collectionDao.findCollectionUrlEntityByUserId({ Integer userId ->
-				assert userId == expectedUserId
-				return true
-			}) >> TestObjects.createUrlEntityDto()
-	}
-	
-	def "addToCollection() should add series to collection"() {
-		given:
 			Integer expectedSeriesId = 456
-		and:
-			UrlEntityDto url = TestObjects.createUrlEntityDto()
-		and:
-			String expectedCollectionSlug = url.getSlug()
-		and:
-			collectionDao.findCollectionUrlEntityByUserId(_ as Integer) >> url
 		when:
-			service.addToCollection(123, expectedSeriesId)
+			service.addToCollection(expectedUserId, expectedSeriesId)
 		then:
-			1 * collectionDao.addSeriesToCollection({ String collectionSlug ->
-				assert collectionSlug == expectedCollectionSlug
+			1 * collectionDao.addSeriesToUserCollection({ Integer userId ->
+				assert userId == expectedUserId
 				return true
 			}, { Integer seriesId ->
 				assert seriesId == expectedSeriesId
 				return true
 			})
 	}
 
-	def "addToCollection() should return result from dao"() {
-		given:
-			UrlEntityDto expectedUrl = TestObjects.createUrlEntityDto()
-		and:
-			collectionDao.findCollectionUrlEntityByUserId(_ as Integer) >> expectedUrl
-		when:
-			UrlEntityDto serviceResult = service.addToCollection(123, 456)
-		then:
-			serviceResult == expectedUrl
-	}
-	
 	//
 	// Tests for removeFromCollection()
 	//