From e1907d316920f1e00ec15a72a2cfdd55665f238c Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Sun, 12 May 2019 15:28:47 +0400
Subject: [PATCH] #121 change Paper to PaperDto in attaching papers

---
 .../ru/ulstu/grant/controller/GrantController.java |  5 ++---
 src/main/java/ru/ulstu/grant/model/Grant.java      |  1 -
 src/main/java/ru/ulstu/grant/model/GrantDto.java   | 14 +++++++-------
 .../java/ru/ulstu/paper/service/PaperService.java  |  8 ++++----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/controller/GrantController.java b/src/main/java/ru/ulstu/grant/controller/GrantController.java
index b28f8c0..ad5e992 100644
--- a/src/main/java/ru/ulstu/grant/controller/GrantController.java
+++ b/src/main/java/ru/ulstu/grant/controller/GrantController.java
@@ -13,7 +13,7 @@ import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.service.GrantService;
-import ru.ulstu.paper.model.Paper;
+import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.user.model.User;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -104,7 +104,6 @@ public class GrantController {
         return GRANT_PAGE;
     }
 
-
     @PostMapping(value = "/grant", params = "createProject")
     public String createProject(@Valid GrantDto grantDto, Errors errors) throws IOException {
         if (errors.hasErrors()) {
@@ -131,7 +130,7 @@ public class GrantController {
     }
 
     @ModelAttribute("allPapers")
-    public List<Paper> getAllPapers() {
+    public List<PaperDto> getAllPapers() {
         return grantService.getAllUncompletedPapers();
     }
 
diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java
index 760895e..e0cd9be 100644
--- a/src/main/java/ru/ulstu/grant/model/Grant.java
+++ b/src/main/java/ru/ulstu/grant/model/Grant.java
@@ -74,7 +74,6 @@ public class Grant extends BaseEntity implements UserContainer {
     @Fetch(FetchMode.SUBSELECT)
     private List<FileData> files = new ArrayList<>();
 
-
     @ManyToOne(cascade = CascadeType.ALL)
     @JoinColumn(name = "project_id")
     private Project project;
diff --git a/src/main/java/ru/ulstu/grant/model/GrantDto.java b/src/main/java/ru/ulstu/grant/model/GrantDto.java
index e842b10..203d306 100644
--- a/src/main/java/ru/ulstu/grant/model/GrantDto.java
+++ b/src/main/java/ru/ulstu/grant/model/GrantDto.java
@@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.NotEmpty;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileDataDto;
-import ru.ulstu.paper.model.Paper;
+import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.user.model.UserDto;
 
@@ -37,7 +37,7 @@ public class GrantDto {
     private boolean hasBAKPapers;
     private boolean hasScopusPapers;
     private List<Integer> paperIds = new ArrayList<>();
-    private List<Paper> papers = new ArrayList<>();
+    private List<PaperDto> papers = new ArrayList<>();
     private List<Integer> removedDeadlineIds = new ArrayList<>();
 
     public GrantDto() {
@@ -54,12 +54,12 @@ public class GrantDto {
                     @JsonProperty("project") ProjectDto project,
                     @JsonProperty("authorIds") Set<Integer> authorIds,
                     @JsonProperty("authors") Set<UserDto> authors,
-                    @JsonProperty("leader") Integer leaderId,
+                    @JsonProperty("leaderId") Integer leaderId,
                     @JsonProperty("wasLeader") boolean wasLeader,
                     @JsonProperty("hasAge") boolean hasAge,
                     @JsonProperty("hasDegree") boolean hasDegree,
                     @JsonProperty("paperIds") List<Integer> paperIds,
-                    @JsonProperty("papers") List<Paper> papers) {
+                    @JsonProperty("papers") List<PaperDto> papers) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -92,7 +92,7 @@ public class GrantDto {
         this.hasAge = false;
         this.hasDegree = false;
         this.paperIds = convert(grant.getPapers(), paper -> paper.getId());
-        this.papers = grant.getPapers();
+        this.papers = convert(grant.getPapers(), PaperDto::new);
     }
 
     public Integer getId() {
@@ -214,11 +214,11 @@ public class GrantDto {
         this.paperIds = paperIds;
     }
 
-    public List<Paper> getPapers() {
+    public List<PaperDto> getPapers() {
         return papers;
     }
 
-    public void setPapers(List<Paper> papers) {
+    public void setPapers(List<PaperDto> papers) {
         this.papers = papers;
     }
 
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 0083de7..db810f5 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -248,12 +248,12 @@ public class PaperService {
         }
     }
 
-    public List<Paper> findAllNotCompleted() {
-        return paperRepository.findByStatusNot(COMPLETED);
+    public List<PaperDto> findAllNotCompleted() {
+        return convert(paperRepository.findByStatusNot(COMPLETED), PaperDto::new);
     }
 
-    public List<Paper> findAllSelect(List<Integer> paperIds) {
-        return sortPapers(paperRepository.findAllByIdIn(paperIds));
+    public List<PaperDto> findAllSelect(List<Integer> paperIds) {
+        return convert(paperRepository.findAllByIdIn(paperIds), PaperDto::new);
     }
 
     public List<User> getPaperAuthors() {