Revision 59763
Added by Konstantinos Triantafyllou over 3 years ago
| RegistryService.java | ||
|---|---|---|
| 90 | 90 |
@POST |
| 91 | 91 |
@Produces(MediaType.APPLICATION_JSON) |
| 92 | 92 |
@Consumes(MediaType.APPLICATION_JSON) |
| 93 |
@PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN)")
|
|
| 93 |
@PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN, @AuthorizationService.PORTAL_ADMIN)")
|
|
| 94 | 94 |
public Response createRole(@RequestBody Role role) {
|
| 95 | 95 |
calls.createRole(role); |
| 96 | 96 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse("Role has been created").toString()).type(MediaType.APPLICATION_JSON).build();
|
| ... | ... | |
| 407 | 407 |
Integer coPersonId = calls.getCoPersonIdByEmail(email); |
| 408 | 408 |
if (coPersonId != null) {
|
| 409 | 409 |
Integer couId = calls.getCouId(type, id); |
| 410 |
Integer role = calls.getRoleId(coPersonId, couId); |
|
| 410 |
Integer role = null; |
|
| 411 |
if(couId != null) {
|
|
| 412 |
role = calls.getRoleId(coPersonId, couId); |
|
| 413 |
} |
|
| 411 | 414 |
if (couId != null && role != null) {
|
| 412 | 415 |
calls.removeAdminRole(coPersonId, couId); |
| 413 | 416 |
calls.removeMemberRole(coPersonId, couId, role); |
| ... | ... | |
| 430 | 433 |
"@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") |
| 431 | 434 |
public Response getMembers(@PathParam("type") String type, @PathParam("id") String id) {
|
| 432 | 435 |
Integer couId = calls.getCouId(type, id); |
| 433 |
JsonArray subscribers = calls.getUserNamesByCouId(couId, false); |
|
| 434 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(subscribers).toString()).type(MediaType.APPLICATION_JSON).build(); |
|
| 436 |
if(couId != null) {
|
|
| 437 |
JsonArray members = calls.getUserNamesByCouId(couId, true); |
|
| 438 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(members).toString()).type(MediaType.APPLICATION_JSON).build(); |
|
| 439 |
} else {
|
|
| 440 |
return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build();
|
|
| 441 |
} |
|
| 435 | 442 |
} |
| 436 | 443 |
|
| 437 | 444 |
/** |
| ... | ... | |
| 444 | 451 |
"@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") |
| 445 | 452 |
public Response getMembersEmail(@PathParam("type") String type, @PathParam("id") String id) {
|
| 446 | 453 |
Integer couId = calls.getCouId(type, id); |
| 447 |
JsonArray subscribers = calls.getUserEmailByCouId(couId, false); |
|
| 448 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(subscribers).toString()).type(MediaType.APPLICATION_JSON).build(); |
|
| 454 |
if(couId != null) {
|
|
| 455 |
JsonArray members = calls.getUserEmailByCouId(couId, true); |
|
| 456 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(members).toString()).type(MediaType.APPLICATION_JSON).build(); |
|
| 457 |
} else {
|
|
| 458 |
return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build();
|
|
| 459 |
} |
|
| 449 | 460 |
} |
| 450 | 461 |
|
| 451 | 462 |
/** |
| ... | ... | |
| 456 | 467 |
@Produces(MediaType.APPLICATION_JSON) |
| 457 | 468 |
public Response getMembersCount(@PathParam("type") String type, @PathParam("id") String id) {
|
| 458 | 469 |
Integer couId = calls.getCouId(type, id); |
| 459 |
int count = calls.getUserNamesByCouId(couId, false).size(); |
|
| 470 |
int count = 0; |
|
| 471 |
if(couId != null) {
|
|
| 472 |
count = calls.getUserNamesByCouId(couId, false).size(); |
|
| 473 |
} |
|
| 460 | 474 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(count).toString()).type(MediaType.APPLICATION_JSON).build(); |
| 461 | 475 |
} |
| 462 | 476 |
|
| ... | ... | |
| 468 | 482 |
@Produces(MediaType.APPLICATION_JSON) |
| 469 | 483 |
public Response getManagers(@PathParam("type") String type, @PathParam("id") String id) {
|
| 470 | 484 |
Integer couId = calls.getCouId(type, id); |
| 471 |
JsonArray managers = calls.getUserNamesByCouId(couId, true); |
|
| 472 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(managers).toString()).type(MediaType.APPLICATION_JSON).build(); |
|
| 485 |
if(couId != null) {
|
|
| 486 |
JsonArray managers = calls.getUserNamesByCouId(couId, true); |
|
| 487 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(managers).toString()).type(MediaType.APPLICATION_JSON).build(); |
|
| 488 |
} else {
|
|
| 489 |
return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build();
|
|
| 490 |
} |
|
| 473 | 491 |
} |
| 474 | 492 |
|
| 475 | 493 |
/** |
| ... | ... | |
| 480 | 498 |
@Produces(MediaType.APPLICATION_JSON) |
| 481 | 499 |
public Response getManagersEmail(@PathParam("type") String type, @PathParam("id") String id) {
|
| 482 | 500 |
Integer couId = calls.getCouId(type, id); |
| 483 |
JsonArray managers = calls.getUserEmailByCouId(couId, true); |
|
| 484 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(managers).toString()).type(MediaType.APPLICATION_JSON).build(); |
|
| 501 |
if(couId != null) {
|
|
| 502 |
JsonArray managers = calls.getUserEmailByCouId(couId, true); |
|
| 503 |
return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(managers).toString()).type(MediaType.APPLICATION_JSON).build(); |
|
| 504 |
} else {
|
|
| 505 |
return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build();
|
|
| 506 |
} |
|
| 485 | 507 |
} |
| 486 | 508 |
} |
Also available in: Unified diff
[Users | Trunk]: Fix get managers and members calls