parent
5d6df37572
commit
fc06c48456
core/src/main/java/se/su/dsv/scipro
@ -22,12 +22,14 @@ public class ReportServiceImpl extends AbstractServiceImpl<Report, Long> impleme
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public AttachmentReport submit(AttachmentReport report) {
|
public AttachmentReport submit(AttachmentReport report) {
|
||||||
report.submit();
|
report.submit();
|
||||||
return save(report);
|
return save(report);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public void save(AttachmentReport report, Optional<FileUpload> fileUpload) {
|
public void save(AttachmentReport report, Optional<FileUpload> fileUpload) {
|
||||||
storeReportFile(report, fileUpload);
|
storeReportFile(report, fileUpload);
|
||||||
save(report);
|
save(report);
|
||||||
|
@ -49,6 +49,7 @@ public class ReviewerInteractionServiceImpl implements ReviewerInteractionServic
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public ForumPost reply(final Project project, final User user, final String content, final Set<Attachment> attachments) {
|
public ForumPost reply(final Project project, final User user, final String content, final Set<Attachment> attachments) {
|
||||||
ReviewerThread reviewerThread = getReviewerThread(project);
|
ReviewerThread reviewerThread = getReviewerThread(project);
|
||||||
ForumPost reply = forumService.createReply(reviewerThread.getForumThread(), user, content, attachments);
|
ForumPost reply = forumService.createReply(reviewerThread.getForumThread(), user, content, attachments);
|
||||||
|
@ -7,6 +7,7 @@ import com.querydsl.core.types.Predicate;
|
|||||||
import com.querydsl.core.types.dsl.BooleanExpression;
|
import com.querydsl.core.types.dsl.BooleanExpression;
|
||||||
import com.querydsl.core.types.dsl.LiteralExpression;
|
import com.querydsl.core.types.dsl.LiteralExpression;
|
||||||
import com.querydsl.jpa.impl.JPAQuery;
|
import com.querydsl.jpa.impl.JPAQuery;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
import se.su.dsv.scipro.file.FileReference;
|
import se.su.dsv.scipro.file.FileReference;
|
||||||
import se.su.dsv.scipro.file.FileService;
|
import se.su.dsv.scipro.file.FileService;
|
||||||
import se.su.dsv.scipro.file.FileUpload;
|
import se.su.dsv.scipro.file.FileUpload;
|
||||||
@ -92,6 +93,7 @@ public class ReviewingServiceImpl extends AbstractServiceImpl<ReviewerApproval,
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public void reject(final ReviewerApproval reviewerApproval, final String reason, final Optional<FileUpload> feedback) {
|
public void reject(final ReviewerApproval reviewerApproval, final String reason, final Optional<FileUpload> feedback) {
|
||||||
Optional<FileReference> feedbackFile = store(feedback);
|
Optional<FileReference> feedbackFile = store(feedback);
|
||||||
reviewerApproval.reject(reason, feedbackFile);
|
reviewerApproval.reject(reason, feedbackFile);
|
||||||
@ -106,6 +108,7 @@ public class ReviewingServiceImpl extends AbstractServiceImpl<ReviewerApproval,
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public void approve(final ReviewerApproval process, final String reason, final Optional<FileUpload> feedback) {
|
public void approve(final ReviewerApproval process, final String reason, final Optional<FileUpload> feedback) {
|
||||||
Optional<FileReference> feedbackFile = store(feedback);
|
Optional<FileReference> feedbackFile = store(feedback);
|
||||||
process.approve(reason, feedbackFile);
|
process.approve(reason, feedbackFile);
|
||||||
|
@ -3,6 +3,8 @@ package se.su.dsv.scipro.system;
|
|||||||
import jakarta.inject.Inject;
|
import jakarta.inject.Inject;
|
||||||
import jakarta.inject.Provider;
|
import jakarta.inject.Provider;
|
||||||
import jakarta.persistence.EntityManager;
|
import jakarta.persistence.EntityManager;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -13,6 +15,7 @@ public class ResearchAreaServiceImpl extends AbstractServiceImpl<ResearchArea,Lo
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public ResearchArea updateExternalResearchArea(Long identifier, String name, final boolean active) {
|
public ResearchArea updateExternalResearchArea(Long identifier, String name, final boolean active) {
|
||||||
ResearchArea ra = new ResearchArea();
|
ResearchArea ra = new ResearchArea();
|
||||||
if (identifier != null) {
|
if (identifier != null) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user