From 1e07c5424dd0dddeaf1e109d20dc53d488e2b027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=9C?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?= <semenovamasha98@mail.ru>
Date: Tue, 7 May 2019 21:35:50 +0400
Subject: [PATCH] #109 only one conference for paper

---
 src/main/java/ru/ulstu/paper/model/Paper.java        | 12 ++++++++++++
 .../ru/ulstu/paper/repository/PaperRepository.java   |  4 ++++
 .../java/ru/ulstu/paper/service/PaperService.java    |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/paper/model/Paper.java b/src/main/java/ru/ulstu/paper/model/Paper.java
index 65bd32c..eae8764 100644
--- a/src/main/java/ru/ulstu/paper/model/Paper.java
+++ b/src/main/java/ru/ulstu/paper/model/Paper.java
@@ -3,6 +3,7 @@ package ru.ulstu.paper.model;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.validator.constraints.NotBlank;
+import ru.ulstu.conference.model.Conference;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.core.model.UserContainer;
 import ru.ulstu.deadline.model.Deadline;
@@ -114,6 +115,9 @@ public class Paper extends BaseEntity implements UserContainer {
     @Column(name = "latex_text")
     private String latexText;
 
+    @ManyToMany(mappedBy = "papers")
+    private List<Conference> conferences;
+
     public PaperStatus getStatus() {
         return status;
     }
@@ -218,6 +222,14 @@ public class Paper extends BaseEntity implements UserContainer {
         this.latexText = latexText;
     }
 
+    public List<Conference> getConferences() {
+        return conferences;
+    }
+
+    public void setConferences(List<Conference> conferences) {
+        this.conferences = conferences;
+    }
+
     @Override
     public Set<User> getUsers() {
         return getAuthors();
diff --git a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
index 7eff73d..42d3703 100644
--- a/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
+++ b/src/main/java/ru/ulstu/paper/repository/PaperRepository.java
@@ -20,4 +20,8 @@ public interface PaperRepository extends JpaRepository<Paper, Integer> {
     List<Paper> findByTypeAndStatus(Paper.PaperType type, Paper.PaperStatus status);
 
     List<Paper> findByStatusNot(Paper.PaperStatus status);
+
+    List<Paper> findByConferencesIsNullAndStatusNot(Paper.PaperStatus status);
+
+    List<Paper> findByIdNotInAndConferencesIsNullAndStatusNot(List<Integer> paperIds, Paper.PaperStatus status);
 }
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 956b4b6..0083de7 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -242,9 +242,9 @@ public class PaperService {
 
     public List<Paper> findAllNotSelect(List<Integer> paperIds) {
         if (!paperIds.isEmpty()) {
-            return sortPapers(paperRepository.findByIdNotIn(paperIds));
+            return sortPapers(paperRepository.findByIdNotInAndConferencesIsNullAndStatusNot(paperIds, COMPLETED));
         } else {
-            return sortPapers(paperRepository.findAll());
+            return sortPapers(paperRepository.findByConferencesIsNullAndStatusNot(COMPLETED));
         }
     }