refactor(PurchaseAndSaleDto): move to ru.mystamps.web.feature.series package.

Addressed to #927

No functional changes.

Author: php-coder

Diff for: src/main/java/ru/mystamps/web/dao/SeriesDao.java

@@ -20,12 +20,12 @@
 import java.util.Date;
 import java.util.List;
 
-import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
 import ru.mystamps.web.dao.dto.SeriesLinkDto;
 import ru.mystamps.web.dao.dto.SitemapInfoDto;
 import ru.mystamps.web.feature.series.AddSeriesDbDto;
+import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
 
 // TODO: move stamps related methods to separate interface (#88)
 @SuppressWarnings("PMD.TooManyMethods")

Diff for: src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesDao.java

@@ -35,12 +35,12 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.SeriesDao;
-import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
 import ru.mystamps.web.dao.dto.SeriesLinkDto;
 import ru.mystamps.web.dao.dto.SitemapInfoDto;
 import ru.mystamps.web.feature.series.AddSeriesDbDto;
+import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
 import ru.mystamps.web.support.jdbc.RowMappers;
 
 // TODO: move stamps related methods to separate interface (#88)

Diff for: src/main/java/ru/mystamps/web/dao/dto/PurchaseAndSaleDto.java renamed to src/main/java/ru/mystamps/web/feature/series/PurchaseAndSaleDto.java

@@ -15,14 +15,16 @@
  * 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.dao.dto;
+package ru.mystamps.web.feature.series;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import ru.mystamps.web.dao.dto.Currency;
+
 /**
  * @author Sergey Chechenev
  */

Diff for: src/main/java/ru/mystamps/web/feature/series/SeriesController.java

@@ -61,7 +61,6 @@
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 import ru.mystamps.web.dao.dto.ImportRequestInfo;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
-import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
 import ru.mystamps.web.feature.category.Category;
 import ru.mystamps.web.feature.category.CategoryService;

Diff for: src/main/java/ru/mystamps/web/feature/series/SeriesService.java

@@ -20,7 +20,6 @@
 import java.util.Date;
 import java.util.List;
 
-import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
 import ru.mystamps.web.dao.dto.SeriesLinkDto;
 import ru.mystamps.web.dao.dto.SitemapInfoDto;

Diff for: src/main/java/ru/mystamps/web/feature/series/SeriesServiceImpl.java

@@ -33,7 +33,6 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.SeriesDao;
-import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
 import ru.mystamps.web.dao.dto.SeriesLinkDto;

Diff for: src/main/java/ru/mystamps/web/support/jdbc/RowMappers.java

@@ -29,6 +29,7 @@
 import ru.mystamps.web.feature.collection.SeriesInCollectionWithPriceDto;
 import ru.mystamps.web.feature.image.ImageDto;
 import ru.mystamps.web.feature.image.ImageInfoDto;
+import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
 
 @SuppressWarnings({
 	"PMD.AvoidDuplicateLiterals",

Diff for: src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy

@@ -33,7 +33,6 @@ import ru.mystamps.web.dao.SeriesDao
 import ru.mystamps.web.feature.image.ImageInfoDto
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto
 import ru.mystamps.web.dao.dto.LinkEntityDto
-import ru.mystamps.web.dao.dto.PurchaseAndSaleDto
 import ru.mystamps.web.dao.dto.SeriesInfoDto
 import ru.mystamps.web.dao.dto.SitemapInfoDto
 import ru.mystamps.web.feature.image.ImageService

Diff for: src/test/java/ru/mystamps/web/service/TestObjects.java

@@ -36,6 +36,7 @@
 import ru.mystamps.web.feature.series.AddSeriesDto;
 import ru.mystamps.web.feature.series.AddSeriesForm;
 import ru.mystamps.web.feature.series.AddSeriesSalesDto;
+import ru.mystamps.web.feature.series.PurchaseAndSaleDto;
 import ru.mystamps.web.service.dto.RawParsedDataDto;
 import ru.mystamps.web.service.dto.SeriesExtractedInfo;
 import ru.mystamps.web.tests.Random;