localhorst/e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

check if article.image is null

Browse Source
This commit is contained in:
Hendrik Schutter 2020-06-01 10:53:10 +02:00
parent 1a1502b38c
commit 38fcda708f
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java
View File

@ -208,7 +208,10 @@ public class InternArticleController {
public long id; public long id;
void addListedArticle(Article article, int stock) { void addListedArticle(Article article, int stock) {
if (article.image != null) {
this.imgPath = article.image.path; this.imgPath = article.image.path;
}
this.title = article.title; this.title = article.title;
this.price_netto = String.format("%.2f", ((float) article.shopPricePerUnitNetCent / 100)); this.price_netto = String.format("%.2f", ((float) article.shopPricePerUnitNetCent / 100));
this.price = String.format("%.2f", ((float) article.getPriceGross() / 100)); this.price = String.format("%.2f", ((float) article.getPriceGross() / 100));
@ -338,7 +341,9 @@ public class InternArticleController {
} }
void addArticle(Article article, int stock) { void addArticle(Article article, int stock) {
if (article.image != null) {
this.imgPath = article.image.path; this.imgPath = article.image.path;
}
this.title = article.title; this.title = article.title;
this.price_netto = String.format("%.2f", ((float) article.shopPricePerUnitNetCent / 100)); this.price_netto = String.format("%.2f", ((float) article.shopPricePerUnitNetCent / 100));
this.price = String.format("%.2f", ((float) article.getPriceGross() / 100)); this.price = String.format("%.2f", ((float) article.getPriceGross() / 100));

3
prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java
View File

@ -100,8 +100,11 @@ public class ShopArticleController {
@PathVariable("id") Long id @PathVariable("id") Long id
) throws IOException { ) throws IOException {
Article article = articleRepository.findArticleById(id); Article article = articleRepository.findArticleById(id);
if(article.image != null) {
InputStream in = new FileInputStream(article.image.path); InputStream in = new FileInputStream(article.image.path);
response.setContentType(MediaType.IMAGE_JPEG_VALUE); response.setContentType(MediaType.IMAGE_JPEG_VALUE);
IOUtils.copy(in, response.getOutputStream()); IOUtils.copy(in, response.getOutputStream());
} }
} }
}