feature/reorder_cronjob #27

Merged
Seil0 merged 11 commits from feature/reorder_cronjob into master 2020-05-29 16:20:05 +02:00
Showing only changes of commit ffb683bdd0 - Show all commits

View File

@ -29,6 +29,12 @@ public class UpdateOffersAction {
public List<ArticleOffer> finish() {
HashMap<ArticleIdentifier, ArticleOffer> availableOffers = mapOffers();
// Reset all advertise-flags first. They are set again below.
for (ArticleOffer offer : availableOffers.values()) {
offer.shouldBeAdvertised = false;
}
for (Entry<ArticleIdentifier, Offer> cheapestOffer : cheapestOffer.entrySet()) {
String manufacturer = cheapestOffer.getKey().manufacturer;
String articleNumber = cheapestOffer.getKey().articleNumber;
@ -42,7 +48,11 @@ public class UpdateOffersAction {
Article currentOfferedArticle = cheapestOffer.getValue().apiSupplier.findArticle(manufacturer,
articleNumber);
currentOffer.vatPercent = currentOfferedArticle.vatPercent;
currentOffer.shouldBeAdvertised = currentOfferedArticle.shouldBeAdvertised;
// Set advertise-flag if any supplier wants it to be set
if (currentOfferedArticle.shouldBeAdvertised) {
currentOffer.shouldBeAdvertised = true;
}
}
return offers;
}