SeriesService.add(): reduce a risk of having an orphaned file when exception occurs.

Addressed to #301

Author: php-coder

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

@@ -126,9 +126,6 @@ public Integer add(AddSeriesDto dto, Integer userId, boolean userCanAddComments)
 
 		Integer id = seriesDao.add(series);
 
-		Integer imageId = imageService.save(dto.getImage());
-		imageService.addToSeries(id, imageId);
-		
 		Set<String> michelNumbers = CatalogUtils.parseCatalogNumbers(dto.getMichelNumbers());
 		if (!michelNumbers.isEmpty()) {
 			michelCatalogService.add(michelNumbers);
@@ -153,6 +150,9 @@ public Integer add(AddSeriesDto dto, Integer userId, boolean userCanAddComments)
 			gibbonsCatalogService.addToSeries(id, gibbonsNumbers);
 		}
 
+		Integer imageId = imageService.save(dto.getImage());
+		imageService.addToSeries(id, imageId);
+		
 		LOG.info("Series #{} has been created ({})", id, series);
 
 		return id;

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

@@ -379,42 +379,6 @@ class SeriesServiceImplTest extends Specification {
 			actual == expected
 	}
 
-	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
-	def "add() should pass image to image service"() {
-		given:
-			form.setImage(multipartFile)
-		when:
-			service.add(form, userId, false)
-		then:
-			1 * imageService.save({ MultipartFile passedFile ->
-				assert passedFile == multipartFile
-				return true
-			}) >> ANY_IMAGE_ID
-	}
-	
-	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
-	def "add() should add image to the series"() {
-		given:
-			Integer expectedSeriesId = 123
-		and:
-			seriesDao.add(_ as AddSeriesDbDto) >> expectedSeriesId
-		and:
-			Integer expectedImageId = 456
-		when:
-			service.add(form, userId, false)
-		then:
-			// FIXME: why we can't use _ as MultipartFile here?
-			imageService.save(_) >> expectedImageId
-		and:
-			1 * imageService.addToSeries({ Integer seriesId ->
-				assert seriesId == expectedSeriesId
-				return true
-			}, { Integer imageId ->
-				assert imageId == expectedImageId
-				return true
-			})
-	}
-	
 	@Unroll
 	def "add() should not call services if michel numbers is '#numbers'"(String numbers) {
 		given:
@@ -587,6 +551,42 @@ class SeriesServiceImplTest extends Specification {
 			})
 	}
 
+	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
+	def "add() should pass image to image service"() {
+		given:
+			form.setImage(multipartFile)
+		when:
+			service.add(form, userId, false)
+		then:
+			1 * imageService.save({ MultipartFile passedFile ->
+				assert passedFile == multipartFile
+				return true
+			}) >> ANY_IMAGE_ID
+	}
+	
+	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
+	def "add() should add image to the series"() {
+		given:
+			Integer expectedSeriesId = 123
+		and:
+			seriesDao.add(_ as AddSeriesDbDto) >> expectedSeriesId
+		and:
+			Integer expectedImageId = 456
+		when:
+			service.add(form, userId, false)
+		then:
+			// FIXME: why we can't use _ as MultipartFile here?
+			imageService.save(_) >> expectedImageId
+		and:
+			1 * imageService.addToSeries({ Integer seriesId ->
+				assert seriesId == expectedSeriesId
+				return true
+			}, { Integer imageId ->
+				assert imageId == expectedImageId
+				return true
+			})
+	}
+	
 	//
 	// Tests for addImageToSeries()
 	//