Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Portal
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
Portal
Merge requests
!34
Remove blocked role from person page
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Remove blocked role from person page
remove-blocked-role-from-person-page
into
development
Overview
0
Commits
1
Pipelines
5
Changes
2
Merged
Remove blocked role from person page
Ruben Backx
requested to merge
remove-blocked-role-from-person-page
into
development
Aug 23, 2021
Overview
0
Commits
1
Pipelines
5
Changes
2
0
0
Merge request reports
Compare
development
version 1
754e2e9e
Aug 23, 2021
development (base)
and
latest version
latest version
dee5c2f5
1 commit,
Aug 23, 2021
version 1
754e2e9e
1 commit,
Aug 23, 2021
2 files
+
25
−
6
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
src/main/java/nl/tudelft/portal/controller/PersonController.java
+
22
−
3
View file @ dee5c2f5
Edit in single-file editor
Open in Web IDE
Show full file
@@ -17,11 +17,14 @@
*/
package
nl.tudelft.portal.controller
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
nl.tudelft.labracore.api.EditionControllerApi
;
import
nl.tudelft.labracore.api.PersonControllerApi
;
import
nl.tudelft.labracore.api.dto.PersonPatchDTO
;
import
nl.tudelft.labracore.api.dto.PersonSummaryDTO
;
import
nl.tudelft.labracore.api.dto.*
;
import
nl.tudelft.labracore.lib.security.user.AuthenticatedPerson
;
import
nl.tudelft.labracore.lib.security.user.Person
;
@@ -37,6 +40,8 @@ public class PersonController {
@Autowired
private
PersonControllerApi
personApi
;
@Autowired
private
EditionControllerApi
editionApi
;
/**
* Gets the currently authenticated person.
@@ -58,7 +63,21 @@ public class PersonController {
@GetMapping
(
"{id}"
)
@PreAuthorize
(
"@authorisationService.hasPersonAccess(#id)"
)
public
String
getPerson
(
@PathVariable
Long
id
,
Model
model
)
{
model
.
addAttribute
(
"person"
,
personApi
.
getPersonById
(
id
).
block
());
PersonDetailsDTO
person
=
personApi
.
getPersonById
(
id
).
block
();
List
<
RoleEditionLayer1DTO
>
roles
=
person
.
getRoles
().
stream
()
.
filter
(
r
->
r
.
getType
()
!=
RoleEditionLayer1DTO
.
TypeEnum
.
BLOCKED
)
.
collect
(
Collectors
.
toList
());
List
<
EditionDetailsDTO
>
editions
=
roles
.
isEmpty
()
?
Collections
.
emptyList
()
:
editionApi
.
getEditionsById
(
roles
.
stream
().
map
(
e
->
e
.
getEdition
().
getId
()).
collect
(
Collectors
.
toList
()))
.
collectList
().
block
();
Map
<
Long
,
CourseSummaryDTO
>
courseMap
=
editions
.
stream
()
.
collect
(
Collectors
.
toMap
(
EditionDetailsDTO:
:
getId
,
EditionDetailsDTO:
:
getCourse
));
model
.
addAttribute
(
"person"
,
person
);
model
.
addAttribute
(
"roles"
,
roles
);
model
.
addAttribute
(
"courses"
,
courseMap
);
return
"person/view"
;
}
Loading