diff options
Diffstat (limited to 'src/main/java/com/blog/web')
4 files changed, 28 insertions, 8 deletions
diff --git a/src/main/java/com/blog/web/controllers/ArticleController.java b/src/main/java/com/blog/web/controllers/ArticleController.java index 2b32070..0e58877 100644 --- a/src/main/java/com/blog/web/controllers/ArticleController.java +++ b/src/main/java/com/blog/web/controllers/ArticleController.java @@ -3,13 +3,16 @@ package com.blog.web.controllers; import com.blog.web.dto.ArticleDto; import com.blog.web.models.Article; import com.blog.web.services.ArticleService; +import jakarta.validation.Valid; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import java.time.LocalDateTime; import java.util.List; @Controller @@ -35,20 +38,31 @@ public class ArticleController { } @PostMapping("/articles/new") - public String saveArticle(@ModelAttribute("article") Article article) { - articleService.saveArticle(article); + public String saveArticle(@Valid @ModelAttribute("article") ArticleDto articleDto, + BindingResult result, + Model model) { + if(result.hasErrors()) { + model.addAttribute("article", articleDto); + return "articles/new"; + } + articleService.saveArticle(articleDto); return "redirect:/articles"; } @GetMapping("/articles/edit/{articleId}") public String editArticleForm(@PathVariable("articleId") long articleId, Model model) { - ArticleDto article = articleService.findArticleById(articleId); - model.addAttribute("article", article); + ArticleDto articleDto = articleService.findArticleById(articleId); + model.addAttribute("article", articleDto); return "articles/edit"; } @PostMapping("/articles/edit/{articleId}") - public String updateArticle(@PathVariable("articleId") Long articleId, @ModelAttribute("article") ArticleDto article) { + public String updateArticle(@PathVariable("articleId") Long articleId, + @Valid @ModelAttribute("article") ArticleDto article, + BindingResult result) { + if(result.hasErrors()) { + return "articles/edit"; + } article.setId(articleId); articleService.updateArticle(article); return "redirect:/articles"; diff --git a/src/main/java/com/blog/web/dto/ArticleDto.java b/src/main/java/com/blog/web/dto/ArticleDto.java index ffe7926..0c48f62 100644 --- a/src/main/java/com/blog/web/dto/ArticleDto.java +++ b/src/main/java/com/blog/web/dto/ArticleDto.java @@ -3,10 +3,12 @@ package com.blog.web.dto; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.validation.constraints.NotEmpty; import lombok.Builder; import lombok.Data; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; +import org.hibernate.validator.constraints.URL; import java.time.LocalDateTime; @@ -16,12 +18,15 @@ public class ArticleDto { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @NotEmpty(message = "Article title should not be empty") private String title; + @NotEmpty(message = "Article Photo URL should not be empty") + @URL(message = "Article Photo URL should be a URL") private String photoUrl; + @NotEmpty(message = "Article Content should not be empty") private String content; @CreationTimestamp private LocalDateTime createdOn; @UpdateTimestamp private LocalDateTime updatedOn; - } diff --git a/src/main/java/com/blog/web/services/ArticleService.java b/src/main/java/com/blog/web/services/ArticleService.java index 870a290..e2ec309 100644 --- a/src/main/java/com/blog/web/services/ArticleService.java +++ b/src/main/java/com/blog/web/services/ArticleService.java @@ -8,7 +8,7 @@ import java.util.List; public interface ArticleService { List<ArticleDto> findAllArticles(); - Article saveArticle(Article article); + Article saveArticle(ArticleDto article); ArticleDto findArticleById(long articleId); diff --git a/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java b/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java index d950369..b9e11f6 100644 --- a/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java +++ b/src/main/java/com/blog/web/services/impl/ArticleServiceImpl.java @@ -24,7 +24,8 @@ public class ArticleServiceImpl implements ArticleService { } @Override - public Article saveArticle(Article article) { + public Article saveArticle(ArticleDto articleDto) { + Article article = mapToArticle(articleDto); return articleRepository.save(article); } |