From 6207da8fa5a315f33e13ee2b24f9ffcf5b5685c6 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Wed, 9 Mar 2022 12:48:40 +0400
Subject: [PATCH] #1 -- add validation

---
 data/db.mv.db                                 | Bin 24576 -> 28672 bytes
 .../ru/ulstu/controller/NewsController.java   |   9 ++++++++-
 src/main/java/ru/ulstu/model/News.java        |   3 +++
 src/main/resources/public/css/main.css        |   4 ++++
 src/main/resources/templates/editNews.html    |   5 ++++-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/data/db.mv.db b/data/db.mv.db
index db9ad7d68730cb8f45d91a8f364aea9b6a28e9b4..f2a5f01bea579e0c6be94328e072eae670ce8703 100644
GIT binary patch
literal 28672
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

literal 24576
zcmeI3OK;pn9KhFfQ%WAFOT|m#Fm)eEr6uy)USBF_*K}9eY{IS+(hHFv<2LGMH%c~D
z#R(xK4hV@$MG-0-K=1{)@CA_g0^H!h3HS)*!r0@-Wb^12C8SONd$9c<$DZ+T#{NH3
zH>I-I?fZ93h3-4+A7E1y1flHT-s#;jB_S;PUF`NuvFvYQcYp&^)I-fR+z@M(a@gP6
za0le%UA(ou-tWa1gk3!FZ{sb~^L!txf<9h=9}oZnKmZ5;0U!VbfB+Bx0zd!=00AIy
zVg%~o|DPCp=okn90U!VbfB+Bx0zd!=00AHX1c1Q*MIcS``$-jmRPN#^)xY6xnvzC#
z_sj~Z1?b^>15zQd>E6QIrdr<W_XnmSlPUp05EVU8%7gU{Y|4Tms*22%0{G?4^<K5V
z(;JuqI`SW>DmZhWn?7@{AWE{LYWmo@LaBHWU0v<i4yv|o%dywymK)6)k_4et<Pksh
zF-P0ca>s6?#yhCB=pcKw(Q!J6?^rzQSWO2_R}{t2eAU3BRH<m9H;w96r;es|-IuVT
zi(;r&BvDipMU*u!z@8WAh8JkQAO@}=x`OK~uI^z)QUk?MjEbkrSo4HwWYrcLty1w4
zLQ{8>p;WDE-L4_WnrqsKUs|4PHmdwAUvJFW?N;;*9sAv7yH&M2{LFYnkxv`eTGoQi
zqZO-Nty}FGNmZ}K57b(2Hp}!+TlT86wqiATG}pM%XgTB8O2y0Q;?(;|=S%Izg4Mo>
z=IxtI-%0BlX<bu!wAf<K?K`faA(2k5pes|KafBw}Jj$aHGBs3PY;~NrMaIc=m^Vga
zVFo-i+$(CdYW6B~>F(z!6|WNP57H%Y0QZ*tUIw~R<H<c8`v!T4Xr(Y<SL}ADvDnJa
zC%kK9!g%B~7VM5=Ei5Ii4w(fWRhx@*X+y(l4$WLNGt*>dY9r5#G&D1G<UAQPxz!Be
zzr8>H`0qyIO?ueHJG%9ukR_gcx?Vq9ALj~Uq4dIhfJ1kuJ0Ndnq43(-%?XZa6yvYl
zH)k(QzDVET_yr!jh$jAgaQ&lCzMLWFOJjU2e){3pRJ;_6U;Xhd6)(r)@1K89#VhpM
zpMRj@bS(bz>rXR<^B2Uuzxkx8G&X}K{(5lz$4CFXQaE2EueDN-Hsk|i72Ab33NOVU
z%2`Qpvm<Yed?aVZv(Z-4VnL3#O1xF$Ep2z>V|sx<*>gAW?0PT2_huC;bo*Y-9k>(m
z86qsWo7r(2hp)!%{Y~6+w%p#f>kmkw)i%9!;Cfv=E3ksh3fjx@#XG&A-|XKa!;QY(
zvohVebm!5X{~edA12<6za-t5p>v!=2(FH;|I$Da=fH0Dhkc>S_LJtF9EARAnwn;5n
zsxzo)4OX%;GLO+CE~7{CQF_TJ)lo;Oq^e9yRGFBlGRcp1nG{wsRYpdMg(n-O$BZ(b
zGjn*(P&654HW^7pUHZ&o7{pU&CX*Vk0h3t|(J@&M^pBE7^HzLIdWAf6!+@Sl*4q9j
z>6O~>NzUUmPT^Ee<Ydm}{1+r`GST=#geet>4)ldwaE)9bI@gWgaM%C=AOHk_01yBI
zy9lHPSMGo3b@YBYtD`rFlU>28e$+1Xc-lW6GWZz(KQo$A|35XF<k+-}tpV2m4;i}+
zGZxWNj~$`N|9_i%$eQPVW}XMJ&3&58^Di><JYOv|T9caRDzR^K16>)(KtC{wv)3Z`
znVDrHI}fvg1^>k&r%|PBRgv{Zeyk}TMU}kWrg)f$tiup6!wZ;&2d20fnc~ly>p)h3
zmVQ@sWtTG+iRwNpz+hH@aoSfv^iNvJi!y0YA#ui1A$G<R0i3a2dKUyB00e*l5C8%|
z00^8EfxZ5B?*HT5|953QaOGq4|HH&_Qx3`hr%976{~sq!hV%cL&KTh#V}u`%|9_vm
z4EcY^|I<Q<!&B2L5BYyuS#tdO|M~s%|J(cK|Ia_o`TxI*j|y+*`F|$Bn1vegsS7pc
zIrf7>jclNCv`T=-1R7~20MQ<M<BpioD9=#bF^4!DT~Fh+2SR-Em^)ie@mPp#SpIZI
zNAr3PQky{Sl%!B05on<T6(BZtQsyu83j}}w5O{70r2c>If9L*xnEU^pM*M&682$g@
z#O+Z2f5a4RK6W<$di0Kea>pqD{~On1&2y$aH#5)uQ*53;&4s#oSwLE-n?{#LvVV84
zxudVpeQL`oPNzlAW~&od@bJ=M$p5b-weZ2d#n_Ple{QV?cyJ&91b_e#00KbZStgMB
S|GEFo`p{YZzpEZo{{LS??+2Iw

diff --git a/src/main/java/ru/ulstu/controller/NewsController.java b/src/main/java/ru/ulstu/controller/NewsController.java
index d76fe1f..61cca27 100644
--- a/src/main/java/ru/ulstu/controller/NewsController.java
+++ b/src/main/java/ru/ulstu/controller/NewsController.java
@@ -8,6 +8,7 @@ package ru.ulstu.controller;
 
 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;
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import ru.ulstu.model.News;
 import ru.ulstu.service.NewsService;
 
+import javax.validation.Valid;
+
 @Controller
 public class NewsController {
     private final NewsService newsService;
@@ -30,8 +33,12 @@ public class NewsController {
     }
 
     @PostMapping("saveNews")
-    public String saveNews(@ModelAttribute News news) {
+    public String saveNews(@Valid @ModelAttribute News news, BindingResult result) {
+        if (result.hasErrors()) {
+            return "editNews";
+        }
         newsService.save(news);
+
         return "redirect:/";
     }
 }
diff --git a/src/main/java/ru/ulstu/model/News.java b/src/main/java/ru/ulstu/model/News.java
index 7efb6dc..af66265 100644
--- a/src/main/java/ru/ulstu/model/News.java
+++ b/src/main/java/ru/ulstu/model/News.java
@@ -2,17 +2,20 @@ package ru.ulstu.model;
 
 import javax.persistence.Entity;
 import javax.persistence.Lob;
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 
 @Entity
 public class News extends BaseEntity {
     private final static int MAX_NEWS_TEXT_PREVIEW_LENGTH = 800;
 
+    @NotEmpty(message = "Заголовок не может быть пустым")
     private String title;
 
     private Date date;
 
     @Lob
+    @NotEmpty(message = "Текст новости не может быть пустым")
     private String text;
 
     public News() {
diff --git a/src/main/resources/public/css/main.css b/src/main/resources/public/css/main.css
index c207eae..b2b570d 100644
--- a/src/main/resources/public/css/main.css
+++ b/src/main/resources/public/css/main.css
@@ -19,4 +19,8 @@
 
 .news-image {
     width: 300px;
+}
+
+.error {
+    color: red;
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/editNews.html b/src/main/resources/templates/editNews.html
index 96aa36e..a6df9fb 100644
--- a/src/main/resources/templates/editNews.html
+++ b/src/main/resources/templates/editNews.html
@@ -11,14 +11,17 @@
 <div class="container" layout:fragment="content">
     <h3>Редактирование новости:</h3>
     <form action="#" th:action="@{/saveNews}" th:object="${news}" method="post">
-        <p style="color:red" th:text="${error}"></p>
         <div class="form-group">
             <label for="title">Заголовок</label>
             <input type="text" class="form-control" id="title" th:field="*{title}" placeholder="Заголовок новости">
+            <p th:if="${#fields.hasErrors('title')}" th:class="${#fields.hasErrors('title')}? error">
+                Не может быть пустым</p>
         </div>
         <div class="form-group">
             <label for="text">Текст новости</label>
             <textarea class="form-control" id="text" th:field="*{text}" placeholder="Текст новости"></textarea>
+            <p th:if="${#fields.hasErrors('text')}" th:class="${#fields.hasErrors('text')}? error">
+                Не может быть пустым</p>
         </div>
         <button type="submit" class="btn btn-primary">Сохранить</button>
     </form>