@@ -250,45 +250,25 @@ public SeriesDto findFullInfoById(Integer seriesId, String lang) {
250
250
@ Override
251
251
@ Transactional (readOnly = true )
252
252
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 );
259
254
}
260
255
261
256
@ Override
262
257
@ Transactional (readOnly = true )
263
258
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 );
270
260
}
271
261
272
262
@ Override
273
263
@ Transactional (readOnly = true )
274
264
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 );
281
266
}
282
267
283
268
@ Override
284
269
@ Transactional (readOnly = true )
285
270
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 );
292
272
}
293
273
294
274
@ Override
@@ -341,6 +321,18 @@ public List<PurchaseAndSaleDto> findPurchasesAndSales(Integer seriesId) {
341
321
return seriesDao .findPurchasesAndSales (seriesId );
342
322
}
343
323
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
+
344
336
private static void setDateOfReleaseIfProvided (AddSeriesDto dto , AddSeriesDbDto series ) {
345
337
if (dto .getYear () == null ) {
346
338
return ;
0 commit comments