Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
19
Issues
19
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
1658eedd
Commit
1658eedd
authored
Sep 12, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated Subsets API and ACL
parent
503eda63
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
src/main/java/org/genesys2/server/model/impl/Subset.java
src/main/java/org/genesys2/server/model/impl/Subset.java
+3
-2
src/main/java/org/genesys2/server/service/impl/SubsetServiceImpl.java
...a/org/genesys2/server/service/impl/SubsetServiceImpl.java
+8
-8
src/test/java/org/genesys/test/server/api/v1/SubsetRestControllerTest.java
.../genesys/test/server/api/v1/SubsetRestControllerTest.java
+1
-0
No files found.
src/main/java/org/genesys2/server/model/impl/Subset.java
View file @
1658eedd
...
...
@@ -32,6 +32,7 @@ import javax.persistence.PrePersist;
import
javax.persistence.PreUpdate
;
import
javax.persistence.Table
;
import
org.genesys.blocks.model.JsonViews
;
import
org.genesys.blocks.model.SelfCleaning
;
import
org.genesys.blocks.model.UuidModel
;
import
org.genesys.blocks.security.model.AclAwareModel
;
...
...
@@ -41,6 +42,7 @@ import org.hibernate.annotations.Type;
import
com.fasterxml.jackson.annotation.JsonIdentityReference
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonView
;
// TODO: Auto-generated Javadoc
/**
...
...
@@ -82,8 +84,7 @@ public class Subset extends UuidModel implements AclAwareModel, SelfCleaning {
/** The institute. */
@ManyToOne
(
cascade
=
{},
optional
=
false
)
@JoinColumn
(
name
=
"institute_id"
,
updatable
=
false
)
// @JsonView({ JsonViews.Public.class })
@JsonIgnore
@JsonView
({
JsonViews
.
Public
.
class
})
private
FaoInstitute
institute
;
/** The accessions. */
...
...
src/main/java/org/genesys2/server/service/impl/SubsetServiceImpl.java
View file @
1658eedd
...
...
@@ -23,12 +23,12 @@ import java.util.UUID;
import
java.util.stream.Collectors
;
import
org.genesys.catalog.exceptions.InvalidApiUsageException
;
import
org.genesys.catalog.model.Partner
;
import
org.genesys2.server.exception.NotFoundElement
;
import
org.genesys2.server.model.PublishState
;
import
org.genesys2.server.model.UserRole
;
import
org.genesys2.server.model.genesys.AccessionData
;
import
org.genesys2.server.model.genesys.AccessionId
;
import
org.genesys2.server.model.impl.FaoInstitute
;
import
org.genesys2.server.model.impl.QSubset
;
import
org.genesys2.server.model.impl.Subset
;
import
org.genesys2.server.persistence.AccessionRepository
;
...
...
@@ -92,15 +92,15 @@ public class SubsetServiceImpl implements SubsetService {
@Override
@PreAuthorize
(
"hasRole('ADMINISTRATOR') or isAuthenticated()"
)
public
Page
<
Subset
>
listSubsetsForCurrentUser
(
SubsetFilter
filter
,
Pageable
page
)
{
Pageable
markdownSortPageRequest
=
JPAUtils
.
toMarkdownSort
(
page
,
"title"
);
if
(
securityUtils
.
hasRole
(
UserRole
.
ADMINISTRATOR
))
{
Pageable
markdownSortPageRequest
=
JPAUtils
.
toMarkdownSort
(
page
,
"title"
);
Page
res
=
subsetRepository
.
findAll
(
filter
.
buildQuery
(),
markdownSortPageRequest
);
return
new
PageImpl
<
Subset
>(
res
.
getContent
(),
page
,
res
.
getTotalElements
());
Page
<
Subset
>
res
=
subsetRepository
.
findAll
(
filter
.
buildQuery
(),
markdownSortPageRequest
);
return
new
PageImpl
<>(
res
.
getContent
(),
page
,
res
.
getTotalElements
());
}
else
{
final
HashSet
<
Long
>
partners
=
new
HashSet
<>(
securityUtils
.
listObjectIdentityIdsForCurrentUser
(
Partner
.
class
,
BasePermission
.
WRITE
));
Pageable
markdownSortPageRequest
=
JPAUtils
.
toMarkdownSort
(
page
,
"title"
);
Page
res
=
subsetRepository
.
findAll
(
QSubset
.
subset
.
createdBy
.
in
(
partners
).
and
(
filter
.
buildQuery
()),
markdownSortPageRequest
);
return
new
PageImpl
<
Subset
>(
res
.
getContent
(),
page
,
res
.
getTotalElements
());
final
HashSet
<
Long
>
instituteIds
=
new
HashSet
<>(
securityUtils
.
listObjectIdentityIdsForCurrentUser
(
FaoInstitute
.
class
,
BasePermission
.
WRITE
));
Page
<
Subset
>
res
=
subsetRepository
.
findAll
(
QSubset
.
subset
.
institute
.
id
.
in
(
instituteIds
).
and
(
filter
.
buildQuery
()),
markdownSortPageRequest
);
return
new
PageImpl
<>(
res
.
getContent
(),
page
,
res
.
getTotalElements
());
}
}
...
...
src/test/java/org/genesys/test/server/api/v1/SubsetRestControllerTest.java
View file @
1658eedd
...
...
@@ -184,6 +184,7 @@ public class SubsetRestControllerTest extends AbstractApiTest {
storedSubset
.
getAccessionIds
().
add
(
accessionId
);
assertThat
(
storedSubset
.
getAccessionIds
().
size
(),
is
(
1
));
storedSubset
.
getInstitute
().
setSettings
(
null
);
final
String
s
=
verboseMapper
.
writeValueAsString
(
storedSubset
);
/*@formatter:off*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment