Subversion Repositories SmartDukaan

Rev

Rev 30121 | Rev 30153 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 30121 Rev 30150
Line 346... Line 346...
346
			schemeIdSchemeMap.put(scheme.getId(), scheme);
346
			schemeIdSchemeMap.put(scheme.getId(), scheme);
347
		}
347
		}
348
		return schemeIdSchemeMap;
348
		return schemeIdSchemeMap;
349
	}
349
	}
350
 
350
 
351
	private Set<Integer> inventoryItemsToItemIds(List<InventoryItem> inventoryItems) {
-
 
352
		Set<Integer> itemIds = new HashSet<>();
-
 
353
		for (InventoryItem inventoryItem : inventoryItems) {
-
 
354
			itemIds.add(inventoryItem.getItemId());
-
 
355
		}
-
 
356
		return itemIds;
-
 
357
	}
-
 
358
 
-
 
359
	private Map<Integer, Set<Scheme>> toCatalogIdSchemesMap(List<SchemeItem> schemeItems, List<Scheme> schemes) {
351
	private Map<Integer, Set<Scheme>> toCatalogIdSchemesMap(List<SchemeItem> schemeItems, List<Scheme> schemes) {
360
		Map<Integer, Scheme> schemeIdSchemesMap = this.toSchemeIdSchemeMap(schemes);
352
		Map<Integer, Scheme> schemeIdSchemesMap = this.toSchemeIdSchemeMap(schemes);
361
		Map<Integer, Set<Scheme>> catalogIdSchemesMap = new HashMap<>();
353
		Map<Integer, Set<Scheme>> catalogIdSchemesMap = new HashMap<>();
362
		for (SchemeItem schemeItem : schemeItems) {
354
		for (SchemeItem schemeItem : schemeItems) {
363
			if (!catalogIdSchemesMap.containsKey(schemeItem.getCatalogId())) {
355
			if (!catalogIdSchemesMap.containsKey(schemeItem.getCatalogId())) {
Line 375... Line 367...
375
																	  List<InventoryItem> inventoryItems) {
367
																	  List<InventoryItem> inventoryItems) {
376
		Set<Integer> schemeIds = new HashSet<>();
368
		Set<Integer> schemeIds = new HashSet<>();
377
		for (Scheme scheme : schemes) {
369
		for (Scheme scheme : schemes) {
378
			schemeIds.add(scheme.getId());
370
			schemeIds.add(scheme.getId());
379
		}
371
		}
380
		Set<Integer> itemIds = this.inventoryItemsToItemIds(inventoryItems);
372
		Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
-
 
373
		Set<Integer> catalogIds = itemRepository.selectByIds(itemIds).stream().map(x -> x.getCatalogItemId()).collect(Collectors.toSet());
381
		List<SchemeItem> schemeItems = schemeItemRepository.selectBySchemeIdsAndCatalogIds(schemeIds, itemIds);
374
		List<SchemeItem> schemeItems = schemeItemRepository.selectBySchemeIdsAndCatalogIds(schemeIds, catalogIds);
382
 
375
 
383
		Map<Integer, Set<Scheme>> itemIdSchemesMap = this.toCatalogIdSchemesMap(schemeItems, schemes);
376
		Map<Integer, Set<Scheme>> itemIdSchemesMap = this.toCatalogIdSchemesMap(schemeItems, schemes);
384
		Map<InventoryItem, Set<Scheme>> inventoryItemSchemsMap = new HashMap<>();
377
		Map<InventoryItem, Set<Scheme>> inventoryItemSchemsMap = new HashMap<>();
385
		for (InventoryItem inventoryItem : inventoryItems) {
378
		for (InventoryItem inventoryItem : inventoryItems) {
386
			if (itemIdSchemesMap.containsKey(inventoryItem.getItemId())) {
379
			if (itemIdSchemesMap.containsKey(inventoryItem.getItemId())) {