refactor: move and rename PurchaseAndSaleDto to ru.mystamps.web.feature.series.sale package.

Part of #1051

Author: php-coder

src/main/config/spotbugs-filter.xml

@@ -111,7 +111,7 @@
 		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
 	</Match>
 	<Match>
-		<Class name="ru.mystamps.web.feature.series.PurchaseAndSaleDto" />
+		<Class name="ru.mystamps.web.feature.series.sale.SeriesSaleDto" />
 		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
 	</Match>
 	<Match>

src/main/java/ru/mystamps/web/feature/series/SeriesController.java

@@ -52,6 +52,7 @@
 import ru.mystamps.web.feature.series.importing.ImportRequestInfo;
 import ru.mystamps.web.feature.series.importing.SeriesImportService;
 import ru.mystamps.web.feature.series.sale.AddSeriesSalesForm;
+import ru.mystamps.web.feature.series.sale.SeriesSaleDto;
 import ru.mystamps.web.feature.series.sale.SeriesSalesService;
 import ru.mystamps.web.feature.site.SiteUrl;
 import ru.mystamps.web.support.spring.security.Authority;
@@ -748,7 +749,7 @@ public static void loadErrorsFromDownloadInterceptor(
 		}
 
 		if (SecurityContextUtils.hasAuthority(Authority.VIEW_SERIES_SALES)) {
-			List<PurchaseAndSaleDto> seriesSales = seriesSalesService.findSales(seriesId);
+			List<SeriesSaleDto> seriesSales = seriesSalesService.findSales(seriesId);
 			model.put("seriesSales", seriesSales);
 		}
 

src/main/java/ru/mystamps/web/feature/series/sale/JdbcSeriesSalesDao.java

@@ -21,7 +21,6 @@
 import org.apache.commons.lang3.Validate;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -68,11 +67,11 @@ public void add(AddSeriesSalesDbDto sale) {
 	 * @author Sergey Chechenev
 	 */
 	@Override
-	public List<PurchaseAndSaleDto> findSeriesSales(Integer seriesId) {
+	public List<SeriesSaleDto> findSeriesSales(Integer seriesId) {
 		return jdbcTemplate.query(
 			findSeriesSalesBySeriesIdSql,
 			Collections.singletonMap("series_id", seriesId),
-			RowMappers::forPurchaseAndSaleDto
+			RowMappers::forSeriesSaleDto
 		);
 	}
 

src/main/java/ru/mystamps/web/feature/series/sale/RowMappers.java

@@ -19,7 +19,6 @@
 
 import ru.mystamps.web.common.Currency;
 import ru.mystamps.web.common.JdbcUtils;
-import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -34,7 +33,7 @@ private RowMappers() {
 	/**
 	 * @author Sergey Chechenev
 	 */
-	/* default */ static PurchaseAndSaleDto forPurchaseAndSaleDto(ResultSet rs, int unused)
+	/* default */ static SeriesSaleDto forSeriesSaleDto(ResultSet rs, int unused)
 		throws SQLException {
 
 		Date date               = rs.getDate("date");
@@ -52,7 +51,7 @@ private RowMappers() {
 		String conditionField = rs.getString("cond");
 		SeriesCondition condition = rs.wasNull() ? null : SeriesCondition.valueOf(conditionField);
 
-		return new PurchaseAndSaleDto(
+		return new SeriesSaleDto(
 			date,
 			sellerName,
 			sellerUrl,

src/main/java/ru/mystamps/web/feature/series/PurchaseAndSaleDto.java renamed to src/main/java/ru/mystamps/web/feature/series/sale/SeriesSaleDto.java

@@ -15,23 +15,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.feature.series;
+package ru.mystamps.web.feature.series.sale;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import ru.mystamps.web.common.Currency;
-import ru.mystamps.web.feature.series.sale.SeriesCondition;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-// @todo #927 PurchaseAndSaleDto: move with related classes to series.sale package
 /**
  * @author Sergey Chechenev
  */
 @Getter
 @RequiredArgsConstructor
-public class PurchaseAndSaleDto {
+public class SeriesSaleDto {
 	private final Date date;
 	private final String sellerName;
 	private final String sellerUrl;

src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesConfig.java

@@ -24,7 +24,7 @@
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
 /**
- * Spring configuration that is required for using series sales/purchases in an application.
+ * Spring configuration that is required for using series sales in an application.
  */
 @Configuration
 public class SeriesSalesConfig {

src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesDao.java

@@ -17,11 +17,9 @@
  */
 package ru.mystamps.web.feature.series.sale;
 
-import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
-
 import java.util.List;
 
 public interface SeriesSalesDao {
 	void add(AddSeriesSalesDbDto dto);
-	List<PurchaseAndSaleDto> findSeriesSales(Integer seriesId);
+	List<SeriesSaleDto> findSeriesSales(Integer seriesId);
 }

src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesService.java

@@ -17,11 +17,9 @@
  */
 package ru.mystamps.web.feature.series.sale;
 
-import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
-
 import java.util.List;
 
 public interface SeriesSalesService {
 	void add(AddSeriesSalesDto dto, Integer seriesId, Integer userId);
-	List<PurchaseAndSaleDto> findSales(Integer seriesId);
+	List<SeriesSaleDto> findSales(Integer seriesId);
 }

src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImpl.java

@@ -22,7 +22,6 @@
 import org.slf4j.Logger;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
-import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
 import ru.mystamps.web.support.spring.security.HasAuthority;
 
 import java.util.Date;
@@ -77,7 +76,7 @@ public void add(AddSeriesSalesDto dto, Integer seriesId, Integer userId) {
 	@Override
 	@Transactional(readOnly = true)
 	@PreAuthorize(HasAuthority.VIEW_SERIES_SALES)
-	public List<PurchaseAndSaleDto> findSales(Integer seriesId) {
+	public List<SeriesSaleDto> findSales(Integer seriesId) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 
 		return seriesSalesDao.findSeriesSales(seriesId);

src/test/groovy/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImplTest.groovy

@@ -21,7 +21,6 @@ import static io.qala.datagen.RandomShortApi.nullOr
 
 import org.slf4j.helpers.NOPLogger
 import ru.mystamps.web.common.Currency
-import ru.mystamps.web.feature.series.PurchaseAndSaleDto
 import ru.mystamps.web.service.TestObjects
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.tests.Random
@@ -167,9 +166,9 @@ class SeriesSalesServiceImplTest extends Specification {
 		given:
 			Integer expectedSeriesId = Random.id()
 		and:
-			List<PurchaseAndSaleDto> expectedResult = [TestObjects.createPurchaseAndSaleDto() ]
+			List<SeriesSaleDto> expectedResult = [TestObjects.createSeriesSaleDto() ]
 		when:
-			List<PurchaseAndSaleDto> result = service.findSales(expectedSeriesId)
+			List<SeriesSaleDto> result = service.findSales(expectedSeriesId)
 		then:
 			1 * seriesSalesDao.findSeriesSales(expectedSeriesId) >> expectedResult
 		and:

src/test/java/ru/mystamps/web/service/TestObjects.java

@@ -35,7 +35,6 @@
 import ru.mystamps.web.feature.participant.EntityWithIdDto;
 import ru.mystamps.web.feature.series.AddSeriesDto;
 import ru.mystamps.web.feature.series.AddSeriesForm;
-import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
 import ru.mystamps.web.feature.series.SeriesFullInfoDto;
 import ru.mystamps.web.feature.series.SeriesInGalleryDto;
 import ru.mystamps.web.feature.series.SeriesInfoDto;
@@ -51,6 +50,7 @@
 import ru.mystamps.web.feature.series.importing.sale.SeriesSaleParsedDataDto;
 import ru.mystamps.web.feature.series.importing.sale.SeriesSalesParsedDataDbDto;
 import ru.mystamps.web.feature.series.sale.AddSeriesSalesDto;
+import ru.mystamps.web.feature.series.sale.SeriesSaleDto;
 import ru.mystamps.web.feature.site.SuspiciousActivityDto;
 import ru.mystamps.web.tests.Random;
 
@@ -221,8 +221,8 @@ public static SuspiciousActivityDto createSuspiciousActivityDto() {
 	/**
 	 * @author Sergey Chechenev
 	 */
-	public static PurchaseAndSaleDto createPurchaseAndSaleDto() {
-		return new PurchaseAndSaleDto(
+	public static SeriesSaleDto createSeriesSaleDto() {
+		return new SeriesSaleDto(
 			Random.date(),
 			TEST_NAME,
 			TEST_URL,