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

#38 add variable "files"

Browse Source
merge-requests/81/head
T-Midnight 5 years ago
parent a352f561fa
commit 2ebd61016d
3 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File

19
src/main/java/ru/ulstu/grant/model/Grant.java
Unescape Escape View File

@ -1,5 +1,7 @@
package ru.ulstu.grant.model;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
import org.hibernate.validator.constraints.NotBlank;
import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.core.model.UserContainer;
@ -66,10 +68,11 @@ public class Grant extends BaseEntity implements UserContainer {
private String comment;
//Заявка на грант
@ManyToOne
@JoinColumn(name = "file_id")
private FileData application;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@JoinColumn(name = "grant_id", unique = true)
@Fetch(FetchMode.SUBSELECT)
private List<FileData> files = new ArrayList<>();
@ManyToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "project_id")
@ -113,12 +116,12 @@ public class Grant extends BaseEntity implements UserContainer {
this.comment = comment;
}
public FileData getApplication() {
return application;
public List<FileData> getFiles() {
return files;
}
public void setApplication(FileData application) {
this.application = application;
public void setFiles(List<FileData> files) {
this.files = files;
}
public String getTitle() {

25
src/main/java/ru/ulstu/grant/model/GrantDto.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
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.project.model.ProjectDto;
import ru.ulstu.user.model.UserDto;
@ -25,7 +26,7 @@ public class GrantDto {
private Grant.GrantStatus status;
private List<Deadline> deadlines = new ArrayList<>();
private String comment;
private String applicationFileName;
private List<FileDataDto> files = new ArrayList<>();
private ProjectDto project;
private Set<Integer> authorIds;
private Set<UserDto> authors;
@ -47,6 +48,7 @@ public class GrantDto {
@JsonProperty("status") Grant.GrantStatus status,
@JsonProperty("deadlines") List<Deadline> deadlines,
@JsonProperty("comment") String comment,
@JsonProperty("files") List<FileDataDto> files,
@JsonProperty("project") ProjectDto project,
@JsonProperty("authorIds") Set<Integer> authorIds,
@JsonProperty("authors") Set<UserDto> authors,
@ -61,8 +63,9 @@ public class GrantDto {
this.status = status;
this.deadlines = deadlines;
this.comment = comment;
this.applicationFileName = null;
this.files = files;
this.project = project;
this.authorIds = authorIds;
this.authors = authors;
this.leaderId = leaderId;
this.wasLeader = wasLeader;
@ -78,8 +81,8 @@ public class GrantDto {
this.status = grant.getStatus();
this.deadlines = grant.getDeadlines();
this.comment = grant.getComment();
this.files = convert(grant.getFiles(), FileDataDto::new);
this.project = grant.getProject() == null ? null : new ProjectDto(grant.getProject());
this.applicationFileName = grant.getApplication() == null ? null : grant.getApplication().getName();
this.authorIds = convert(grant.getAuthors(), user -> user.getId());
this.authors = convert(grant.getAuthors(), UserDto::new);
this.leaderId = grant.getLeader().getId();
@ -130,20 +133,20 @@ public class GrantDto {
this.comment = comment;
}
public ProjectDto getProject() {
return project;
public List<FileDataDto> getFiles() {
return files;
}
public void setProject(ProjectDto project) {
this.project = project;
public void setFiles(List<FileDataDto> files) {
this.files = files;
}
public String getApplicationFileName() {
return applicationFileName;
public ProjectDto getProject() {
return project;
}
public void setApplicationFileName(String applicationFileName) {
this.applicationFileName = applicationFileName;
public void setProject(ProjectDto project) {
this.project = project;
}
public Set<Integer> getAuthorIds() {

26
src/main/java/ru/ulstu/grant/service/GrantService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.deadline.service.DeadlineService;
import ru.ulstu.file.model.FileDataDto;
import ru.ulstu.file.service.FileService;
import ru.ulstu.grant.model.Grant;
import ru.ulstu.grant.model.GrantDto;
@ -21,8 +22,8 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import static java.util.stream.Collectors.toList;
import static org.springframework.util.ObjectUtils.isEmpty;
import static ru.ulstu.core.util.StreamApiUtils.convert;
import static ru.ulstu.grant.model.Grant.GrantStatus.APPLICATION;
@ -81,9 +82,10 @@ public class GrantService {
grant.setProject(projectService.findById(grantDto.getProject().getId()));
}
grant.setDeadlines(deadlineService.saveOrCreate(grantDto.getDeadlines()));
if (grantDto.getApplicationFileName() != null) {
grant.setApplication(fileService.createFileFromTmp(grantDto.getApplicationFileName()));
}
grant.setFiles(fileService.saveOrCreate(grantDto.getFiles().stream()
.filter(f -> !f.isDeleted())
.collect(toList())));
grant.getAuthors().clear();
if (grantDto.getAuthorIds() != null && !grantDto.getAuthorIds().isEmpty()) {
grantDto.getAuthorIds().forEach(authorIds -> grant.getAuthors().add(userService.findById(authorIds)));
@ -106,8 +108,11 @@ public class GrantService {
@Transactional
public Integer update(GrantDto grantDto) throws IOException {
Grant grant = grantRepository.findOne(grantDto.getId());
if (grantDto.getApplicationFileName() != null && grant.getApplication() != null) {
fileService.deleteFile(grant.getApplication());
for (FileDataDto file : grantDto.getFiles().stream()
.filter(f -> f.isDeleted() && f.getId() != null)
.collect(toList())) {
fileService.delete(file.getId());
}
grantDto.getRemovedDeadlineIds().forEach(deadlineService::remove);
grantRepository.save(copyFromDto(grant, grantDto));
@ -117,9 +122,6 @@ public class GrantService {
@Transactional
public void delete(Integer grantId) throws IOException {
Grant grant = grantRepository.findOne(grantId);
if (grant.getApplication() != null) {
fileService.deleteFile(grant.getApplication());
}
grantRepository.delete(grant);
}
@ -156,7 +158,7 @@ public class GrantService {
filteredUsers = filteredUsers
.stream()
.filter(getCompletedGrantLeaders()::contains)
.collect(Collectors.toList());
.collect(toList());
}
return filteredUsers;
}
@ -165,12 +167,11 @@ public class GrantService {
return grantRepository.findByStatus(Grant.GrantStatus.COMPLETED)
.stream()
.map(Grant::getLeader)
.collect(Collectors.toList());
.collect(toList());
}
public List<Paper> getGrantPapers(List<Integer> paperIds) {
return paperService.findAllSelect(paperIds);
}
public List<Paper> getAllPapers() {
@ -192,5 +193,4 @@ public class GrantService {
}
grantDto.getDeadlines().remove((int) deadlineId);
}
}

Write Preview
Loading…
Cancel
Save