CategoryService.getStatisticsOf(): change argument from Collection to Integer.

Addressed to #120

No functional changes.

Author: php-coder

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

@@ -78,7 +78,7 @@ public String showInfo(
 
 			model.addAttribute(
 				"statOfCollectionByCategories",
-				categoryService.getStatisticsOf(collection, lang)
+				categoryService.getStatisticsOf(collection.getId(), lang)
 			);
 			model.addAttribute(
 				"statOfCollectionByCountries",

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

@@ -19,7 +19,6 @@
 
 import java.util.Map;
 
-import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.AddCategoryDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
@@ -34,5 +33,5 @@ public interface CategoryService {
 	long countCategoriesOf(Integer collectionId);
 	long countByName(String name);
 	long countByNameRu(String name);
-	Map<String, Integer> getStatisticsOf(Collection collection, String lang);
+	Map<String, Integer> getStatisticsOf(Integer collectionId, String lang);
 }

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

@@ -33,7 +33,6 @@
 
 import ru.mystamps.web.dao.JdbcCategoryDao;
 import ru.mystamps.web.dao.dto.AddCategoryDbDto;
-import ru.mystamps.web.entity.Collection;
 import ru.mystamps.web.entity.User;
 import ru.mystamps.web.service.dto.AddCategoryDto;
 import ru.mystamps.web.service.dto.LinkEntityDto;
@@ -122,11 +121,10 @@ public long countByNameRu(String name) {
 
 	@Override
 	@Transactional(readOnly = true)
-	public Map<String, Integer> getStatisticsOf(Collection collection, String lang) {
-		Validate.isTrue(collection != null, "Collection must be non null");
-		Validate.isTrue(collection.getId() != null, "Collection id must be non null");
+	public Map<String, Integer> getStatisticsOf(Integer collectionId, String lang) {
+		Validate.isTrue(collectionId != null, "Collection id must be non null");
 
-		return categoryDao.getStatisticsOf(collection.getId(), lang);
+		return categoryDao.getStatisticsOf(collectionId, lang);
 	}
 
 }

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

@@ -22,7 +22,6 @@ import spock.lang.Unroll
 
 import ru.mystamps.web.dao.JdbcCategoryDao
 import ru.mystamps.web.dao.dto.AddCategoryDbDto
-import ru.mystamps.web.entity.Collection
 import ru.mystamps.web.entity.User
 import ru.mystamps.web.model.AddCategoryForm
 import ru.mystamps.web.service.dto.LinkEntityDto
@@ -361,19 +360,9 @@ class CategoryServiceImplTest extends Specification {
 	// Tests for getStatisticsOf()
 	//
 
-	def "getStatisticsOf() should throw exception when collection is null"() {
-		when:
-			service.getStatisticsOf(null, 'whatever')
-		then:
-			thrown IllegalArgumentException
-	}
-
 	def "getStatisticsOf() should throw exception when collection id is null"() {
-		given:
-			Collection collection = Mock()
-			collection.getId() >> null
 		when:
-			service.getStatisticsOf(collection, 'whatever')
+			service.getStatisticsOf(null, 'whatever')
 		then:
 			thrown IllegalArgumentException
 	}
@@ -383,11 +372,8 @@ class CategoryServiceImplTest extends Specification {
 			Integer expectedCollectionId = 15
 		and:
 			String expectedLang = 'expected'
-		and:
-			Collection expectedCollection = Mock()
-			expectedCollection.getId() >> expectedCollectionId
 		when:
-			service.getStatisticsOf(expectedCollection, expectedLang)
+			service.getStatisticsOf(expectedCollectionId, expectedLang)
 		then:
 			1 * categoryDao.getStatisticsOf(
 				{ Integer collectionId ->