#33 url in paper

src/main/java/ru/ulstu/paper/model/Paper.java

@@ -9,26 +9,8 @@ import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
 import ru.ulstu.user.model.User;
 
-import javax.persistence.CascadeType;
+import javax.persistence.*;
-import javax.persistence.Column;
+import java.util.*;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
 
 @Entity
 public class Paper extends BaseEntity implements UserContainer {
@@ -75,6 +57,8 @@ public class Paper extends BaseEntity implements UserContainer {
 
     private String comment;
 
+    private String url;
+
     private Boolean locked = false;
 
     @ManyToOne
@@ -156,6 +140,14 @@ public class Paper extends BaseEntity implements UserContainer {
         this.authors = authors;
     }
 
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
     @Override
     public Set<User> getUsers() {
         return getAuthors();

src/main/java/ru/ulstu/paper/model/PaperDto.java

@@ -29,6 +29,7 @@ public class PaperDto {
     @NotEmpty
     private List<Deadline> deadlines = new ArrayList<>();
     private String comment;
+    private String url;
     private Boolean locked;
     private String tmpFileName;
     private Integer fileId;
@@ -50,6 +51,7 @@ public class PaperDto {
                     @JsonProperty("updateDate") Date updateDate,
                     @JsonProperty("deadlines") List<Deadline> deadlines,
                     @JsonProperty("comment") String comment,
+                    @JsonProperty("url") String url,
                     @JsonProperty("locked") Boolean locked,
                     @JsonProperty("tmpFileName") String tmpFileName,
                     @JsonProperty("authorIds") Set<Integer> authorIds,
@@ -61,6 +63,7 @@ public class PaperDto {
         this.updateDate = updateDate;
         this.deadlines = deadlines;
         this.comment = comment;
+        this.url = url;
         this.locked = locked;
         this.tmpFileName = tmpFileName;
         this.fileId = null;
@@ -77,6 +80,7 @@ public class PaperDto {
         this.updateDate = paper.getUpdateDate();
         this.deadlines = paper.getDeadlines();
         this.comment = paper.getComment();
+        this.url = paper.getUrl();
         this.locked = paper.getLocked();
         this.tmpFileName = null;
         this.fileId = paper.getFileData() == null ? null : paper.getFileData().getId();
@@ -198,6 +202,14 @@ public class PaperDto {
         this.authorIds = authorIds;
     }
 
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
     public String getAuthorsString() {
         return StringUtils.abbreviate(authors
                 .stream()

src/main/java/ru/ulstu/paper/service/PaperService.java

@@ -14,20 +14,12 @@ import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.*;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
-import static ru.ulstu.paper.model.Paper.PaperStatus.ATTENTION;
+import static ru.ulstu.paper.model.Paper.PaperStatus.*;
-import static ru.ulstu.paper.model.Paper.PaperStatus.COMPLETED;
-import static ru.ulstu.paper.model.Paper.PaperStatus.DRAFT;
-import static ru.ulstu.paper.model.Paper.PaperStatus.FAILED;
-import static ru.ulstu.paper.model.Paper.PaperStatus.ON_PREPARATION;
 
 @Service
 public class PaperService {
@@ -82,6 +74,7 @@ public class PaperService {
 
     private Paper copyFromDto(Paper paper, PaperDto paperDto) throws IOException {
         paper.setComment(paperDto.getComment());
+        paper.setUrl(paperDto.getUrl());
         paper.setCreateDate(paper.getCreateDate() == null ? new Date() : paper.getCreateDate());
         paper.setLocked(paperDto.getLocked());
         paper.setStatus(paperDto.getStatus() == null ? DRAFT : paperDto.getStatus());

src/main/resources/db/changelog-20190318_000001-schema.xml

@@ -0,0 +1,10 @@
+<?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="masha" id="20190319_000001-1">
+        <addColumn tableName="paper">
+            <column name="url" type="varchar(255)"></column>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-master.xml

@@ -18,5 +18,6 @@
     <include file="db/changelog-20181111_000000-schema.xml"/>
     <include file="db/changelog-20181208_000000-schema.xml"/>
     <include file="db/changelog-20181224_000000-schema.xml"/>
+    <include file="db/changelog-20190318_000001-schema.xml"/>
     <include file="db/common/changelog-20190312_130000-schema.xml"/>
 </databaseChangeLog>

src/main/resources/templates/papers/fragments/paperDashboardFragment.html

@@ -10,7 +10,13 @@
             <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status})"/>
         </div>
         <div class="col col-10 text-right">
+            <p th:if="${paper.url!=null and paper.url!=''}"><a th:href="${paper.url}"><i
+                    class="fa fa-external-link fa-2x"
+                    aria-hidden="true"></i></a></p>
+            <p th:unless="${paper.url!=null and paper.url!=''}"><i class="fa fa-fw fa-2x" aria-hidden="true"></i></p>
+            <a th:href="'paper?id='+${paper.id}">
                 <h7 class="service-heading" th:text="${paper.title}"> title</h7>
+            </a>
             <p class="text-muted" th:text="${paper.authorsString}">authors</p>
         </div>
     </div>

src/main/resources/templates/papers/paper.html

@@ -50,6 +50,13 @@
                                               th:field="*{comment}"></textarea>
                                 </div>
 
+                                <div class="form-group">
+                                    <label for="title">Ссылка на сайт конференции:</label>
+                                    <input class="form-control" id="url" type="text"
+                                           placeholder="Url"
+                                           th:field="*{url}"/>
+                                </div>
+
                                 <div class="form-group">
                                     <label>Дедлайны:</label>
                                     <div class="row" th:each="deadline, rowStat : *{deadlines}">