diff --git a/00-backend/datasource/database.sqlite b/00-backend/datasource/database.sqlite index 60fc467..ca12c30 100644 Binary files a/00-backend/datasource/database.sqlite and b/00-backend/datasource/database.sqlite differ diff --git a/00-backend/src/main/java/de/htwsaar/webshop/service/ArticleService.java b/00-backend/src/main/java/de/htwsaar/webshop/service/ArticleService.java index 0bac9e3..a83a47e 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/service/ArticleService.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/service/ArticleService.java @@ -23,6 +23,8 @@ public interface ArticleService { Article save(Article article); + Article update(Article article); + double getRating(Long id); double getRating(UUID uuid); diff --git a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ArticleServiceImpl.java b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ArticleServiceImpl.java index 0637e1c..a1079e0 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ArticleServiceImpl.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ArticleServiceImpl.java @@ -69,6 +69,12 @@ public class ArticleServiceImpl implements ArticleService { return articleRepository.save(article); } + @Override + @Transactional + public Article update(Article article) { + return articleRepository.save(article); + } + @Override public double getRating(Long id) { return reviewRepository.streamReviewsByArticleId(id) diff --git a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/StatisticsServiceImpl.java b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/StatisticsServiceImpl.java index e943bed..391eddb 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/StatisticsServiceImpl.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/StatisticsServiceImpl.java @@ -12,10 +12,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; import java.util.Map; import java.util.TreeMap; -import java.util.UUID; import java.util.function.BinaryOperator; import java.util.function.Function; @@ -84,7 +82,14 @@ public class StatisticsServiceImpl implements StatisticsService { articleService.findAll().forEach(article -> { int percent = (int) Math.floor(((1.0d * article.getStock() / article.getStockExpected()) * 100) / 10) * 10; log.info("Stock percent: {} {}", article.getUuid(), percent); - log.info("Cat: {}", article.getCategory()); + for (ArticleCategory value : ArticleCategory.values()) { + if (article.getCategory().equalsIgnoreCase(value.loc)) { + log.info("Fixing Article Category {} to {}", article.getCategory(), value.loc); + article.setCategory(value.loc); + articleService.update(article); + break; + } + } map.get(article.getCategory()).putIfAbsent(percent, 0); map.get(article.getCategory()).computeIfPresent(percent, (k,v) -> ++v); });