diff --git a/00-backend/src/main/java/de/htwsaar/webshop/WebshopApplication.java b/00-backend/src/main/java/de/htwsaar/webshop/WebshopApplication.java index 785b566..28afcf5 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/WebshopApplication.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/WebshopApplication.java @@ -5,10 +5,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class WebshopApplication { - private static final String BASE_PORT = "8085"; + private static final String BASE_PORT = "8085"; - public static void main(String[] args) { - System.setProperty("server.port", BASE_PORT); - SpringApplication.run(WebshopApplication.class, args); - } + public static void main(String[] args) { + System.setProperty("server.port", BASE_PORT); + SpringApplication.run(WebshopApplication.class, args); + } } diff --git a/00-backend/src/main/java/de/htwsaar/webshop/controller/ArticleController.java b/00-backend/src/main/java/de/htwsaar/webshop/controller/ArticleController.java index e4b9150..679cddb 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/controller/ArticleController.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/controller/ArticleController.java @@ -12,8 +12,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.UUID; -import static de.htwsaar.webshop.config.ControllerPathConfig.*; -import static de.htwsaar.webshop.config.ParameterConfig.*; +import static de.htwsaar.webshop.config.ControllerPathConfig.ARTICLE_BASE; +import static de.htwsaar.webshop.config.ControllerPathConfig.ARTICLE_GET_ALL; +import static de.htwsaar.webshop.config.ParameterConfig.PARAM_UUID; import static de.htwsaar.webshop.util.LoggerUtil.logRequest; @RestController @@ -41,7 +42,7 @@ public class ArticleController { @RequestMapping(path = ARTICLE_BASE, method = RequestMethod.POST, produces = "application/json") public ResponseEntity add(HttpServletRequest request, - @RequestBody Article article) { + @RequestBody Article article) { logRequest(request); if (article.getPrice100() < 0 || article.getStock() < 0 || article.getDiscount100() > 100 || article.getDiscount100() < 0) { diff --git a/00-backend/src/main/java/de/htwsaar/webshop/controller/ImageController.java b/00-backend/src/main/java/de/htwsaar/webshop/controller/ImageController.java index 0e7d11c..d691b16 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/controller/ImageController.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/controller/ImageController.java @@ -12,8 +12,10 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import static de.htwsaar.webshop.config.ControllerPathConfig.*; -import static de.htwsaar.webshop.config.ParameterConfig.*; +import static de.htwsaar.webshop.config.ControllerPathConfig.IMAGE_BASE; +import static de.htwsaar.webshop.config.ControllerPathConfig.IMAGE_GET_ALL; +import static de.htwsaar.webshop.config.ParameterConfig.PARAM_ARTICLE_ID; +import static de.htwsaar.webshop.config.ParameterConfig.PARAM_IMAGE_ID; import static de.htwsaar.webshop.util.LoggerUtil.logRequest; @RestController diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/ArticleRepository.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/ArticleRepository.java index fc0135f..eae2fbc 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/repository/ArticleRepository.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/ArticleRepository.java @@ -12,6 +12,8 @@ import java.util.UUID; @SuppressWarnings("unused") public interface ArticleRepository extends JpaRepository { Optional
findArticleById(@NonNull Long id); + Optional
findArticleByName(@NonNull String Name); + Optional
findArticleByUuid(@NonNull UUID uuid); } diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/ImageRepository.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/ImageRepository.java index d2fd058..b8c3808 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/repository/ImageRepository.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/ImageRepository.java @@ -11,6 +11,8 @@ import java.util.List; @Repository public interface ImageRepository extends JpaRepository { List findAllByArticleId(@NonNull Long articleId); + Image findImageByArticleId(@NotNull Long articleId); + Image findImageById(Long id); } diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Article.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Article.java index c146831..9d185fa 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Article.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Article.java @@ -3,7 +3,10 @@ package de.htwsaar.webshop.repository.entities; import jakarta.persistence.*; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.UUID; diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/OrderItem.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/OrderItem.java index ab89e98..fb05a6a 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/OrderItem.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/OrderItem.java @@ -6,7 +6,6 @@ import lombok.*; import org.hibernate.annotations.OnDelete; import java.io.Serializable; -import java.util.Objects; @Entity @Table(name = "OrderItems") diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Review.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Review.java index 84e8cf0..7bbaf3e 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Review.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Review.java @@ -2,8 +2,8 @@ package de.htwsaar.webshop.repository.entities; import jakarta.persistence.*; import jakarta.validation.constraints.Max; -import lombok.AllArgsConstructor; import jakarta.validation.constraints.PositiveOrZero; +import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; 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 a3f4d2e..be72c57 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 @@ -9,12 +9,19 @@ import java.util.UUID; @SuppressWarnings("unused") public interface ArticleService { List
findAll(); + Article findByUUID(UUID uuid); + Article findByTitle(String title); + Article findById(Long articleId); + void delete(Long id); + Article save(Article article); + double getRating(Long id); + double getRating(UUID uuid); ArticleModel from(Article article); 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 ca55c0c..bf2265e 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 @@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -21,7 +20,7 @@ public class ArticleServiceImpl implements ArticleService { private final ReviewRepository reviewRepository; @Autowired - public ArticleServiceImpl(ArticleRepository articleRepository, ReviewRepository reviewRepository, ArticleService articleService) { + public ArticleServiceImpl(ArticleRepository articleRepository, ReviewRepository reviewRepository) { this.articleRepository = articleRepository; this.reviewRepository = reviewRepository; } diff --git a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ImageServiceImpl.java b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ImageServiceImpl.java index e910677..c223185 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ImageServiceImpl.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ImageServiceImpl.java @@ -46,7 +46,7 @@ public class ImageServiceImpl implements ImageService { @Override public ImageModel from(Image image) { - return new ImageModel(articleService.findById(image.getArticleId()).getUuid(),image.getUri()); + return new ImageModel(articleService.findById(image.getArticleId()).getUuid(), image.getUri()); } @Override diff --git a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ValidatorServiceImpl.java b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ValidatorServiceImpl.java index f0c4dac..3955928 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ValidatorServiceImpl.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ValidatorServiceImpl.java @@ -22,8 +22,8 @@ public class ValidatorServiceImpl implements ValidatorService { * Jakarta Validator * * @param validatable any Validatable + * @param any Validatable * @return whether the Object is Invalid - * @param any Validatable */ @Override public boolean isInvalid(T validatable) {