SeriesService.add(): remove uploaded file when exception occurs.

Addressed to #301

Author: php-coder

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

@@ -152,7 +152,15 @@ public Integer add(AddSeriesDto dto, Integer userId, boolean userCanAddComments)
 		}
 
 		ImageInfoDto imageInfo = imageService.save(dto.getImage());
-		imageService.addToSeries(id, imageInfo.getId());
+		Integer imageId = imageInfo.getId();
+		
+		try {
+			imageService.addToSeries(id, imageId);
+			
+		} catch (RuntimeException ex) { // NOPMD: AvoidCatchingGenericException
+			imageService.removeIfPossible(imageInfo);
+			throw ex;
+		}
 
 		LOG.info("Series #{} has been created ({})", id, series);
 

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

@@ -523,6 +523,25 @@ class SeriesServiceImplTest extends Specification {
 			})
 	}
 
+	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
+	def "add() should remove image when exception occurs"() {
+		given:
+			ImageInfoDto expectedImageInfo = new ImageInfoDto(654, 'JPEG')
+		and:
+			imageService.addToSeries(_ as Integer, _ as Integer) >> { throw new IllegalStateException() }
+		when:
+			service.add(form, userId, false)
+		then:
+			imageService.save(_) >> expectedImageInfo
+		and:
+			1 * imageService.removeIfPossible({ ImageInfoDto imageInfo ->
+				assert imageInfo == expectedImageInfo
+				return true
+			})
+		and:
+			thrown IllegalStateException
+	}
+	
 	//
 	// Tests for addImageToSeries()
 	//