romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

#109 only one conference for paper

Browse Source
This commit is contained in:
Семенова Мария 2019-05-07 21:35:50 +04:00
parent dffd839905
commit 1e07c5424d
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/ru/ulstu/paper/model/Paper.java
View File

@ -3,6 +3,7 @@ package ru.ulstu.paper.model;
import org.hibernate.annotations.Fetch; import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import org.hibernate.validator.constraints.NotBlank; import org.hibernate.validator.constraints.NotBlank;
import ru.ulstu.conference.model.Conference;
import ru.ulstu.core.model.BaseEntity; import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.core.model.UserContainer; import ru.ulstu.core.model.UserContainer;
import ru.ulstu.deadline.model.Deadline; import ru.ulstu.deadline.model.Deadline;
@ -114,6 +115,9 @@ public class Paper extends BaseEntity implements UserContainer {
@Column(name = "latex_text") @Column(name = "latex_text")
private String latexText; private String latexText;
@ManyToMany(mappedBy = "papers")
private List<Conference> conferences;
public PaperStatus getStatus() { public PaperStatus getStatus() {
return status; return status;
} }
@ -218,6 +222,14 @@ public class Paper extends BaseEntity implements UserContainer {
this.latexText = latexText; this.latexText = latexText;
} }
public List<Conference> getConferences() {
return conferences;
}
public void setConferences(List<Conference> conferences) {
this.conferences = conferences;
}
@Override @Override
public Set<User> getUsers() { public Set<User> getUsers() {
return getAuthors(); return getAuthors();

4
src/main/java/ru/ulstu/paper/repository/PaperRepository.java
View File

@ -20,4 +20,8 @@ public interface PaperRepository extends JpaRepository<Paper, Integer> {
List<Paper> findByTypeAndStatus(Paper.PaperType type, Paper.PaperStatus status); List<Paper> findByTypeAndStatus(Paper.PaperType type, Paper.PaperStatus status);
List<Paper> findByStatusNot(Paper.PaperStatus status); List<Paper> findByStatusNot(Paper.PaperStatus status);
List<Paper> findByConferencesIsNullAndStatusNot(Paper.PaperStatus status);
List<Paper> findByIdNotInAndConferencesIsNullAndStatusNot(List<Integer> paperIds, Paper.PaperStatus status);
} }

4
src/main/java/ru/ulstu/paper/service/PaperService.java
View File

@ -242,9 +242,9 @@ public class PaperService {
public List<Paper> findAllNotSelect(List<Integer> paperIds) { public List<Paper> findAllNotSelect(List<Integer> paperIds) {
if (!paperIds.isEmpty()) { if (!paperIds.isEmpty()) {
return sortPapers(paperRepository.findByIdNotIn(paperIds)); return sortPapers(paperRepository.findByIdNotInAndConferencesIsNullAndStatusNot(paperIds, COMPLETED));
} else { } else {
return sortPapers(paperRepository.findAll()); return sortPapers(paperRepository.findByConferencesIsNullAndStatusNot(COMPLETED));
} }
} }