SeriesService.addImageToSeries(): 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

@@ -166,9 +166,10 @@ public void addImageToSeries(AddImageDto dto, Integer seriesId, Integer userId)
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 		Validate.isTrue(userId != null, "User id must be non null");
 
+		seriesDao.markAsModified(seriesId, new Date(), userId);
+		
 		Integer imageId = imageService.save(dto.getImage());
 		imageService.addToSeries(seriesId, imageId);
-		seriesDao.markAsModified(seriesId, new Date(), userId);
 
 		LOG.info(
 			"Image #{} has been added to series #{} by user #{}",

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

@@ -612,6 +612,26 @@ class SeriesServiceImplTest extends Specification {
 			thrown IllegalArgumentException
 	}
 
+	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
+	def "addImageToSeries() should mark series as modified"() {
+		given:
+			Integer expectedSeriesId = 123
+			Integer expectedUserId = 321
+		when:
+			service.addImageToSeries(imageForm, expectedSeriesId, expectedUserId)
+		then:
+			1 * seriesDao.markAsModified({ Integer seriesId ->
+				assert seriesId == expectedSeriesId
+				return true
+			}, { Date updatedAt ->
+				assert DateUtils.roughlyEqual(updatedAt, new Date())
+				return true
+			}, { Integer userId ->
+				assert userId == expectedUserId
+				return true
+			})
+	}
+	
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
 	def "addImageToSeries() should save image"() {
 		given:
@@ -645,26 +665,6 @@ class SeriesServiceImplTest extends Specification {
 			})
 	}
 
-	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
-	def "addImageToSeries() should mark series as modified"() {
-		given:
-			Integer expectedSeriesId = 123
-			Integer expectedUserId = 321
-		when:
-			service.addImageToSeries(imageForm, expectedSeriesId, expectedUserId)
-		then:
-			1 * seriesDao.markAsModified({ Integer seriesId ->
-				assert seriesId == expectedSeriesId
-				return true
-			}, { Date updatedAt ->
-				assert DateUtils.roughlyEqual(updatedAt, new Date())
-				return true
-			}, { Integer userId ->
-				assert userId == expectedUserId
-				return true
-			})
-	}
-	
 	//
 	// Tests for countAll()
 	//