Skip to content

Commit 00b6b07

Browse files
php-coderphp-coder
committed
Rename ParsedDataDto to SeriesParsedDataDto.
Prereqisite for #695 No functional changes.
1 parent 3a71085 commit 00b6b07

File tree

10 files changed

+42
-33
lines changed

10 files changed

+42
-33
lines changed

‎src/main/java/ru/mystamps/web/controller/SeriesImportController.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import ru.mystamps.web.controller.dto.RequestImportForm;
4444
import ru.mystamps.web.controller.event.ImportRequestCreated;
4545
import ru.mystamps.web.dao.dto.ImportRequestDto;
46-
import ru.mystamps.web.dao.dto.ParsedDataDto;
46+
import ru.mystamps.web.dao.dto.SeriesParsedDataDto;
4747
import ru.mystamps.web.service.SeriesImportService;
4848
import ru.mystamps.web.util.LocaleUtils;
4949

@@ -110,20 +110,20 @@ public String showRequestAndImportSeriesForm(
110110
model.addAttribute("request", request);
111111

112112
String lang = LocaleUtils.getLanguageOrNull(userLocale);
113-
ParsedDataDto parsedData = seriesImportService.getParsedData(requestId, lang);
113+
SeriesParsedDataDto series = seriesImportService.getParsedData(requestId, lang);
114114

115115
ImportSeriesForm form = new ImportSeriesForm();
116116
form.setPerforated(Boolean.TRUE);
117117

118-
boolean hasParsedData = parsedData != null;
118+
boolean hasParsedData = series != null;
119119
if (hasParsedData) {
120-
form.setCategory(parsedData.getCategory());
121-
form.setCountry(parsedData.getCountry());
122-
form.setImageUrl(parsedData.getImageUrl());
123-
form.setYear(parsedData.getIssueYear());
124-
form.setQuantity(parsedData.getQuantity());
125-
if (parsedData.getPerforated() != null) {
126-
form.setPerforated(parsedData.getPerforated());
120+
form.setCategory(series.getCategory());
121+
form.setCountry(series.getCountry());
122+
form.setImageUrl(series.getImageUrl());
123+
form.setYear(series.getIssueYear());
124+
form.setQuantity(series.getQuantity());
125+
if (series.getPerforated() != null) {
126+
form.setPerforated(series.getPerforated());
127127
}
128128
}
129129

@@ -167,8 +167,8 @@ public String processImportSeriesForm(
167167

168168
String lang = LocaleUtils.getLanguageOrNull(userLocale);
169169

170-
ParsedDataDto parsedData = seriesImportService.getParsedData(requestId, lang);
171-
boolean hasParsedData = parsedData != null;
170+
SeriesParsedDataDto series = seriesImportService.getParsedData(requestId, lang);
171+
boolean hasParsedData = series != null;
172172
model.addAttribute("showForm", hasParsedData);
173173

174174
seriesController.addCategoriesToModel(model, lang);

‎src/main/java/ru/mystamps/web/dao/SeriesImportDao.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
2626
import ru.mystamps.web.dao.dto.ImportRequestInfo;
2727
import ru.mystamps.web.dao.dto.ImportSeriesDbDto;
28-
import ru.mystamps.web.dao.dto.ParsedDataDto;
28+
import ru.mystamps.web.dao.dto.SeriesParsedDataDto;
2929

3030
public interface SeriesImportDao {
3131
Integer add(ImportSeriesDbDto importRequest);
@@ -41,7 +41,7 @@ void setSeriesIdAndChangeStatus(
4141
void addRawContent(Integer requestId, Date createdAt, Date updatedAt, String content);
4242
String findRawContentByRequestId(Integer requestId);
4343
void addParsedContent(Integer requestId, AddSeriesParsedDataDbDto data);
44-
ParsedDataDto findParsedDataByRequestId(Integer requestId, String lang);
44+
SeriesParsedDataDto findParsedDataByRequestId(Integer requestId, String lang);
4545
ImportRequestInfo findRequestInfo(Integer seriesId);
4646
List<ImportRequestFullInfo> findAll();
4747
}

‎src/main/java/ru/mystamps/web/dao/dto/ParsedDataDto.java renamed to ‎src/main/java/ru/mystamps/web/dao/dto/SeriesParsedDataDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
@Getter
2424
@RequiredArgsConstructor
25-
public class ParsedDataDto {
25+
public class SeriesParsedDataDto {
2626
private final LinkEntityDto category;
2727
private final LinkEntityDto country;
2828
private final String imageUrl;

‎src/main/java/ru/mystamps/web/dao/impl/JdbcSeriesImportDao.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
4141
import ru.mystamps.web.dao.dto.ImportRequestInfo;
4242
import ru.mystamps.web.dao.dto.ImportSeriesDbDto;
43-
import ru.mystamps.web.dao.dto.ParsedDataDto;
43+
import ru.mystamps.web.dao.dto.SeriesParsedDataDto;
4444

4545
// it complains that "request_id" is present many times
4646
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
@@ -70,8 +70,8 @@ public class JdbcSeriesImportDao implements SeriesImportDao {
7070
@Value("${series_import_requests.add_parsed_content}")
7171
private String addParsedContentSql;
7272

73-
@Value("${series_import_requests.find_parsed_data_by_request_id}")
74-
private String findParsedDataSql;
73+
@Value("${series_import_requests.find_series_parsed_data_by_request_id}")
74+
private String findSeriesParsedDataSql;
7575

7676
@Value("${series_import_requests.find_request_info_by_series_id}")
7777
private String findRequestInfoSql;
@@ -231,16 +231,16 @@ public void addParsedContent(Integer requestId, AddSeriesParsedDataDbDto data) {
231231
}
232232

233233
@Override
234-
public ParsedDataDto findParsedDataByRequestId(Integer requestId, String lang) {
234+
public SeriesParsedDataDto findParsedDataByRequestId(Integer requestId, String lang) {
235235
try {
236236
Map<String, Object> params = new HashMap<>();
237237
params.put("request_id", requestId);
238238
params.put("lang", lang);
239239

240240
return jdbcTemplate.queryForObject(
241-
findParsedDataSql,
241+
findSeriesParsedDataSql,
242242
params,
243-
RowMappers::forParsedDataDto
243+
RowMappers::forSeriesParsedDataDto
244244
);
245245

246246
} catch (EmptyResultDataAccessException ignored) {

‎src/main/java/ru/mystamps/web/dao/impl/RowMappers.java

+11-2
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,9 @@ public static Integer forInteger(ResultSet rs, int i) throws SQLException {
264264
return rs.getInt("id");
265265
}
266266

267-
public static ParsedDataDto forParsedDataDto(ResultSet rs, int i) throws SQLException {
267+
public static SeriesParsedDataDto forSeriesParsedDataDto(ResultSet rs, int i)
268+
throws SQLException {
269+
268270
LinkEntityDto category =
269271
createLinkEntityDto(rs, "category_id", "category_slug", "category_name");
270272

@@ -276,7 +278,14 @@ public static ParsedDataDto forParsedDataDto(ResultSet rs, int i) throws SQLExce
276278
Integer quantity = JdbcUtils.getInteger(rs, "quantity");
277279
Boolean perforated = JdbcUtils.getBoolean(rs, "perforated");
278280

279-
return new ParsedDataDto(category, country, imageUrl, releaseYear, quantity, perforated);
281+
return new SeriesParsedDataDto(
282+
category,
283+
country,
284+
imageUrl,
285+
releaseYear,
286+
quantity,
287+
perforated
288+
);
280289
}
281290

282291
public static ImportRequestInfo forImportRequestInfo(ResultSet rs, int i) throws SQLException {

‎src/main/java/ru/mystamps/web/service/SeriesImportService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import ru.mystamps.web.dao.dto.ImportRequestDto;
2323
import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
2424
import ru.mystamps.web.dao.dto.ImportRequestInfo;
25-
import ru.mystamps.web.dao.dto.ParsedDataDto;
25+
import ru.mystamps.web.dao.dto.SeriesParsedDataDto;
2626
import ru.mystamps.web.service.dto.AddSeriesDto;
2727
import ru.mystamps.web.service.dto.RawParsedDataDto;
2828
import ru.mystamps.web.service.dto.RequestImportDto;
@@ -35,7 +35,7 @@ public interface SeriesImportService {
3535
void saveDownloadedContent(Integer requestId, String content);
3636
String getDownloadedContent(Integer requestId);
3737
void saveParsedData(Integer requestId, RawParsedDataDto data);
38-
ParsedDataDto getParsedData(Integer requestId, String lang);
38+
SeriesParsedDataDto getParsedData(Integer requestId, String lang);
3939
ImportRequestInfo findRequestInfo(Integer seriesId);
4040
List<ImportRequestFullInfo> findAll();
4141
}

‎src/main/java/ru/mystamps/web/service/SeriesImportServiceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import ru.mystamps.web.dao.dto.ImportRequestFullInfo;
4343
import ru.mystamps.web.dao.dto.ImportRequestInfo;
4444
import ru.mystamps.web.dao.dto.ImportSeriesDbDto;
45-
import ru.mystamps.web.dao.dto.ParsedDataDto;
45+
import ru.mystamps.web.dao.dto.SeriesParsedDataDto;
4646
import ru.mystamps.web.service.dto.AddSeriesDto;
4747
import ru.mystamps.web.service.dto.RawParsedDataDto;
4848
import ru.mystamps.web.service.dto.RequestImportDto;
@@ -201,7 +201,7 @@ public void saveParsedData(Integer requestId, RawParsedDataDto data) {
201201

202202
@Override
203203
@Transactional(readOnly = true)
204-
public ParsedDataDto getParsedData(Integer requestId, String lang) {
204+
public SeriesParsedDataDto getParsedData(Integer requestId, String lang) {
205205
Validate.isTrue(requestId != null, "Request id must be non null");
206206

207207
return seriesImportDao.findParsedDataByRequestId(requestId, lang);

‎src/main/resources/sql/series_import_request_dao_queries.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ VALUES \
105105
, :updated_at \
106106
)
107107

108-
series_import_requests.find_parsed_data_by_request_id = \
108+
series_import_requests.find_series_parsed_data_by_request_id = \
109109
SELECT pd.image_url \
110110
, cat.id AS category_id \
111111
, cat.slug AS category_slug \

‎src/test/groovy/ru/mystamps/web/service/SeriesImportServiceImplTest.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import ru.mystamps.web.controller.dto.RequestImportForm
3232
import ru.mystamps.web.controller.event.ParsingFailed
3333
import ru.mystamps.web.Db.SeriesImportRequestStatus
3434
import ru.mystamps.web.dao.dto.ImportRequestDto
35-
import ru.mystamps.web.dao.dto.ParsedDataDto
35+
import ru.mystamps.web.dao.dto.SeriesParsedDataDto
3636
import ru.mystamps.web.dao.SeriesImportDao
3737
import ru.mystamps.web.dao.dto.AddSeriesParsedDataDbDto
3838
import ru.mystamps.web.dao.dto.ImportRequestInfo
@@ -505,9 +505,9 @@ class SeriesImportServiceImplTest extends Specification {
505505
Integer expectedRequestId = Random.id()
506506
String expectedLang = nullOr(Random.lang())
507507
and:
508-
ParsedDataDto expectedResult = TestObjects.createParsedDataDto()
508+
SeriesParsedDataDto expectedResult = TestObjects.createSeriesParsedDataDto()
509509
when:
510-
ParsedDataDto result = service.getParsedData(expectedRequestId, expectedLang)
510+
SeriesParsedDataDto result = service.getParsedData(expectedRequestId, expectedLang)
511511
then:
512512
1 * seriesImportDao.findParsedDataByRequestId(expectedRequestId, expectedLang) >> expectedResult
513513
and:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,14 @@ public static ImportRequestDto createImportRequestDto() {
193193
return new ImportRequestDto(Random.url(), Random.importRequestStatus(), null);
194194
}
195195

196-
public static ParsedDataDto createParsedDataDto() {
196+
public static SeriesParsedDataDto createSeriesParsedDataDto() {
197197
String categoryName = Random.categoryName();
198198
String categorySlug = SlugUtils.slugify(categoryName);
199199

200200
String countryName = Random.countryName();
201201
String countrySlug = SlugUtils.slugify(countryName);
202202

203-
return new ParsedDataDto(
203+
return new SeriesParsedDataDto(
204204
new LinkEntityDto(Random.id(), categorySlug, categoryName),
205205
new LinkEntityDto(Random.id(), countrySlug, countryName),
206206
Random.url(),

0 commit comments

Comments
 (0)