Skip to content

Commit 57f918b

Browse files
committed
SeriesServiceImpl.findByCatalogNumber(): extract help method.
Follow up to #299 No functional changes.
1 parent 04d14a7 commit 57f918b

File tree

1 file changed

+16
-24
lines changed

1 file changed

+16
-24
lines changed

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

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -250,45 +250,25 @@ public SeriesDto findFullInfoById(Integer seriesId, String lang) {
250250
@Override
251251
@Transactional(readOnly = true)
252252
public List<SeriesInfoDto> findByMichelNumber(String michelNumberCode, String lang) {
253-
List<Integer> seriesIds = michelCatalogService.findSeriesIdsByNumber(michelNumberCode);
254-
if (seriesIds.isEmpty()) {
255-
return Collections.emptyList();
256-
}
257-
258-
return seriesDao.findByIdsAsSeriesInfo(seriesIds, lang);
253+
return findByCatalogNumber(michelCatalogService, michelNumberCode, lang);
259254
}
260255

261256
@Override
262257
@Transactional(readOnly = true)
263258
public List<SeriesInfoDto> findByScottNumber(String scottNumberCode, String lang) {
264-
List<Integer> seriesIds = scottCatalogService.findSeriesIdsByNumber(scottNumberCode);
265-
if (seriesIds.isEmpty()) {
266-
return Collections.emptyList();
267-
}
268-
269-
return seriesDao.findByIdsAsSeriesInfo(seriesIds, lang);
259+
return findByCatalogNumber(scottCatalogService, scottNumberCode, lang);
270260
}
271261

272262
@Override
273263
@Transactional(readOnly = true)
274264
public List<SeriesInfoDto> findByYvertNumber(String yvertNumberCode, String lang) {
275-
List<Integer> seriesIds = yvertCatalogService.findSeriesIdsByNumber(yvertNumberCode);
276-
if (seriesIds.isEmpty()) {
277-
return Collections.emptyList();
278-
}
279-
280-
return seriesDao.findByIdsAsSeriesInfo(seriesIds, lang);
265+
return findByCatalogNumber(yvertCatalogService, yvertNumberCode, lang);
281266
}
282267

283268
@Override
284269
@Transactional(readOnly = true)
285270
public List<SeriesInfoDto> findByGibbonsNumber(String gibbonsNumberCode, String lang) {
286-
List<Integer> seriesIds = gibbonsCatalogService.findSeriesIdsByNumber(gibbonsNumberCode);
287-
if (seriesIds.isEmpty()) {
288-
return Collections.emptyList();
289-
}
290-
291-
return seriesDao.findByIdsAsSeriesInfo(seriesIds, lang);
271+
return findByCatalogNumber(gibbonsCatalogService, gibbonsNumberCode, lang);
292272
}
293273

294274
@Override
@@ -341,6 +321,18 @@ public List<PurchaseAndSaleDto> findPurchasesAndSales(Integer seriesId) {
341321
return seriesDao.findPurchasesAndSales(seriesId);
342322
}
343323

324+
private List<SeriesInfoDto> findByCatalogNumber(
325+
StampsCatalogService catalogService,
326+
String number, String lang) {
327+
328+
List<Integer> seriesIds = catalogService.findSeriesIdsByNumber(number);
329+
if (seriesIds.isEmpty()) {
330+
return Collections.emptyList();
331+
}
332+
333+
return seriesDao.findByIdsAsSeriesInfo(seriesIds, lang);
334+
}
335+
344336
private static void setDateOfReleaseIfProvided(AddSeriesDto dto, AddSeriesDbDto series) {
345337
if (dto.getYear() == null) {
346338
return;

0 commit comments

Comments
 (0)