From b57142e28fc423b5779372e28107e536f03db963 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Wed, 8 May 2019 17:08:37 +0400
Subject: [PATCH 1/3] #70 added unique name control

---
 .../controller/ConferenceController.java      |  1 +
 .../ulstu/conference/model/ConferenceDto.java |  3 ++-
 .../repository/ConferenceRepository.java      |  7 +++++-
 .../conference/service/ConferenceService.java | 12 ++++++++--
 .../java/ru/ulstu/name/NameContainer.java     | 24 +++++++++++++++++++
 .../java/ru/ulstu/name/NameRepository.java    |  7 ++++++
 src/main/java/ru/ulstu/name/NameService.java  | 11 +++++++++
 7 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/name/NameContainer.java
 create mode 100644 src/main/java/ru/ulstu/name/NameRepository.java
 create mode 100644 src/main/java/ru/ulstu/name/NameService.java

diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
index 5aecb51..4e11d32 100644
--- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
+++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
@@ -76,6 +76,7 @@ public class ConferenceController {
     public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
         conferenceService.filterEmptyDeadlines(conferenceDto);
         conferenceService.checkEmptyFieldsOfDeadline(conferenceDto, errors);
+        conferenceService.checkUniqueName(conferenceDto, errors);
         if (errors.hasErrors()) {
             return CONFERENCE_PAGE;
         }
diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
index 2e2f13b..9c9b37a 100644
--- a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
+++ b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.name.NameContainer;
 import ru.ulstu.paper.model.Paper;
 
 import javax.persistence.Temporal;
@@ -16,7 +17,7 @@ import java.util.List;
 
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
-public class ConferenceDto {
+public class ConferenceDto extends NameContainer {
 
     private final static String BEGIN_DATE = "Начало: ";
     private final static String END_DATE = "Конец: ";
diff --git a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java b/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
index 3a8bbe1..5dfe7dd 100644
--- a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
+++ b/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
@@ -5,12 +5,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import ru.ulstu.conference.model.Conference;
+import ru.ulstu.name.NameRepository;
 import ru.ulstu.user.model.User;
 
 import java.util.Date;
 import java.util.List;
 
-public interface ConferenceRepository extends JpaRepository<Conference, Integer> {
+public interface ConferenceRepository extends JpaRepository<Conference, Integer>, NameRepository {
     @Query("SELECT c FROM Conference c LEFT JOIN c.users u WHERE (:user IS NULL OR u.user = :user) " +
             "AND (YEAR(c.beginDate) = :year OR :year IS NULL) ORDER BY begin_date DESC")
     List<Conference> findByUserAndYear(@Param("user") User user, @Param("year") Integer year);
@@ -24,4 +25,8 @@ public interface ConferenceRepository extends JpaRepository<Conference, Integer>
     @Modifying
     @Query("UPDATE Conference c SET c.ping = (c.ping + 1) WHERE c.id = :id")
     int updatePingConference(@Param("id") Integer id);
+
+    @Override
+    @Query("SELECT title FROM Conference c WHERE c.title = :name")
+    String findByName(@Param("name") String name);
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 38de435..9a10efb 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -13,6 +13,7 @@ import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.repository.ConferenceRepository;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.name.NameService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.service.PaperService;
 import ru.ulstu.ping.service.PingService;
@@ -31,7 +32,7 @@ import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 @Service
-public class ConferenceService {
+public class ConferenceService extends NameService {
     private final static int MAX_DISPLAY_SIZE = 40;
 
     private final ConferenceRepository conferenceRepository;
@@ -280,10 +281,17 @@ public class ConferenceService {
         }
     }
 
-
     public void filterEmptyDeadlines(ConferenceDto conferenceDto) {
         conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
                 .collect(Collectors.toList()));
     }
+
+    public void checkUniqueName(ConferenceDto conferenceDto, Errors errors) {
+        conferenceDto.setName(conferenceDto.getTitle());
+        conferenceDto.setNameRepository(conferenceRepository);
+        if (checkUniqueName(conferenceDto)) {
+            errors.rejectValue("title", "errorCode", "Конференция с таким именем уже существует");
+        }
+    }
 }
diff --git a/src/main/java/ru/ulstu/name/NameContainer.java b/src/main/java/ru/ulstu/name/NameContainer.java
new file mode 100644
index 0000000..bcccc80
--- /dev/null
+++ b/src/main/java/ru/ulstu/name/NameContainer.java
@@ -0,0 +1,24 @@
+package ru.ulstu.name;
+
+public abstract class NameContainer {
+
+    private String name = "";
+
+    private NameRepository nameRepository;
+
+    public NameRepository getNameRepository() {
+        return nameRepository;
+    }
+
+    public void setNameRepository(NameRepository nameRepository) {
+        this.nameRepository = nameRepository;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/src/main/java/ru/ulstu/name/NameRepository.java b/src/main/java/ru/ulstu/name/NameRepository.java
new file mode 100644
index 0000000..99bd3ac
--- /dev/null
+++ b/src/main/java/ru/ulstu/name/NameRepository.java
@@ -0,0 +1,7 @@
+package ru.ulstu.name;
+
+import org.springframework.data.repository.query.Param;
+
+public interface NameRepository {
+    String findByName(@Param("name") String name);
+}
diff --git a/src/main/java/ru/ulstu/name/NameService.java b/src/main/java/ru/ulstu/name/NameService.java
new file mode 100644
index 0000000..7d7bdc9
--- /dev/null
+++ b/src/main/java/ru/ulstu/name/NameService.java
@@ -0,0 +1,11 @@
+package ru.ulstu.name;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public abstract class NameService {
+
+    public boolean checkUniqueName(NameContainer nameContainer) {
+        return nameContainer.getName().equals(nameContainer.getNameRepository().findByName(nameContainer.getName()));
+    }
+}

From d846192046aae130e1882f0e889845a664c4180c Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Sun, 12 May 2019 00:28:03 +0400
Subject: [PATCH 2/3] #111 fixes

---
 .../controller/ConferenceController.java         |  7 ++++++-
 .../repository/ConferenceRepository.java         |  8 ++++----
 .../conference/service/ConferenceService.java    | 13 +++----------
 src/main/java/ru/ulstu/name/BaseRepository.java  |  7 +++++++
 src/main/java/ru/ulstu/name/BaseService.java     | 16 ++++++++++++++++
 src/main/java/ru/ulstu/name/NameContainer.java   | 10 ----------
 src/main/java/ru/ulstu/name/NameRepository.java  |  7 -------
 src/main/java/ru/ulstu/name/NameService.java     | 11 -----------
 8 files changed, 36 insertions(+), 43 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/name/BaseRepository.java
 create mode 100644 src/main/java/ru/ulstu/name/BaseService.java
 delete mode 100644 src/main/java/ru/ulstu/name/NameRepository.java
 delete mode 100644 src/main/java/ru/ulstu/name/NameService.java

diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
index 4e11d32..48a2ef2 100644
--- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
+++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
@@ -76,7 +76,12 @@ public class ConferenceController {
     public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
         conferenceService.filterEmptyDeadlines(conferenceDto);
         conferenceService.checkEmptyFieldsOfDeadline(conferenceDto, errors);
-        conferenceService.checkUniqueName(conferenceDto, errors);
+        conferenceDto.setName(conferenceDto.getTitle());
+        conferenceService.checkUniqueName(conferenceDto,
+                errors,
+                conferenceDto.getId(),
+                "title",
+                "Конференция с таким именем уже существует");
         if (errors.hasErrors()) {
             return CONFERENCE_PAGE;
         }
diff --git a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java b/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
index 5dfe7dd..2b0a428 100644
--- a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
+++ b/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
@@ -5,13 +5,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import ru.ulstu.conference.model.Conference;
-import ru.ulstu.name.NameRepository;
+import ru.ulstu.name.BaseRepository;
 import ru.ulstu.user.model.User;
 
 import java.util.Date;
 import java.util.List;
 
-public interface ConferenceRepository extends JpaRepository<Conference, Integer>, NameRepository {
+public interface ConferenceRepository extends JpaRepository<Conference, Integer>, BaseRepository {
     @Query("SELECT c FROM Conference c LEFT JOIN c.users u WHERE (:user IS NULL OR u.user = :user) " +
             "AND (YEAR(c.beginDate) = :year OR :year IS NULL) ORDER BY begin_date DESC")
     List<Conference> findByUserAndYear(@Param("user") User user, @Param("year") Integer year);
@@ -27,6 +27,6 @@ public interface ConferenceRepository extends JpaRepository<Conference, Integer>
     int updatePingConference(@Param("id") Integer id);
 
     @Override
-    @Query("SELECT title FROM Conference c WHERE c.title = :name")
-    String findByName(@Param("name") String name);
+    @Query("SELECT title FROM Conference c WHERE (c.title = :name) AND (:id IS NULL OR c.id != :id) ")
+    String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 9a10efb..8ffeb6f 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -13,7 +13,7 @@ import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.repository.ConferenceRepository;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
-import ru.ulstu.name.NameService;
+import ru.ulstu.name.BaseService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.service.PaperService;
 import ru.ulstu.ping.service.PingService;
@@ -32,7 +32,7 @@ import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 @Service
-public class ConferenceService extends NameService {
+public class ConferenceService extends BaseService {
     private final static int MAX_DISPLAY_SIZE = 40;
 
     private final ConferenceRepository conferenceRepository;
@@ -52,6 +52,7 @@ public class ConferenceService extends NameService {
                              PingService pingService,
                              ConferenceNotificationService conferenceNotificationService,
                              EventService eventService) {
+        this.baseRepository = conferenceRepository;
         this.conferenceRepository = conferenceRepository;
         this.conferenceUserService = conferenceUserService;
         this.deadlineService = deadlineService;
@@ -286,12 +287,4 @@ public class ConferenceService extends NameService {
                 .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
                 .collect(Collectors.toList()));
     }
-
-    public void checkUniqueName(ConferenceDto conferenceDto, Errors errors) {
-        conferenceDto.setName(conferenceDto.getTitle());
-        conferenceDto.setNameRepository(conferenceRepository);
-        if (checkUniqueName(conferenceDto)) {
-            errors.rejectValue("title", "errorCode", "Конференция с таким именем уже существует");
-        }
-    }
 }
diff --git a/src/main/java/ru/ulstu/name/BaseRepository.java b/src/main/java/ru/ulstu/name/BaseRepository.java
new file mode 100644
index 0000000..b691ea2
--- /dev/null
+++ b/src/main/java/ru/ulstu/name/BaseRepository.java
@@ -0,0 +1,7 @@
+package ru.ulstu.name;
+
+import org.springframework.data.repository.query.Param;
+
+public interface BaseRepository {
+    String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
+}
diff --git a/src/main/java/ru/ulstu/name/BaseService.java b/src/main/java/ru/ulstu/name/BaseService.java
new file mode 100644
index 0000000..6619385
--- /dev/null
+++ b/src/main/java/ru/ulstu/name/BaseService.java
@@ -0,0 +1,16 @@
+package ru.ulstu.name;
+
+import org.springframework.stereotype.Service;
+import org.springframework.validation.Errors;
+
+@Service
+public abstract class BaseService {
+
+    public BaseRepository baseRepository;
+
+    public void checkUniqueName(NameContainer nameContainer, Errors errors, Integer id, String checkField, String errorMessage) {
+        if (nameContainer.getName().equals(baseRepository.findByNameAndNotId(nameContainer.getName(), id))) {
+            errors.rejectValue(checkField, "errorCode", errorMessage);
+        }
+    }
+}
diff --git a/src/main/java/ru/ulstu/name/NameContainer.java b/src/main/java/ru/ulstu/name/NameContainer.java
index bcccc80..4339fb2 100644
--- a/src/main/java/ru/ulstu/name/NameContainer.java
+++ b/src/main/java/ru/ulstu/name/NameContainer.java
@@ -4,16 +4,6 @@ public abstract class NameContainer {
 
     private String name = "";
 
-    private NameRepository nameRepository;
-
-    public NameRepository getNameRepository() {
-        return nameRepository;
-    }
-
-    public void setNameRepository(NameRepository nameRepository) {
-        this.nameRepository = nameRepository;
-    }
-
     public String getName() {
         return name;
     }
diff --git a/src/main/java/ru/ulstu/name/NameRepository.java b/src/main/java/ru/ulstu/name/NameRepository.java
deleted file mode 100644
index 99bd3ac..0000000
--- a/src/main/java/ru/ulstu/name/NameRepository.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.ulstu.name;
-
-import org.springframework.data.repository.query.Param;
-
-public interface NameRepository {
-    String findByName(@Param("name") String name);
-}
diff --git a/src/main/java/ru/ulstu/name/NameService.java b/src/main/java/ru/ulstu/name/NameService.java
deleted file mode 100644
index 7d7bdc9..0000000
--- a/src/main/java/ru/ulstu/name/NameService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package ru.ulstu.name;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public abstract class NameService {
-
-    public boolean checkUniqueName(NameContainer nameContainer) {
-        return nameContainer.getName().equals(nameContainer.getNameRepository().findByName(nameContainer.getName()));
-    }
-}

From 6044d6f8e398e0aa6b5706066511a2133de304de Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Mon, 13 May 2019 19:08:21 +0400
Subject: [PATCH 3/3] #111 save method refactor

---
 .../controller/ConferenceController.java         | 11 +----------
 .../conference/service/ConferenceService.java    | 16 +++++++++++++++-
 .../templates/conferences/conference.html        |  7 ++++---
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
index 48a2ef2..f9a4bac 100644
--- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
+++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
@@ -74,18 +74,9 @@ public class ConferenceController {
 
     @PostMapping(value = "/conference", params = "save")
     public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
-        conferenceService.filterEmptyDeadlines(conferenceDto);
-        conferenceService.checkEmptyFieldsOfDeadline(conferenceDto, errors);
-        conferenceDto.setName(conferenceDto.getTitle());
-        conferenceService.checkUniqueName(conferenceDto,
-                errors,
-                conferenceDto.getId(),
-                "title",
-                "Конференция с таким именем уже существует");
-        if (errors.hasErrors()) {
+        if (!conferenceService.save(conferenceDto, errors)) {
             return CONFERENCE_PAGE;
         }
-        conferenceService.save(conferenceDto);
         return String.format(REDIRECT_TO, CONFERENCES_PAGE);
     }
 
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 8ffeb6f..d3ef2da 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -91,12 +91,26 @@ public class ConferenceService extends BaseService {
         return new ConferenceDto(conferenceRepository.findOne(id));
     }
 
-    public void save(ConferenceDto conferenceDto) throws IOException {
+    public boolean save(ConferenceDto conferenceDto, Errors errors) throws IOException {
+        conferenceDto.setName(conferenceDto.getTitle());
+        filterEmptyDeadlines(conferenceDto);
+        checkEmptyFieldsOfDeadline(conferenceDto, errors);
+        checkUniqueName(conferenceDto,
+                errors,
+                conferenceDto.getId(),
+                "title",
+                "Конференция с таким именем уже существует");
+        if (errors.hasErrors()) {
+            return false;
+        }
+
         if (isEmpty(conferenceDto.getId())) {
             create(conferenceDto);
         } else {
             update(conferenceDto);
         }
+
+        return true;
     }
 
     @Transactional
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index d5906b6..d629d4e 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -30,11 +30,12 @@
                                     <label for="title">Название:</label>
                                     <input class="form-control" th:field="*{title}" id="title" type="text"
                                            placeholder="Название конференции"/>
-                                    <p th:if="${#fields.hasErrors('title')}" th:errors="*{title}"
-                                       class="alert alert-danger">Incorrect title</p>
-                                    <p class="help-block text-danger"></p>
                                 </div>
 
+                                <p th:if="${#fields.hasErrors('title')}" th:errors="*{title}"
+                                   class="alert alert-danger">Incorrect title</p>
+                                <p class="help-block text-danger"></p>
+
                                 <div class="form-group">
                                     <label for="url">URL:</label>
                                     <input class="form-control" th:field="*{url}" id="url" type="text"