replacing arguments by dto object was made and the refactoring for codestyle was made here either

Author: KrivenkoAlexander

src/main/java/ru/mystamps/web/feature/series/importing/JdbcSeriesImportDao.java

@@ -25,7 +25,6 @@
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
-
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -97,26 +96,21 @@ public Integer add(ImportSeriesDbDto importRequest) {
 
 	// @todo #735 SeriesImportDao.setSeriesIdAndChangeStatus(): replace arguments by dto object
 	@Override
-	public void setSeriesIdAndChangeStatus(
-		Integer requestId,
-		Integer seriesId,
-		String oldStatus,
-		String newStatus,
-		Date updatedAt) {
-		
+	public void setSeriesIdAndChangeStatus(Integer seriesId,
+										   UpdateImportRequestStatusDbDto requestStatus) {
 		Map<String, Object> params = new HashMap<>();
-		params.put("id", requestId);
+		params.put("id", requestStatus.getRequestId());
 		params.put("series_id", seriesId);
-		params.put("old_status", oldStatus);
-		params.put("new_status", newStatus);
-		params.put("date", updatedAt);
+		params.put("old_status", requestStatus.getOldStatus());
+		params.put("new_status", requestStatus.getNewStatus());
+		params.put("date", requestStatus.getDate());
 
 		int affected = jdbcTemplate.update(setSeriesIdAndChangeStatusSql, params);
 
 		Validate.validState(
 			affected == 1,
 			"Unexpected number of affected rows after setting series id on request #%d: %d",
-			requestId,
+			requestStatus.getRequestId(),
 			affected
 		);
 	}

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDao.java

@@ -22,13 +22,7 @@
 
 public interface SeriesImportDao {
 	Integer add(ImportSeriesDbDto importRequest);
-	void setSeriesIdAndChangeStatus(
-		Integer requestId,
-		Integer seriesId,
-		String oldStatus,
-		String newStatus,
-		Date updatedAt
-	);
+	void setSeriesIdAndChangeStatus(Integer seriesId, UpdateImportRequestStatusDbDto requestStatus);
 	void changeStatus(UpdateImportRequestStatusDbDto requestStatus);
 	ImportRequestDto findById(Integer id);
 	void addRawContent(Integer requestId, Date createdAt, Date updatedAt, String content);

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportServiceImpl.java

@@ -37,7 +37,6 @@
 import ru.mystamps.web.feature.series.sale.SeriesSalesService;
 import ru.mystamps.web.support.spring.security.HasAuthority;
 import ru.mystamps.web.util.CatalogUtils;
-
 import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -98,7 +97,6 @@ public Integer addSeries(
 		AddSeriesSalesDto saleDto,
 		Integer requestId,
 		Integer userId) {
-		
 		Integer seriesId = seriesService.add(dto, userId, false);
 
 		if (saleDto != null) {
@@ -112,13 +110,13 @@ public Integer addSeries(
 		Date now = new Date();
 
 		seriesImportDao.setSeriesIdAndChangeStatus(
-			requestId,
 			seriesId,
-			SeriesImportRequestStatus.PARSING_SUCCEEDED,
-			SeriesImportRequestStatus.IMPORT_SUCCEEDED,
-			now
+			new UpdateImportRequestStatusDbDto(
+				requestId,
+				now,
+				SeriesImportRequestStatus.PARSING_SUCCEEDED,
+				SeriesImportRequestStatus.IMPORT_SUCCEEDED)
 		);
-		
 		return seriesId;
 	}
 

src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy

@@ -258,14 +258,14 @@ class SeriesImportServiceImplTest extends Specification {
 			)
 		then:
 			1 * seriesImportDao.setSeriesIdAndChangeStatus(
-				expectedRequestId,
 				expectedSeriesId,
-				SeriesImportRequestStatus.PARSING_SUCCEEDED,
-				SeriesImportRequestStatus.IMPORT_SUCCEEDED,
-				{ Date updatedAt ->
-					assert DateUtils.roughlyEqual(updatedAt, new Date())
+				{ UpdateImportRequestStatusDbDto request ->
+					assert request?.requestId == expectedRequestId
+					assert DateUtils.roughlyEqual(request?.date, new Date())
+					assert request?.oldStatus == SeriesImportRequestStatus.PARSING_SUCCEEDED 
+					assert request?.newStatus == SeriesImportRequestStatus.IMPORT_SUCCEEDED
 					return true
-				}
+				}				
 			)
 	}