From e0ef5d25a61a9fc7a4aa1f15bb5b12a934410079 Mon Sep 17 00:00:00 2001 From: Tim <47184194+imgde@users.noreply.github.com> Date: Tue, 17 Jun 2025 08:37:47 +0200 Subject: [PATCH] Fix --- 00-backend/datasource/database.sqlite | Bin 27684864 -> 27684864 bytes .../webshop/service/ArticleService.java | 2 ++ .../service/impl/ArticleServiceImpl.java | 6 ++++++ .../service/impl/StatisticsServiceImpl.java | 11 ++++++++--- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/00-backend/datasource/database.sqlite b/00-backend/datasource/database.sqlite index 60fc467427847374499391238bfda01d69602b32..ca12c30151bbec12f65bc801bf73e2669e13921b 100644 GIT binary patch delta 2486 zcmX}sd013c9LDj6MMOom0e6x800SI%MMZH#MFj;EK>sUoYi+rU6}EOTRd4G!#8h38 zdB)9DV5_s3ZPI;-p3b^&!c=eev}JhA)@wIB^7LAkXVcnE&r*GKnYp0hD0jehr&oBX zmiqLzzFB(O?3=A8N59E>D)gJ9r+a?W^)%1FX}aalD|mAm0ShqI1kBgxBnLL_RUMe4 z*J6XX7tg*Bv=CE_FxwJ>o7QTA`2aD(s?WYGrWpyY!rK-fqV&@3kaRtzh34w%>i<(> z7;lT)UkoeKQ>um6)>%sQ=c4d@Jw0le_#Ku;G~Mchh^hK$eq=Ew94(Pbnv}Ft(q2gi zB^{M)rlgaS&6RXkvW1c@m29P?i;}ICbXC$#Np~eZl=M{6tfZHc-b%JnvaOQslx(kL z2PHcy*-6RHO8O|-MM+;J{gm`qGC;{dC4(wuaI;#|UBk&u#M!ytsY-Ga%Gts7)MH*% z*V~Cpj;3g%!be1Tne8p6HTG8fI+wWE@+*0Tt=3v6##MF^*^Z6(ZY&NI_ZuI`P(k8A z<7!o(V3A z*rDERHqKi_<8Q=l^bc!(ceX!Uz}% zqaY4O!x$I~@sI%HU_2y35+uU}m~cEC>91qSSfa@YfVVIS;=18@)y!C^Q8N8uP8hZFEPJONL_Nq7pL zhEwniJPXf31w0R@;RSdRDxnHqf|ubHI0LW3Yj76M!Rzn_oQF5zEqEK=fp_5oya(^Y z2T%6a-GlUt+3}c2fvCIf&Br}SMV@5M$n6XSelfaB)#xsdb5|hkKU?wst%p@k2Nn<86 zQhnNs%OxP}!T2eH{$4jzm&P`B;)nH%_v&YhR>H zY2WvS(xQ#_y|nLo#y$PiVnJr&xtzJl$-vwh$#^YycJi#UAe!tB zCdSIb!Hs?Rz&xTWf0;KXs*(9qqIxTTO3kYAL}@|IwrV!>a>0VAMikbZy036a^m{>3 zWmE@>Dnmbrcw%XBc{rf9 zJ?NWKe@}H;dO-cucaBJ(JOJ+)~TD9VDeP1njEh#d zwKy0OWkyL5z20zXNlV{54-BAy866%RgM!isP)CZk{PDQ7ozNjDSj|QNDXb>8VPDiDv3=KhNprL3O z8jePwk!TbejmDs{XdD`kCZKXO5lupqQ3aZUrlM)+Of((MKr_)SG#kx9m1r(H3(Z4k zqxon7ItML8=b}aEJaj&~04+urq9y1ebTL|rK+Di_v;wU}m!MVXQnVUfhSs1ebU8|( zE6`fB4u$ASv>siBHlU4Y6WWZfM%SQg(RJv0bOX8(Z9zAoo6#-kR&*P>9o>QMM0cUP z(N=U1+J^2$_o3~m8r_c`Ks(Tb=ppnldIUX+9z&0#C(x7VDfBdY20e?OL(iiZ(2M9L z^fGz{y^3B#JJBxmI(h@`MsK3G(A(%8v^eg%e{f_=Xf1FoFFLSNvDJ!Miq*DM zOS3vw*Xmh)JH#4TLu+J*T4PJM!>oyASllx0a67`9S~EM+np+ENX|1fawXwFAW$moJ zWm}HrT3~sWZv|FpMOJJjRu3FKfDN=kHrP(LQY*6|c7_eLVK&@G*hm{?qiu|hwQ)AyCRn*m zv`IGEDr|~PwP|*yO}7~~(`MOhn`4zW*UqwecDBv81$K@tv~z8dooDCU1-95Ov?X?t zU2IDYTV~5`g{`zpY?WPVtL-vdV^wy!CF}}YYwIkuD{Z}9WgBdxZL-aFwOwP^+I4ol O-C#Gy?$nl8_x}JL3$l3t 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); });