From 14c28050c7bb6d357b3e2cd2b4c0ef58e6ac8832 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Wed, 17 Apr 2019 11:19:23 +0400
Subject: [PATCH 1/8] #65 changed interface

---
 .../templates/conferences/conference.html     | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index 27c602a..6d22273 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -97,30 +97,15 @@
                                 <div class="form-group">
                                     <label for="members">Участники:</label>
                                     <div class="member-list form-control list-group" id="members">
-                                        <div class="member d-flex list-group-item justify-content-between  p-1">
-                                            <div class="member-name">
-                                                Пользователь 1
-                                            </div>
-                                            <div class="member-participation">
+                                        <div class="member d-flex list-group-item justify-content-between p-1">
+                                            <input class="member-name" readonly="true"/>
+                                            <select class="member-participation">
                                                 очная
-                                            </div>
-                                            <div class="member-deposit">
+                                            </select>
+                                            <select class="member-deposit">
                                                 статья
-                                            </div>
+                                            </select>
                                         </div>
-
-                                        <div class="member d-flex list-group-item justify-content-between  p-1">
-                                            <div class="member-name">
-                                                Пользователь 1
-                                            </div>
-                                            <div class="member-participation">
-                                                очная
-                                            </div>
-                                            <div class="member-deposit">
-                                                доклад
-                                            </div>
-                                        </div>
-
                                     </div>
                                 </div>
 

From 8564f2cf3462ee4d1c45450cc0fc9fdc402994af Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Wed, 17 Apr 2019 13:00:48 +0400
Subject: [PATCH 2/8] #69 managed to create a connection through a new entity

---
 .../ru/ulstu/conference/model/Conference.java |  8 +++---
 .../ulstu/conference/model/ConferenceDto.java | 14 ++++------
 .../ru/ulstu/user/model/UserConference.java   | 28 +++++++++++++++++++
 .../db/changelog-20190417_000000-schema.xml   | 14 ++++++++++
 src/main/resources/db/changelog-master.xml    |  1 +
 5 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/user/model/UserConference.java
 create mode 100644 src/main/resources/db/changelog-20190417_000000-schema.xml

diff --git a/src/main/java/ru/ulstu/conference/model/Conference.java b/src/main/java/ru/ulstu/conference/model/Conference.java
index b6affcd..c9cf20e 100644
--- a/src/main/java/ru/ulstu/conference/model/Conference.java
+++ b/src/main/java/ru/ulstu/conference/model/Conference.java
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
-import ru.ulstu.user.model.User;
+import ru.ulstu.user.model.UserConference;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -66,7 +66,7 @@ public class Conference extends BaseEntity {
     @JoinTable(name = "users_conference",
             joinColumns = {@JoinColumn(name = "conference_id")},
             inverseJoinColumns = {@JoinColumn(name = "users_id")})
-    private Set<User> users = new HashSet<>();
+    private Set<UserConference> users = new HashSet<>();
 
     public String getTitle() {
         return title;
@@ -132,11 +132,11 @@ public class Conference extends BaseEntity {
         this.papers = papers;
     }
 
-    public Set<User> getUsers() {
+    public Set<UserConference> getUsers() {
         return users;
     }
 
-    public void setUsers(Set<User> users) {
+    public void setUsers(Set<UserConference> users) {
         this.users = users;
     }
 }
diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
index ec9ec92..279b13f 100644
--- a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
+++ b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
@@ -6,7 +6,7 @@ import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
-import ru.ulstu.user.model.UserDto;
+import ru.ulstu.user.model.UserConference;
 
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -41,10 +41,8 @@ public class ConferenceDto {
     private Set<Integer> userIds = new HashSet<>();
     private List<Integer> paperIds = new ArrayList<>();
     private List<Paper> papers = new ArrayList<>();
-
-
     private List<Paper> notSelectedPapers = new ArrayList<>();
-    private Set<UserDto> users = new HashSet<>();
+    private Set<UserConference> users = new HashSet<>();
     private Integer filterUserId;
 
     public ConferenceDto() {
@@ -61,7 +59,7 @@ public class ConferenceDto {
                          @JsonProperty("deadlines") List<Deadline> deadlines,
                          @JsonProperty("userIds") Set<Integer> userIds,
                          @JsonProperty("paperIds") List<Integer> paperIds,
-                         @JsonProperty("users") Set<UserDto> users,
+                         @JsonProperty("users") Set<UserConference> users,
                          @JsonProperty("papers") List<Paper> papers,
                          @JsonProperty("notSelectedPapers") List<Paper> notSelectedPapers) {
         this.id = id;
@@ -90,7 +88,7 @@ public class ConferenceDto {
         this.deadlines = conference.getDeadlines();
         this.userIds = convert(conference.getUsers(), user -> user.getId());
         this.paperIds = convert(conference.getPapers(), paper -> paper.getId());
-        this.users = convert(conference.getUsers(), UserDto::new);
+        this.users = conference.getUsers();
         this.papers = conference.getPapers();
 
     }
@@ -183,11 +181,11 @@ public class ConferenceDto {
         this.papers = papers;
     }
 
-    public Set<UserDto> getUsers() {
+    public Set<UserConference> getUsers() {
         return users;
     }
 
-    public void setUsers(Set<UserDto> users) {
+    public void setUsers(Set<UserConference> users) {
         this.users = users;
     }
 
diff --git a/src/main/java/ru/ulstu/user/model/UserConference.java b/src/main/java/ru/ulstu/user/model/UserConference.java
new file mode 100644
index 0000000..5ae1b12
--- /dev/null
+++ b/src/main/java/ru/ulstu/user/model/UserConference.java
@@ -0,0 +1,28 @@
+package ru.ulstu.user.model;
+
+import ru.ulstu.core.model.BaseEntity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+@Entity
+@Table(name = "users_conference")
+public class UserConference extends BaseEntity {
+
+    @NotNull
+    @Column(name = "participation", nullable = false)
+    private String participation;
+
+    @NotNull
+    @Column(name = "deposit", nullable = false)
+    private String deposit;
+
+    @ManyToOne(optional = false)
+    @JoinColumn(name = "users_id")
+    private User user;
+
+}
diff --git a/src/main/resources/db/changelog-20190417_000000-schema.xml b/src/main/resources/db/changelog-20190417_000000-schema.xml
new file mode 100644
index 0000000..f0a0d64
--- /dev/null
+++ b/src/main/resources/db/changelog-20190417_000000-schema.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="vova" id="20190417_000000-1">
+        <addColumn tableName="users_conference">
+            <column name="id" type="integer"></column>
+            <column name="version" type="integer"></column>
+        </addColumn>
+        <addPrimaryKey columnNames="id" constraintName="pk_users_conference" tableName="users_conference"/>
+        <modifyDataType tableName="users_conference" columnName="participation" newDataType="varchar(255)"/>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 67d3c40..58bbdeb 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -24,5 +24,6 @@
     <include file="db/changelog-20190331_000000-schema.xml"/>
     <include file="db/changelog-20190331_000010-schema.xml"/>
     <include file="db/changelog-20190410_000000-schema.xml"/>
+    <include file="db/changelog-20190417_000000-schema.xml"/>
     <include file="db/common/changelog-20190312_130000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file

From 7e4d8d491845e70885e184e02ea6acf514bb2670 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Wed, 17 Apr 2019 14:51:19 +0400
Subject: [PATCH 3/8] #69 added method take part in conference

---
 .../controller/ConferenceController.java      |  9 ++++
 .../ru/ulstu/conference/model/Conference.java |  9 ++--
 .../ulstu/conference/model/ConferenceDto.java | 18 ++++---
 .../repository/ConferenceUserRepository.java  |  7 +++
 .../conference/service/ConferenceService.java | 17 ++++++-
 .../service/ConferenceUserService.java        | 48 +++++++++++++++++++
 .../ru/ulstu/user/model/UserConference.java   | 47 ++++++++++++++++++
 .../templates/conferences/conference.html     | 25 ++++++----
 8 files changed, 154 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/conference/repository/ConferenceUserRepository.java
 create mode 100644 src/main/java/ru/ulstu/conference/service/ConferenceUserService.java

diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
index 823f853..c25009a 100644
--- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
+++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
@@ -104,6 +104,15 @@ public class ConferenceController {
         return CONFERENCE_PAGE;
     }
 
+    @PostMapping(value = "/conference", params = "takePart")
+    public String takePart(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
+        if (errors.hasErrors()) {
+            return CONFERENCE_PAGE;
+        }
+        conferenceService.takePart(conferenceDto);
+        return CONFERENCE_PAGE;
+    }
+
     public List<Paper> getNotSelectPapers(List<Integer> paperIds) {
         return conferenceService.getConferencePapers(paperIds);
     }
diff --git a/src/main/java/ru/ulstu/conference/model/Conference.java b/src/main/java/ru/ulstu/conference/model/Conference.java
index c9cf20e..bd1d907 100644
--- a/src/main/java/ru/ulstu/conference/model/Conference.java
+++ b/src/main/java/ru/ulstu/conference/model/Conference.java
@@ -23,9 +23,7 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 @Entity
 @Table(name = "conference")
@@ -66,7 +64,8 @@ public class Conference extends BaseEntity {
     @JoinTable(name = "users_conference",
             joinColumns = {@JoinColumn(name = "conference_id")},
             inverseJoinColumns = {@JoinColumn(name = "users_id")})
-    private Set<UserConference> users = new HashSet<>();
+    @Fetch(FetchMode.SUBSELECT)
+    private List<UserConference> users = new ArrayList<>();
 
     public String getTitle() {
         return title;
@@ -132,11 +131,11 @@ public class Conference extends BaseEntity {
         this.papers = papers;
     }
 
-    public Set<UserConference> getUsers() {
+    public List<UserConference> getUsers() {
         return users;
     }
 
-    public void setUsers(Set<UserConference> users) {
+    public void setUsers(List<UserConference> users) {
         this.users = users;
     }
 }
diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
index 279b13f..c45cd05 100644
--- a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
+++ b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
@@ -13,9 +13,7 @@ import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
@@ -38,11 +36,11 @@ public class ConferenceDto {
     private Date endDate = new Date();
     private List<Deadline> deadlines = new ArrayList<>();
     private List<Integer> removedDeadlineIds = new ArrayList<>();
-    private Set<Integer> userIds = new HashSet<>();
+    private List<Integer> userIds = new ArrayList<>();
     private List<Integer> paperIds = new ArrayList<>();
     private List<Paper> papers = new ArrayList<>();
     private List<Paper> notSelectedPapers = new ArrayList<>();
-    private Set<UserConference> users = new HashSet<>();
+    private List<UserConference> users = new ArrayList<>();
     private Integer filterUserId;
 
     public ConferenceDto() {
@@ -57,9 +55,9 @@ public class ConferenceDto {
                          @JsonProperty("beginDate") Date beginDate,
                          @JsonProperty("endDate") Date endDate,
                          @JsonProperty("deadlines") List<Deadline> deadlines,
-                         @JsonProperty("userIds") Set<Integer> userIds,
+                         @JsonProperty("userIds") List<Integer> userIds,
                          @JsonProperty("paperIds") List<Integer> paperIds,
-                         @JsonProperty("users") Set<UserConference> users,
+                         @JsonProperty("users") List<UserConference> users,
                          @JsonProperty("papers") List<Paper> papers,
                          @JsonProperty("notSelectedPapers") List<Paper> notSelectedPapers) {
         this.id = id;
@@ -157,11 +155,11 @@ public class ConferenceDto {
         this.deadlines = deadlines;
     }
 
-    public Set<Integer> getUserIds() {
+    public List<Integer> getUserIds() {
         return userIds;
     }
 
-    public void setUserIds(Set<Integer> userIds) {
+    public void setUserIds(List<Integer> userIds) {
         this.userIds = userIds;
     }
 
@@ -181,11 +179,11 @@ public class ConferenceDto {
         this.papers = papers;
     }
 
-    public Set<UserConference> getUsers() {
+    public List<UserConference> getUsers() {
         return users;
     }
 
-    public void setUsers(Set<UserConference> users) {
+    public void setUsers(List<UserConference> users) {
         this.users = users;
     }
 
diff --git a/src/main/java/ru/ulstu/conference/repository/ConferenceUserRepository.java b/src/main/java/ru/ulstu/conference/repository/ConferenceUserRepository.java
new file mode 100644
index 0000000..0eb546c
--- /dev/null
+++ b/src/main/java/ru/ulstu/conference/repository/ConferenceUserRepository.java
@@ -0,0 +1,7 @@
+package ru.ulstu.conference.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.user.model.UserConference;
+
+public interface ConferenceUserRepository extends JpaRepository<UserConference, Integer> {
+}
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 4d267d1..58e8da8 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -9,6 +9,8 @@ import ru.ulstu.conference.repository.ConferenceRepository;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.service.PaperService;
+import ru.ulstu.user.model.UserConference;
+import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
 import java.util.List;
@@ -21,17 +23,24 @@ public class ConferenceService {
     private final static int MAX_DISPLAY_SIZE = 40;
 
     private final ConferenceRepository conferenceRepository;
+    private final ConferenceUserService conferenceUserService;
     private final DeadlineService deadlineService;
     private final PaperService paperService;
+    private final UserService userService;
 
     public ConferenceService(ConferenceRepository conferenceRepository,
+                             ConferenceUserService conferenceUserService,
                              DeadlineService deadlineService,
-                             PaperService paperService) {
+                             PaperService paperService,
+                             UserService userService) {
         this.conferenceRepository = conferenceRepository;
+        this.conferenceUserService = conferenceUserService;
         this.deadlineService = deadlineService;
         this.paperService = paperService;
+        this.userService = userService;
     }
 
+
     public List<Conference> findAll() {
         return conferenceRepository.findAll();
     }
@@ -88,6 +97,10 @@ public class ConferenceService {
         conferenceDto.getNotSelectedPapers().add(removedPaper);
     }
 
+    public void takePart(ConferenceDto conferenceDto) throws IOException {
+        conferenceDto.getUsers().add(new UserConference("test", "test", userService.getCurrentUser()));
+    }
+
     public List<Paper> getConferencePapers(List<Integer> paperIds) {
         return paperService.findAllNotSelect(paperIds);
     }
@@ -101,6 +114,8 @@ public class ConferenceService {
         conference.setEndDate(conferenceDto.getEndDate());
         conference.setPapers(conferenceDto.getPapers());
         conference.setDeadlines(deadlineService.saveOrCreate(conferenceDto.getDeadlines()));
+        conferenceDto.getUsers().forEach(user -> userService.findById(user.getUser().getId()));
+        conference.setUsers(conferenceUserService.saveOrCreate(conferenceDto.getUsers()));
         if (conferenceDto.getPaperIds() != null && !conferenceDto.getPaperIds().isEmpty()) {
             conferenceDto.getPaperIds().forEach(paperId ->
                     conference.getPapers().add(paperService.findEntityById(paperId)));
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
new file mode 100644
index 0000000..e05491e
--- /dev/null
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
@@ -0,0 +1,48 @@
+package ru.ulstu.conference.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ru.ulstu.conference.repository.ConferenceUserRepository;
+import ru.ulstu.user.model.UserConference;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class ConferenceUserService {
+
+    private final ConferenceUserRepository conferenceUserRepository;
+
+    public ConferenceUserService(ConferenceUserRepository conferenceUserRepository) {
+        this.conferenceUserRepository = conferenceUserRepository;
+    }
+
+    public List<UserConference> saveOrCreate(List<UserConference> users) {
+        return users
+                .stream()
+                .map(user -> {
+                    return user.getId() != null ? update(user) : create(user);
+                }).collect(Collectors.toList());
+    }
+
+    @Transactional
+    public UserConference update(UserConference user) {
+        UserConference updateUser = conferenceUserRepository.findOne(user.getId());
+        updateUser.setDeposit(user.getDeposit());
+        updateUser.setParticipation(user.getParticipation());
+        conferenceUserRepository.save(updateUser);
+        return updateUser;
+    }
+
+    @Transactional
+    public UserConference create(UserConference user) {
+        UserConference newUser = new UserConference();
+        newUser.setDeposit(user.getDeposit());
+        newUser.setParticipation(user.getParticipation());
+        newUser.setUser(user.getUser());
+        newUser = conferenceUserRepository.save(newUser);
+        return newUser;
+    }
+
+
+}
diff --git a/src/main/java/ru/ulstu/user/model/UserConference.java b/src/main/java/ru/ulstu/user/model/UserConference.java
index 5ae1b12..9afef4c 100644
--- a/src/main/java/ru/ulstu/user/model/UserConference.java
+++ b/src/main/java/ru/ulstu/user/model/UserConference.java
@@ -1,5 +1,7 @@
 package ru.ulstu.user.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import ru.ulstu.core.model.BaseEntity;
 
 import javax.persistence.Column;
@@ -25,4 +27,49 @@ public class UserConference extends BaseEntity {
     @JoinColumn(name = "users_id")
     private User user;
 
+    public UserConference() {
+    }
+
+    public UserConference(String participation, String deposit, User user) {
+        this.participation = participation;
+        this.deposit = deposit;
+        this.user = user;
+    }
+
+    @JsonCreator
+    public UserConference(@JsonProperty("id") Integer id,
+                          @JsonProperty("participation") String participation,
+                          @JsonProperty("deposit") String deposit,
+                          @JsonProperty("user") User user) {
+        this.setId(id);
+        this.participation = participation;
+        this.deposit = deposit;
+        this.user = user;
+    }
+
+
+    public String getParticipation() {
+        return participation;
+    }
+
+    public void setParticipation(String participation) {
+        this.participation = participation;
+    }
+
+    public String getDeposit() {
+        return deposit;
+    }
+
+    public void setDeposit(String deposit) {
+        this.deposit = deposit;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
 }
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index 6d22273..35a6926 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -97,23 +97,28 @@
                                 <div class="form-group">
                                     <label for="members">Участники:</label>
                                     <div class="member-list form-control list-group" id="members">
-                                        <div class="member d-flex list-group-item justify-content-between p-1">
-                                            <input class="member-name" readonly="true"/>
-                                            <select class="member-participation">
-                                                очная
+                                        <input th:type="hidden" th:value="*{users}"/>
+                                        <div class="member d-flex list-group-item justify-content-between p-1"
+                                             th:each="user, rowStat : *{users}">
+                                            <input type="hidden" th:field="*{users[__${rowStat.index}__].id}"/>
+                                            <input type="hidden" th:field="*{users[__${rowStat.index}__].user.id}"/>
+                                            <input class="member-name" readonly="true"
+                                                   th:field="*{users[__${rowStat.index}__].user.lastName}"/>
+                                            <select class="member-participation"
+                                                    th:field="*{users[__${rowStat.index}__].participation}">
+
                                             </select>
-                                            <select class="member-deposit">
-                                                статья
+                                            <select class="member-deposit"
+                                                    th:field="*{users[__${rowStat.index}__].deposit}">
+
                                             </select>
                                         </div>
                                     </div>
                                 </div>
 
                                 <div class="form-group d-flex justify-content-end">
-                                    <button id="take-part" class="btn btn-primary"
-                                            type="button">
-                                        Принять участие
-                                    </button>
+                                    <input id="take-part" class="btn btn-primary"
+                                           type="submit" name="takePart" value="Принять участие"/>
                                 </div>
 
                                 <div class="form-group">

From 918079ac890188e3a0f60217bf9053f5bee5b0ae Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Thu, 18 Apr 2019 11:20:44 +0400
Subject: [PATCH 4/8] #69 fixed not working code, now user can take part in
 conference and choose participation and deposit

---
 .../controller/ConferenceController.java      |  12 ++
 .../ru/ulstu/conference/model/Conference.java |  13 +--
 .../ulstu/conference/model/ConferenceDto.java |   9 +-
 .../conference/model/ConferenceUser.java      | 110 ++++++++++++++++++
 .../repository/ConferenceUserRepository.java  |   4 +-
 .../conference/service/ConferenceService.java |  14 ++-
 .../service/ConferenceUserService.java        |  12 +-
 .../ru/ulstu/user/model/UserConference.java   |  75 ------------
 .../templates/conferences/conference.html     |  12 +-
 9 files changed, 159 insertions(+), 102 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/conference/model/ConferenceUser.java
 delete mode 100644 src/main/java/ru/ulstu/user/model/UserConference.java

diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
index c25009a..b88a0e6 100644
--- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
+++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
@@ -5,12 +5,14 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.Errors;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.conference.model.ConferenceDto;
 import ru.ulstu.conference.model.ConferenceFilterDto;
+import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.service.ConferenceService;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
@@ -117,6 +119,16 @@ public class ConferenceController {
         return conferenceService.getConferencePapers(paperIds);
     }
 
+    @ModelAttribute("allParticipation")
+    public List<ConferenceUser.Participation> getAllParticipation() {
+        return conferenceService.getAllParticipations();
+    }
+
+    @ModelAttribute("allDeposit")
+    public List<ConferenceUser.Deposit> getAllDeposit() {
+        return conferenceService.getAllDeposit();
+    }
+
     private void filterEmptyDeadlines(ConferenceDto conferenceDto) {
         conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
diff --git a/src/main/java/ru/ulstu/conference/model/Conference.java b/src/main/java/ru/ulstu/conference/model/Conference.java
index bd1d907..e252e4d 100644
--- a/src/main/java/ru/ulstu/conference/model/Conference.java
+++ b/src/main/java/ru/ulstu/conference/model/Conference.java
@@ -7,7 +7,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
-import ru.ulstu.user.model.UserConference;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -60,12 +59,10 @@ public class Conference extends BaseEntity {
             inverseJoinColumns = {@JoinColumn(name = "paper_id")})
     private List<Paper> papers = new ArrayList<>();
 
-    @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "users_conference",
-            joinColumns = {@JoinColumn(name = "conference_id")},
-            inverseJoinColumns = {@JoinColumn(name = "users_id")})
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinColumn(name = "conference_id", unique = true)
     @Fetch(FetchMode.SUBSELECT)
-    private List<UserConference> users = new ArrayList<>();
+    private List<ConferenceUser> users = new ArrayList<>();
 
     public String getTitle() {
         return title;
@@ -131,11 +128,11 @@ public class Conference extends BaseEntity {
         this.papers = papers;
     }
 
-    public List<UserConference> getUsers() {
+    public List<ConferenceUser> getUsers() {
         return users;
     }
 
-    public void setUsers(List<UserConference> users) {
+    public void setUsers(List<ConferenceUser> users) {
         this.users = users;
     }
 }
diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
index c45cd05..b18e914 100644
--- a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
+++ b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
@@ -6,7 +6,6 @@ import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
-import ru.ulstu.user.model.UserConference;
 
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -40,7 +39,7 @@ public class ConferenceDto {
     private List<Integer> paperIds = new ArrayList<>();
     private List<Paper> papers = new ArrayList<>();
     private List<Paper> notSelectedPapers = new ArrayList<>();
-    private List<UserConference> users = new ArrayList<>();
+    private List<ConferenceUser> users = new ArrayList<>();
     private Integer filterUserId;
 
     public ConferenceDto() {
@@ -57,7 +56,7 @@ public class ConferenceDto {
                          @JsonProperty("deadlines") List<Deadline> deadlines,
                          @JsonProperty("userIds") List<Integer> userIds,
                          @JsonProperty("paperIds") List<Integer> paperIds,
-                         @JsonProperty("users") List<UserConference> users,
+                         @JsonProperty("users") List<ConferenceUser> users,
                          @JsonProperty("papers") List<Paper> papers,
                          @JsonProperty("notSelectedPapers") List<Paper> notSelectedPapers) {
         this.id = id;
@@ -179,11 +178,11 @@ public class ConferenceDto {
         this.papers = papers;
     }
 
-    public List<UserConference> getUsers() {
+    public List<ConferenceUser> getUsers() {
         return users;
     }
 
-    public void setUsers(List<UserConference> users) {
+    public void setUsers(List<ConferenceUser> users) {
         this.users = users;
     }
 
diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceUser.java b/src/main/java/ru/ulstu/conference/model/ConferenceUser.java
new file mode 100644
index 0000000..63eeb6d
--- /dev/null
+++ b/src/main/java/ru/ulstu/conference/model/ConferenceUser.java
@@ -0,0 +1,110 @@
+package ru.ulstu.conference.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.user.model.User;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+@Entity
+@Table(name = "users_conference")
+public class ConferenceUser extends BaseEntity {
+
+    public enum Participation {
+        INTRAMURAL("Очная"),
+        EXTRAMURAL("Заочная");
+
+        private String participationName;
+
+        Participation(String name) {
+            this.participationName = name;
+        }
+
+        public String getParticipation() {
+            return participationName;
+        }
+    }
+
+    public enum Deposit {
+        ARTICLE("Статья"),
+        REPORT("Доклад"),
+        PRESENTATION("Презентация");
+
+        private String depositName;
+
+        Deposit(String name) {
+            this.depositName = name;
+        }
+
+        public String getDeposit() {
+            return depositName;
+        }
+    }
+
+
+    @NotNull
+    @Column(name = "participation", nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Participation participation = Participation.INTRAMURAL;
+
+    @NotNull
+    @Column(name = "deposit", nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Deposit deposit = Deposit.ARTICLE;
+
+    @ManyToOne(optional = false)
+    @JoinColumn(name = "users_id")
+    private User user;
+
+    public ConferenceUser() {
+    }
+
+    public ConferenceUser(User user) {
+        this.user = user;
+    }
+
+    @JsonCreator
+    public ConferenceUser(@JsonProperty("id") Integer id,
+                          @JsonProperty("deposit") Participation participation,
+                          @JsonProperty("deposit") Deposit deposit,
+                          @JsonProperty("user") User user) {
+        this.setId(id);
+        this.participation = participation;
+        this.deposit = deposit;
+        this.user = user;
+    }
+
+
+    public Participation getParticipation() {
+        return participation;
+    }
+
+    public void setParticipation(Participation participation) {
+        this.participation = participation;
+    }
+
+    public Deposit getDeposit() {
+        return deposit;
+    }
+
+    public void setDeposit(Deposit deposit) {
+        this.deposit = deposit;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+}
diff --git a/src/main/java/ru/ulstu/conference/repository/ConferenceUserRepository.java b/src/main/java/ru/ulstu/conference/repository/ConferenceUserRepository.java
index 0eb546c..5e654d5 100644
--- a/src/main/java/ru/ulstu/conference/repository/ConferenceUserRepository.java
+++ b/src/main/java/ru/ulstu/conference/repository/ConferenceUserRepository.java
@@ -1,7 +1,7 @@
 package ru.ulstu.conference.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import ru.ulstu.user.model.UserConference;
+import ru.ulstu.conference.model.ConferenceUser;
 
-public interface ConferenceUserRepository extends JpaRepository<UserConference, Integer> {
+public interface ConferenceUserRepository extends JpaRepository<ConferenceUser, Integer> {
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 58e8da8..f9e662e 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -5,14 +5,15 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.conference.model.ConferenceDto;
+import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.repository.ConferenceRepository;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.service.PaperService;
-import ru.ulstu.user.model.UserConference;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -98,13 +99,21 @@ public class ConferenceService {
     }
 
     public void takePart(ConferenceDto conferenceDto) throws IOException {
-        conferenceDto.getUsers().add(new UserConference("test", "test", userService.getCurrentUser()));
+        conferenceDto.getUsers().add(new ConferenceUser(userService.getCurrentUser()));
     }
 
     public List<Paper> getConferencePapers(List<Integer> paperIds) {
         return paperService.findAllNotSelect(paperIds);
     }
 
+    public List<ConferenceUser.Participation> getAllParticipations() {
+        return Arrays.asList(ConferenceUser.Participation.values());
+    }
+
+    public List<ConferenceUser.Deposit> getAllDeposit() {
+        return Arrays.asList(ConferenceUser.Deposit.values());
+    }
+
     private Conference copyFromDto(Conference conference, ConferenceDto conferenceDto) throws IOException {
         conference.setTitle(conferenceDto.getTitle());
         conference.setDescription(conferenceDto.getDescription());
@@ -114,7 +123,6 @@ public class ConferenceService {
         conference.setEndDate(conferenceDto.getEndDate());
         conference.setPapers(conferenceDto.getPapers());
         conference.setDeadlines(deadlineService.saveOrCreate(conferenceDto.getDeadlines()));
-        conferenceDto.getUsers().forEach(user -> userService.findById(user.getUser().getId()));
         conference.setUsers(conferenceUserService.saveOrCreate(conferenceDto.getUsers()));
         if (conferenceDto.getPaperIds() != null && !conferenceDto.getPaperIds().isEmpty()) {
             conferenceDto.getPaperIds().forEach(paperId ->
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
index e05491e..f771b2a 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
@@ -2,8 +2,8 @@ package ru.ulstu.conference.service;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.repository.ConferenceUserRepository;
-import ru.ulstu.user.model.UserConference;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -17,7 +17,7 @@ public class ConferenceUserService {
         this.conferenceUserRepository = conferenceUserRepository;
     }
 
-    public List<UserConference> saveOrCreate(List<UserConference> users) {
+    public List<ConferenceUser> saveOrCreate(List<ConferenceUser> users) {
         return users
                 .stream()
                 .map(user -> {
@@ -26,8 +26,8 @@ public class ConferenceUserService {
     }
 
     @Transactional
-    public UserConference update(UserConference user) {
-        UserConference updateUser = conferenceUserRepository.findOne(user.getId());
+    public ConferenceUser update(ConferenceUser user) {
+        ConferenceUser updateUser = conferenceUserRepository.findOne(user.getId());
         updateUser.setDeposit(user.getDeposit());
         updateUser.setParticipation(user.getParticipation());
         conferenceUserRepository.save(updateUser);
@@ -35,8 +35,8 @@ public class ConferenceUserService {
     }
 
     @Transactional
-    public UserConference create(UserConference user) {
-        UserConference newUser = new UserConference();
+    public ConferenceUser create(ConferenceUser user) {
+        ConferenceUser newUser = new ConferenceUser();
         newUser.setDeposit(user.getDeposit());
         newUser.setParticipation(user.getParticipation());
         newUser.setUser(user.getUser());
diff --git a/src/main/java/ru/ulstu/user/model/UserConference.java b/src/main/java/ru/ulstu/user/model/UserConference.java
deleted file mode 100644
index 9afef4c..0000000
--- a/src/main/java/ru/ulstu/user/model/UserConference.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package ru.ulstu.user.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import ru.ulstu.core.model.BaseEntity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-@Entity
-@Table(name = "users_conference")
-public class UserConference extends BaseEntity {
-
-    @NotNull
-    @Column(name = "participation", nullable = false)
-    private String participation;
-
-    @NotNull
-    @Column(name = "deposit", nullable = false)
-    private String deposit;
-
-    @ManyToOne(optional = false)
-    @JoinColumn(name = "users_id")
-    private User user;
-
-    public UserConference() {
-    }
-
-    public UserConference(String participation, String deposit, User user) {
-        this.participation = participation;
-        this.deposit = deposit;
-        this.user = user;
-    }
-
-    @JsonCreator
-    public UserConference(@JsonProperty("id") Integer id,
-                          @JsonProperty("participation") String participation,
-                          @JsonProperty("deposit") String deposit,
-                          @JsonProperty("user") User user) {
-        this.setId(id);
-        this.participation = participation;
-        this.deposit = deposit;
-        this.user = user;
-    }
-
-
-    public String getParticipation() {
-        return participation;
-    }
-
-    public void setParticipation(String participation) {
-        this.participation = participation;
-    }
-
-    public String getDeposit() {
-        return deposit;
-    }
-
-    public void setDeposit(String deposit) {
-        this.deposit = deposit;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-}
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index 35a6926..a1d7049 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -97,20 +97,26 @@
                                 <div class="form-group">
                                     <label for="members">Участники:</label>
                                     <div class="member-list form-control list-group" id="members">
-                                        <input th:type="hidden" th:value="*{users}"/>
+                                        <!--<input th:type="hidden" th:value="*{users}"/>-->
                                         <div class="member d-flex list-group-item justify-content-between p-1"
                                              th:each="user, rowStat : *{users}">
                                             <input type="hidden" th:field="*{users[__${rowStat.index}__].id}"/>
-                                            <input type="hidden" th:field="*{users[__${rowStat.index}__].user.id}"/>
+                                            <input type="hidden" th:field="*{users[__${rowStat.index}__].user}"/>
                                             <input class="member-name" readonly="true"
                                                    th:field="*{users[__${rowStat.index}__].user.lastName}"/>
                                             <select class="member-participation"
                                                     th:field="*{users[__${rowStat.index}__].participation}">
+                                                <option th:each="participation : ${allParticipation}"
+                                                        th:value="${participation}"
+                                                        th:text="${participation.participation}">Participation
+                                                </option>
 
                                             </select>
                                             <select class="member-deposit"
                                                     th:field="*{users[__${rowStat.index}__].deposit}">
-
+                                                <option th:each="deposit : ${allDeposit}" th:value="${deposit}"
+                                                        th:text="${deposit.deposit}">Deposit
+                                                </option>
                                             </select>
                                         </div>
                                     </div>

From 8fd352aaa4263f7d4c02ec41badb30b8891632a4 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Thu, 18 Apr 2019 14:33:49 +0400
Subject: [PATCH 5/8] #69 added styles

---
 src/main/resources/public/css/conference.css  | 27 +++++++++++++++++++
 .../templates/conferences/conference.html     |  9 +++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css
index fa3666e..a608bbd 100644
--- a/src/main/resources/public/css/conference.css
+++ b/src/main/resources/public/css/conference.css
@@ -43,7 +43,34 @@ body {
 
 .member {
     margin: 0;
+    height: 40px;
+    max-height: 40px;
 }
+.member select {
+    appearance: none;
+    -moz-appearance: none;
+    -webkit-appearance: none;
+    border: none;
+    outline: none;
+    padding: 0.5rem 1.75em 0.5rem 0.5em;
+    display: inline-block;
+    background: transparent url("https://cdn3.iconfinder.com/data/icons/faticons/32/arrow-down-01-16.png") no-repeat right 7px center;
+
+}
+
+.member select:nth-child(4) {
+    border-right: 1px solid #ced4da;
+}
+
+
+.member-name {
+    padding: .75rem 1.25rem;
+    cursor: default;
+    outline: none;
+    border: none;
+    border-right: 1px solid #ced4da;
+}
+
 
 .paper-list {
     height: 200px;
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index a1d7049..5c33ba0 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -97,14 +97,13 @@
                                 <div class="form-group">
                                     <label for="members">Участники:</label>
                                     <div class="member-list form-control list-group" id="members">
-                                        <!--<input th:type="hidden" th:value="*{users}"/>-->
-                                        <div class="member d-flex list-group-item justify-content-between p-1"
+                                        <div class="member d-flex list-group-item p-0"
                                              th:each="user, rowStat : *{users}">
                                             <input type="hidden" th:field="*{users[__${rowStat.index}__].id}"/>
                                             <input type="hidden" th:field="*{users[__${rowStat.index}__].user}"/>
-                                            <input class="member-name" readonly="true"
+                                            <input class="member-name w-100" readonly="true"
                                                    th:field="*{users[__${rowStat.index}__].user.lastName}"/>
-                                            <select class="member-participation"
+                                            <select class="member-participation w-auto"
                                                     th:field="*{users[__${rowStat.index}__].participation}">
                                                 <option th:each="participation : ${allParticipation}"
                                                         th:value="${participation}"
@@ -112,7 +111,7 @@
                                                 </option>
 
                                             </select>
-                                            <select class="member-deposit"
+                                            <select class="member-deposit w-auto"
                                                     th:field="*{users[__${rowStat.index}__].deposit}">
                                                 <option th:each="deposit : ${allDeposit}" th:value="${deposit}"
                                                         th:text="${deposit.deposit}">Deposit

From 96431701dfce3ebfe92500510ddfcbf700943a67 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Thu, 18 Apr 2019 15:38:45 +0400
Subject: [PATCH 6/8] #69 added button disabling  take part, if cur user
 already taken part

---
 .../controller/ConferenceController.java          |  5 +++++
 .../ru/ulstu/conference/model/ConferenceDto.java  | 15 ++++++++-------
 .../conference/service/ConferenceService.java     |  9 +++++++++
 src/main/resources/public/css/conference.css      | 10 ++++++++++
 .../templates/conferences/conference.html         |  4 +++-
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
index b88a0e6..dc57bce 100644
--- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
+++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
@@ -51,6 +51,7 @@ public class ConferenceController {
         if (id != null && id > 0) {
             ConferenceDto conferenceDto = conferenceService.findOneDto(id);
             conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds()));
+            conferenceDto.setDisabledTakePart(isCurrentUserParticipant(conferenceDto.getUsers()));
             modelMap.put("conferenceDto", conferenceDto);
         } else {
             ConferenceDto conferenceDto = new ConferenceDto();
@@ -119,6 +120,10 @@ public class ConferenceController {
         return conferenceService.getConferencePapers(paperIds);
     }
 
+    public boolean isCurrentUserParticipant(List<ConferenceUser> conferenceUsers) {
+        return conferenceService.isCurrentUserParticipant(conferenceUsers);
+    }
+
     @ModelAttribute("allParticipation")
     public List<ConferenceUser.Participation> getAllParticipation() {
         return conferenceService.getAllParticipations();
diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
index b18e914..a3f80c9 100644
--- a/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
+++ b/src/main/java/ru/ulstu/conference/model/ConferenceDto.java
@@ -40,7 +40,7 @@ public class ConferenceDto {
     private List<Paper> papers = new ArrayList<>();
     private List<Paper> notSelectedPapers = new ArrayList<>();
     private List<ConferenceUser> users = new ArrayList<>();
-    private Integer filterUserId;
+    private boolean disabledTakePart = false;
 
     public ConferenceDto() {
     }
@@ -58,7 +58,8 @@ public class ConferenceDto {
                          @JsonProperty("paperIds") List<Integer> paperIds,
                          @JsonProperty("users") List<ConferenceUser> users,
                          @JsonProperty("papers") List<Paper> papers,
-                         @JsonProperty("notSelectedPapers") List<Paper> notSelectedPapers) {
+                         @JsonProperty("notSelectedPapers") List<Paper> notSelectedPapers,
+                         @JsonProperty("notSelectedPapers") Boolean disabledTakePart) {
         this.id = id;
         this.title = title;
         this.description = description;
@@ -72,6 +73,7 @@ public class ConferenceDto {
         this.users = users;
         this.papers = papers;
         this.notSelectedPapers = notSelectedPapers;
+        this.disabledTakePart = disabledTakePart;
     }
 
     public ConferenceDto(Conference conference) {
@@ -87,7 +89,6 @@ public class ConferenceDto {
         this.paperIds = convert(conference.getPapers(), paper -> paper.getId());
         this.users = conference.getUsers();
         this.papers = conference.getPapers();
-
     }
 
     public Integer getId() {
@@ -186,12 +187,12 @@ public class ConferenceDto {
         this.users = users;
     }
 
-    public Integer getFilterUserId() {
-        return filterUserId;
+    public boolean isDisabledTakePart() {
+        return disabledTakePart;
     }
 
-    public void setFilterUserId(Integer filterUserId) {
-        this.filterUserId = filterUserId;
+    public void setDisabledTakePart(boolean disabledTakePart) {
+        this.disabledTakePart = disabledTakePart;
     }
 
     public List<Integer> getRemovedDeadlineIds() {
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index f9e662e..a9e3fac 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -100,6 +100,7 @@ public class ConferenceService {
 
     public void takePart(ConferenceDto conferenceDto) throws IOException {
         conferenceDto.getUsers().add(new ConferenceUser(userService.getCurrentUser()));
+        conferenceDto.setDisabledTakePart(true);
     }
 
     public List<Paper> getConferencePapers(List<Integer> paperIds) {
@@ -132,4 +133,12 @@ public class ConferenceService {
     }
 
 
+    public boolean isCurrentUserParticipant(List<ConferenceUser> conferenceUsers) {
+        for (ConferenceUser participant : conferenceUsers) {
+            if (participant.getUser().getId() == userService.getCurrentUser().getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css
index a608bbd..fe19fd0 100644
--- a/src/main/resources/public/css/conference.css
+++ b/src/main/resources/public/css/conference.css
@@ -71,6 +71,16 @@ body {
     border-right: 1px solid #ced4da;
 }
 
+#take-part[disabled=disabled] {
+    background-color: #ced4da;
+    border-color: #c2c5c7;
+}
+
+#take-part[disabled=disabled]:hover {
+    background-color: #737475 !important;
+    border-color: #5d5e5f !important;
+}
+
 
 .paper-list {
     height: 200px;
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index 5c33ba0..478ebcb 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -122,8 +122,10 @@
                                 </div>
 
                                 <div class="form-group d-flex justify-content-end">
+                                    <input type="hidden" th:value="*{disabledTakePart}" th:name="disabledTakePart"/>
                                     <input id="take-part" class="btn btn-primary"
-                                           type="submit" name="takePart" value="Принять участие"/>
+                                           type="submit" name="takePart" value="Принять участие"
+                                           th:disabled="*{disabledTakePart}"/>
                                 </div>
 
                                 <div class="form-group">

From 9edcebb2f571e607db810d55ffe3b00518a0afa3 Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Fri, 19 Apr 2019 14:29:08 +0400
Subject: [PATCH 7/8] #69 changed isCurrentUserParticipant

---
 .../ru/ulstu/conference/service/ConferenceService.java     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index a9e3fac..1bfdebd 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -134,11 +134,6 @@ public class ConferenceService {
 
 
     public boolean isCurrentUserParticipant(List<ConferenceUser> conferenceUsers) {
-        for (ConferenceUser participant : conferenceUsers) {
-            if (participant.getUser().getId() == userService.getCurrentUser().getId()) {
-                return true;
-            }
-        }
-        return false;
+        return conferenceUsers.stream().anyMatch(participant -> participant.getUser().equals(userService.getCurrentUser()));
     }
 }

From b623402aa8f8cdbba6a9317f288fbf0ae79bafdb Mon Sep 17 00:00:00 2001
From: Nightblade73 <v-zar@list.ru>
Date: Fri, 19 Apr 2019 14:39:07 +0400
Subject: [PATCH 8/8] #69 changed method getConference in controller

---
 .../controller/ConferenceController.java      | 19 ++-----------------
 .../conference/service/ConferenceService.java | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
index dc57bce..6867be5 100644
--- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
+++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java
@@ -15,12 +15,10 @@ import ru.ulstu.conference.model.ConferenceFilterDto;
 import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.service.ConferenceService;
 import ru.ulstu.deadline.model.Deadline;
-import ru.ulstu.paper.model.Paper;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -49,14 +47,9 @@ public class ConferenceController {
     @GetMapping("/conference")
     public void getConference(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
         if (id != null && id > 0) {
-            ConferenceDto conferenceDto = conferenceService.findOneDto(id);
-            conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds()));
-            conferenceDto.setDisabledTakePart(isCurrentUserParticipant(conferenceDto.getUsers()));
-            modelMap.put("conferenceDto", conferenceDto);
+            modelMap.put("conferenceDto", conferenceService.getExistConferenceById(id));
         } else {
-            ConferenceDto conferenceDto = new ConferenceDto();
-            conferenceDto.setNotSelectedPapers(getNotSelectPapers(new ArrayList<Integer>()));
-            modelMap.put("conferenceDto", conferenceDto);
+            modelMap.put("conferenceDto", conferenceService.getNewConference());
         }
     }
 
@@ -116,14 +109,6 @@ public class ConferenceController {
         return CONFERENCE_PAGE;
     }
 
-    public List<Paper> getNotSelectPapers(List<Integer> paperIds) {
-        return conferenceService.getConferencePapers(paperIds);
-    }
-
-    public boolean isCurrentUserParticipant(List<ConferenceUser> conferenceUsers) {
-        return conferenceService.isCurrentUserParticipant(conferenceUsers);
-    }
-
     @ModelAttribute("allParticipation")
     public List<ConferenceUser.Participation> getAllParticipation() {
         return conferenceService.getAllParticipations();
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 1bfdebd..6295d5c 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.paper.service.PaperService;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -41,6 +42,19 @@ public class ConferenceService {
         this.userService = userService;
     }
 
+    public ConferenceDto getExistConferenceById(Integer id) {
+        ConferenceDto conferenceDto = findOneDto(id);
+        conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds()));
+        conferenceDto.setDisabledTakePart(isCurrentUserParticipant(conferenceDto.getUsers()));
+        return conferenceDto;
+    }
+
+    public ConferenceDto getNewConference() {
+        ConferenceDto conferenceDto = new ConferenceDto();
+        conferenceDto.setNotSelectedPapers(getNotSelectPapers(new ArrayList<Integer>()));
+        return conferenceDto;
+    }
+
 
     public List<Conference> findAll() {
         return conferenceRepository.findAll();
@@ -103,7 +117,7 @@ public class ConferenceService {
         conferenceDto.setDisabledTakePart(true);
     }
 
-    public List<Paper> getConferencePapers(List<Integer> paperIds) {
+    public List<Paper> getNotSelectPapers(List<Integer> paperIds) {
         return paperService.findAllNotSelect(paperIds);
     }