Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LabraCORE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
LabraCORE
Merge requests
!225
Deploy
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Deploy
development
into
master
Overview
1
Commits
3
Pipelines
11
Changes
2
Merged
Deploy
Ruben Backx
requested to merge
development
into
master
Dec 22, 2023
Overview
1
Commits
3
Pipelines
11
Changes
2
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
dc571898
3 commits,
Dec 22, 2023
2 files
+
18
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
src/main/java/nl/tudelft/labracore/controller/SubmissionController.java
+
17
−
0
View file @ dc571898
Edit in single-file editor
Open in Web IDE
Show full file
@@ -17,6 +17,7 @@
*/
package
nl.tudelft.labracore.controller
;
import
java.util.Comparator
;
import
java.util.List
;
import
java.util.Set
;
@@ -25,14 +26,17 @@ import javax.transaction.Transactional;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Page
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
nl.tudelft.labracore.dto.create.SubmissionCreateDTO
;
import
nl.tudelft.labracore.dto.helper.LCPageable
;
import
nl.tudelft.labracore.dto.view.structured.details.SubmissionDetailsDTO
;
import
nl.tudelft.labracore.dto.view.structured.details.SubmissionMemberDetailsDTO
;
import
nl.tudelft.labracore.repository.SubmissionRepository
;
import
nl.tudelft.labracore.service.SubmissionService
;
import
nl.tudelft.librador.Util.PageUtil
;
import
nl.tudelft.librador.dto.view.View
;
@Transactional
@@ -134,6 +138,19 @@ public class SubmissionController {
SubmissionDetailsDTO
.
class
);
}
@GetMapping
(
"by-assignment-filtered/{assignmentId}/paged"
)
@PreAuthorize
(
"hasAuthority('SUBMISSION_READ')"
)
public
Page
<
SubmissionDetailsDTO
>
getSubmissionsByAssignmentFilteredPaged
(
@PathVariable
Long
assignmentId
,
@RequestParam
String
query
,
@RequestParam
Boolean
isLatest
,
LCPageable
pageable
)
{
var
filteredAssignments
=
View
.
convert
(
sr
.
findByAssignmentIdFiltered
(
assignmentId
,
query
,
isLatest
),
SubmissionDetailsDTO
.
class
);
return
PageUtil
.
toPage
(
pageable
.
toPageable
(),
filteredAssignments
,
Comparator
.
comparing
(
SubmissionDetailsDTO:
:
getId
));
}
/**
* Gets the list of Submissions for the given group and assignment.
*
Loading