From 286edb33ed48fe24fbc541ee6a13508a0093c85b Mon Sep 17 00:00:00 2001 From: localhorst Date: Sat, 30 May 2020 11:52:30 +0200 Subject: [PATCH 1/4] show supplier name at offered article page --- .../suppliers/SupplierOfferController.java | 24 ++++++------------- .../entities/supplier/ArticleOffer.java | 3 ++- .../intern/offeredArticles/index.html | 2 +- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java index 3ef21bf..7d27059 100644 --- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java +++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java @@ -30,7 +30,8 @@ public class SupplierOfferController { for (ArticleOffer article : offersRepository.findAll()) { UImodelOfferedArticle tmp = new UImodelOfferedArticle(); - tmp.addData(article, "supplierName01", 4884, articleRepository.findArticleIDByRelatedID(article.id)); //TODO display supplier name with link + tmp.addData(article, articleRepository.findArticleIDByRelatedID(article.id)); // TODO display supplier name + // with link totals.add(tmp); } @@ -40,16 +41,15 @@ public class SupplierOfferController { public class UImodelOfferedArticle { - long offer_id; + long offer_id; String title; String manufacturer; String articlenumber; String supplierName; - int supplierId; String price; String ads; int listedArticleId; - boolean offerIsListed; //true --> offered article is listed + boolean offerIsListed; // true --> offered article is listed public long getOffer_id() { return offer_id; @@ -58,7 +58,7 @@ public class SupplierOfferController { public void setOffer_id(long offer_id) { this.offer_id = offer_id; } - + public boolean isOfferIsListed() { return offerIsListed; } @@ -99,14 +99,6 @@ public class SupplierOfferController { this.supplierName = supplierName; } - public int getSupplierId() { - return supplierId; - } - - public void setSupplierId(int supplierId) { - this.supplierId = supplierId; - } - public String getPrice() { return price; } @@ -131,15 +123,13 @@ public class SupplierOfferController { this.listedArticleId = listedArticleId; } - public void addData(ArticleOffer article, String supplierName, int supplierId, - Optional listedArticleId) { + public void addData(ArticleOffer article, Optional listedArticleId) { this.offer_id = article.id; this.title = article.title; this.manufacturer = article.manufacturer; this.articlenumber = article.articleNumber; - this.supplierName = supplierName; - this.supplierId = supplierId; + this.supplierName = article.cheapestSupplier.name; this.price = String.format("%.2f", ((float) article.pricePerUnitNet / 100)); this.ads = (article.shouldBeAdvertised) ? "Ja" : "Nein"; 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 405fb4a..8c20099 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 @@ -28,5 +28,6 @@ public class ArticleOffer { public boolean shouldBeAdvertised; - + @ManyToOne(optional = false) + public Supplier cheapestSupplier; } diff --git a/prototype/src/main/resources/templates/intern/offeredArticles/index.html b/prototype/src/main/resources/templates/intern/offeredArticles/index.html index 79d926a..04d9a12 100644 --- a/prototype/src/main/resources/templates/intern/offeredArticles/index.html +++ b/prototype/src/main/resources/templates/intern/offeredArticles/index.html @@ -44,7 +44,7 @@ - + € -- 2.47.1 From 1b2e75a82c29eeb7807179063f44cd56fadadb43 Mon Sep 17 00:00:00 2001 From: localhorst Date: Sat, 30 May 2020 12:29:40 +0200 Subject: [PATCH 2/4] updates scripts --- prototype/scripts/addarticles.sql | 13 +++++++++++-- prototype/scripts/addsupplier.sql | 6 ++++++ .../intern/suppliers/SupplierOfferController.java | 3 +-- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 prototype/scripts/addsupplier.sql diff --git a/prototype/scripts/addarticles.sql b/prototype/scripts/addarticles.sql index b60497d..e81c174 100644 --- a/prototype/scripts/addarticles.sql +++ b/prototype/scripts/addarticles.sql @@ -1,6 +1,15 @@ -INSERT INTO article_offers ("manufacturer", "article_number", "price_per_unit_net", "title", "vat_percent", "should_be_advertised") -VALUES ("McDonalds", "1", 4242, "McPizza", 7, 1); +/* +* add a supplier first +*/ +INSERT INTO article_offers ("manufacturer", "article_number", "price_per_unit_net", "title", "vat_percent", "should_be_advertised", "cheapest_supplier_id") +VALUES ("McDonalds", "1", 4242, "McPizza", 7, 1, 1); + + + +/* +* There is no need for the add article, you can add one form the UI on the offerd article page +*/ INSERT INTO articles ("related_id", "shop_price_per_unit_net_cent", "warehouse_units_per_slot", "should_reorder", "reorder_max_price", "title", "description", "image_id") VALUES (1, 19.99, 10, 1, 15, "Huge Hamburger", "This huge Hamburger is awesome!", NULL); diff --git a/prototype/scripts/addsupplier.sql b/prototype/scripts/addsupplier.sql new file mode 100644 index 0000000..a56f4ed --- /dev/null +++ b/prototype/scripts/addsupplier.sql @@ -0,0 +1,6 @@ + +INSERT INTO suppliers ("api_url", "name", "uuid") +VALUES ("https://api.com", "Conrad", "fdfdfg4gdfgdf4gfg"); + + + diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java index 7d27059..ca71682 100644 --- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java +++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java @@ -30,8 +30,7 @@ public class SupplierOfferController { for (ArticleOffer article : offersRepository.findAll()) { UImodelOfferedArticle tmp = new UImodelOfferedArticle(); - tmp.addData(article, articleRepository.findArticleIDByRelatedID(article.id)); // TODO display supplier name - // with link + tmp.addData(article, articleRepository.findArticleIDByRelatedID(article.id)); totals.add(tmp); } -- 2.47.1 From 407229f15d97001f6ffccd72cacb5f961bd5b2b8 Mon Sep 17 00:00:00 2001 From: localhorst Date: Sat, 30 May 2020 16:49:20 +0200 Subject: [PATCH 3/4] changed cheapest supplier ref in offered article entity --- .../java/org/hso/ecommerce/entities/supplier/ArticleOffer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8c20099..41296ba 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 @@ -28,6 +28,6 @@ public class ArticleOffer { public boolean shouldBeAdvertised; - @ManyToOne(optional = false) + @ManyToOne(optional = true) public Supplier cheapestSupplier; } -- 2.47.1 From 6988d3f213f21bbedbee4de966d4dcd078c1a8bd Mon Sep 17 00:00:00 2001 From: Seil0 Date: Mon, 1 Jun 2020 17:10:04 +0200 Subject: [PATCH 4/4] minor code clean up --- .../controller/intern/suppliers/SupplierOfferController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java index ca71682..edc7bc2 100644 --- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java +++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java @@ -26,7 +26,7 @@ public class SupplierOfferController { @GetMapping("supplierOffers") public String internListedArticles(Model model) { - List totals = new ArrayList(); + List totals = new ArrayList<>(); for (ArticleOffer article : offersRepository.findAll()) { UImodelOfferedArticle tmp = new UImodelOfferedArticle(); -- 2.47.1