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
fc39e540
Commit
fc39e540
authored
Nov 19, 2018
by
Viacheslav Pavlov
Committed by
Matija Obreza
Nov 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added clearing aclChache after update, now removing institutes from partner also updates partner
parent
c05bdcd9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
6 deletions
+14
-6
src/main/java/org/genesys/catalog/service/PartnerService.java
...main/java/org/genesys/catalog/service/PartnerService.java
+1
-1
src/main/java/org/genesys/catalog/service/impl/PartnerServiceImpl.java
.../org/genesys/catalog/service/impl/PartnerServiceImpl.java
+10
-2
src/main/java/org/genesys2/server/api/v1/PartnerController.java
...in/java/org/genesys2/server/api/v1/PartnerController.java
+3
-3
No files found.
src/main/java/org/genesys/catalog/service/PartnerService.java
View file @
fc39e540
...
...
@@ -110,7 +110,7 @@ public interface PartnerService {
Partner
addInstitutes
(
Partner
partner
,
Set
<
String
>
instituteCodes
);
boolean
removeInstitutes
(
Set
<
String
>
instituteCodes
);
Partner
removeInstitutes
(
UUID
partnerUUID
,
Set
<
String
>
instituteCodes
);
/**
* Method for copy values of source to target.
...
...
src/main/java/org/genesys/catalog/service/impl/PartnerServiceImpl.java
View file @
fc39e540
...
...
@@ -23,6 +23,7 @@ import java.util.Set;
import
java.util.HashSet
;
import
java.util.UUID
;
import
org.genesys.blocks.security.service.CustomAclService
;
import
org.genesys.catalog.model.Partner
;
import
org.genesys.catalog.model.filters.PartnerFilter
;
import
org.genesys.catalog.persistence.PartnerRepository
;
...
...
@@ -68,6 +69,9 @@ public class PartnerServiceImpl implements PartnerService, InitializingBean {
@Autowired
private
SecurityUtils
securityUtils
;
@Autowired
private
CustomAclService
aclService
;
@Value
(
"${partner.primary.uuid}"
)
private
UUID
primaryPartnerUuid
;
...
...
@@ -179,6 +183,7 @@ public class PartnerServiceImpl implements PartnerService, InitializingBean {
List
<
FaoInstitute
>
institutes
=
instituteRepository
.
findAllByCodes
(
instituteCodes
);
institutes
.
forEach
((
inst
)
->
inst
.
setOwner
(
partner
));
institutes
.
forEach
((
institute
->
aclService
.
createOrUpdatePermissions
(
institute
)));
partner
.
getInstitutes
().
addAll
(
institutes
);
return
lazyLoad
(
partnerRepository
.
save
(
partner
));
...
...
@@ -186,13 +191,16 @@ public class PartnerServiceImpl implements PartnerService, InitializingBean {
@Override
@Transactional
public
boolean
removeInstitutes
(
Set
<
String
>
instituteCodes
)
{
public
Partner
removeInstitutes
(
UUID
partnerUuid
,
Set
<
String
>
instituteCodes
)
{
Partner
partner
=
loadPartner
(
partnerUuid
);
List
<
FaoInstitute
>
institutesToRemove
=
instituteRepository
.
findAllByCodes
(
instituteCodes
);
institutesToRemove
.
forEach
((
institute
->
institute
.
setOwner
(
null
)));
institutesToRemove
.
forEach
((
institute
->
aclService
.
createOrUpdatePermissions
(
institute
)));
instituteRepository
.
save
(
institutesToRemove
);
return
true
;
partner
.
getInstitutes
().
removeAll
(
institutesToRemove
);
return
lazyLoad
(
partnerRepository
.
save
(
partner
));
}
/**
...
...
src/main/java/org/genesys2/server/api/v1/PartnerController.java
View file @
fc39e540
...
...
@@ -120,9 +120,9 @@ public class PartnerController {
}
@PreAuthorize
(
"hasRole('ADMINISTRATOR')"
)
@PostMapping
(
value
=
"/removeInstitutes"
)
public
String
removeInstitutes
(
@RequestBody
Set
<
String
>
instituteCodes
)
{
return
partnerService
.
removeInstitutes
(
instituteCodes
)
?
"Ok"
:
"Error"
;
@PostMapping
(
value
=
"/removeInstitutes
/{UUID}
"
)
public
Partner
removeInstitutes
(
@PathVariable
(
"UUID"
)
UUID
uuid
,
@RequestBody
Set
<
String
>
instituteCodes
)
{
return
partnerService
.
removeInstitutes
(
uuid
,
instituteCodes
)
;
}
/**
...
...
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