From d1301f69887829139044a059721b58797c7cf4e6 Mon Sep 17 00:00:00 2001 From: CodeSteak Date: Sun, 10 May 2020 14:30:00 +0200 Subject: [PATCH] Fix naming-convension-error in ArticleOffer --- .../org/hso/ecommerce/entities/supplier/ArticleOffer.java | 2 +- .../hso/ecommerce/entities/warehouse/WarehouseBooking.java | 1 + .../java/org/hso/ecommerce/repos/shop/ArticleRepository.java | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/supplier/ArticleOffer.java b/prototype/src/main/java/org/hso/ecommerce/entities/supplier/ArticleOffer.java index ce02d13..ae86659 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/supplier/ArticleOffer.java +++ b/prototype/src/main/java/org/hso/ecommerce/entities/supplier/ArticleOffer.java @@ -20,5 +20,5 @@ public class ArticleOffer { public int vatPercent; - public boolean should_be_advertised; + public boolean shouldBeAdvertised; } diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBooking.java b/prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBooking.java index cf60734..08eaa40 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBooking.java +++ b/prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBooking.java @@ -27,6 +27,7 @@ public class WarehouseBooking { ) public List positions = new ArrayList<>(); + // TODO FIX ME @OneToOne(optional = false, cascade = CascadeType.ALL) public BookingReason reason; } diff --git a/prototype/src/main/java/org/hso/ecommerce/repos/shop/ArticleRepository.java b/prototype/src/main/java/org/hso/ecommerce/repos/shop/ArticleRepository.java index 2a88b7e..90b6d11 100644 --- a/prototype/src/main/java/org/hso/ecommerce/repos/shop/ArticleRepository.java +++ b/prototype/src/main/java/org/hso/ecommerce/repos/shop/ArticleRepository.java @@ -1,14 +1,12 @@ package org.hso.ecommerce.repos.shop; import org.hso.ecommerce.entities.shop.Article; -import org.hso.ecommerce.entities.user.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Optional; @Repository public interface ArticleRepository extends JpaRepository { @@ -17,7 +15,7 @@ public interface ArticleRepository extends JpaRepository { Article findArticleById(@Param("articleId") long articleId); - @Query("SELECT a FROM Article a JOIN a.related ao WHERE ao.should_be_advertised = true") + @Query("SELECT a FROM Article a JOIN a.related ao WHERE ao.shouldBeAdvertised = true") List
getAdvertisedArticles();