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
13
Issues
13
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
3ba95e70
Commit
3ba95e70
authored
Nov 18, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added call to list accessible Descriptors (published + owned)
parent
2f32b0d4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
0 deletions
+46
-0
src/main/java/org/genesys/catalog/service/DescriptorService.java
...n/java/org/genesys/catalog/service/DescriptorService.java
+11
-0
src/main/java/org/genesys/catalog/service/impl/DescriptorServiceImpl.java
...g/genesys/catalog/service/impl/DescriptorServiceImpl.java
+13
-0
src/main/java/org/genesys2/server/api/v1/DescriptorController.java
...java/org/genesys2/server/api/v1/DescriptorController.java
+22
-0
No files found.
src/main/java/org/genesys/catalog/service/DescriptorService.java
View file @
3ba95e70
...
...
@@ -95,6 +95,16 @@ public interface DescriptorService {
*/
Page
<
Descriptor
>
listDescriptorsForCurrentUser
(
DescriptorFilter
filter
,
Pageable
page
);
/**
* List descriptors accessible to the user (both published by others and owned descriptors).
*
* @param filter the filter
* @param page the page
* @return the page
*/
Page
<
Descriptor
>
listAccessibleDescriptors
(
DescriptorFilter
filter
,
Pageable
page
);
/**
* List published descriptors.
*
...
...
@@ -180,4 +190,5 @@ public interface DescriptorService {
* @return the number of published descriptors
*/
long
countDescriptors
(
DescriptorFilter
filter
);
}
src/main/java/org/genesys/catalog/service/impl/DescriptorServiceImpl.java
View file @
3ba95e70
...
...
@@ -236,6 +236,19 @@ public class DescriptorServiceImpl implements DescriptorService {
return
new
PageImpl
<>(
res
.
getContent
(),
page
,
res
.
getTotalElements
());
}
}
@Override
@PreAuthorize
(
"isAuthenticated()"
)
public
Page
<
Descriptor
>
listAccessibleDescriptors
(
DescriptorFilter
descriptorFilter
,
Pageable
page
)
{
if
(
securityUtils
.
hasRole
(
UserRole
.
ADMINISTRATOR
))
{
return
listDescriptorsForCurrentUser
(
descriptorFilter
,
page
);
}
else
{
final
HashSet
<
Long
>
partners
=
new
HashSet
<>(
securityUtils
.
listObjectIdentityIdsForCurrentUser
(
Partner
.
class
,
BasePermission
.
WRITE
));
Pageable
markdownSortPageRequest
=
JPAUtils
.
toMarkdownSort
(
page
,
"title"
);
Page
<
Descriptor
>
res
=
descriptorRepository
.
findAll
(
QDescriptor
.
descriptor
.
state
.
in
(
PublishState
.
PUBLISHED
).
or
(
descriptor
.
owner
.
id
.
in
(
partners
)).
and
(
descriptorFilter
.
buildQuery
()),
markdownSortPageRequest
);
return
new
PageImpl
<>(
res
.
getContent
(),
page
,
res
.
getTotalElements
());
}
}
/**
* {@inheritDoc}
...
...
src/main/java/org/genesys2/server/api/v1/DescriptorController.java
View file @
3ba95e70
...
...
@@ -245,6 +245,28 @@ public class DescriptorController extends ApiBaseController {
return
new
FilteredPage
<>(
filterInfo
.
filterCode
,
filterInfo
.
filter
,
descriptorService
.
listDescriptors
(
filterInfo
.
filter
,
page
.
toPageRequest
(
100
,
Sort
.
Direction
.
ASC
,
"id"
)));
}
/**
* List descriptors accessible to user
*
* @param page the page
* @param filter the descriptor filter
* @return the page
* @throws IOException
*/
@PostMapping
(
value
=
"/list-accessible"
)
public
FilteredPage
<
Descriptor
>
listAccessibleDescriptors
(
@RequestParam
(
name
=
"f"
,
required
=
false
)
String
filterCode
,
final
Pagination
page
,
@RequestBody
(
required
=
false
)
DescriptorFilter
filter
)
throws
IOException
{
if
(
filterCode
!=
null
)
{
filter
=
shortFilterService
.
filterByCode
(
filterCode
,
DescriptorFilter
.
class
);
}
else
{
filterCode
=
shortFilterService
.
getCode
(
filter
);
}
FilterInfo
<
DescriptorFilter
>
filterInfo
=
shortFilterService
.
processFilter
(
filterCode
,
filter
,
DescriptorFilter
.
class
);
return
new
FilteredPage
<>(
filterInfo
.
filterCode
,
filterInfo
.
filter
,
descriptorService
.
listAccessibleDescriptors
(
filterInfo
.
filter
,
page
.
toPageRequest
(
100
,
Sort
.
Direction
.
ASC
,
"id"
)));
}
/**
* My descriptors.
*
...
...
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