/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 59763

Added by Konstantinos Triantafyllou over 3 years ago

[Users | Trunk]: Fix get managers and members calls

         public final String PORTAL_ADMIN = "PORTAL_ADMINISTRATOR";
         public final String USER_ADMIN = "USER_MANAGER";
         private String mapType(String type) {
             if(type.equals("organization")) {
                 type = "institution";
+            }
             if(type.equals("ri")) {
                 type = "community";
+            }
             return type;
+        }
         /**
          * Type = FUNDER | COMMUNITY | INSTITUTION | PROJECT
+         *
          * */
         public String curator(String type) {
             return type.toUpperCase() + "_CURATOR";
             return mapType(type).toUpperCase() + "_CURATOR";
+        }
         /**
-...
          * Id = EE, EGI, etc
          * */
         public String manager(String type, String id) {
             return type.toUpperCase() + "_" + id.toUpperCase() + "_MANAGER";
             return mapType(type).toUpperCase() + "_" + id.toUpperCase() + "_MANAGER";
+        }
         /**
-...
          * Id = EE, EGI, etc
          * */
         public String member(String type, String id) {
             return type.toUpperCase() + "_" + id.toUpperCase();
             return mapType(type).toUpperCase() + "_" + id.toUpperCase();
+        }
         public boolean isCommunity(String type) {
             return type.equals("community");
             return mapType(type).equals("community");
+        }
+    }

         @Autowired
         public JsonUtils jsonUtils;
         private String mapType(String type) {
             if(type.equals("organization")) {
                 type = "institution";
+            }
             if(type.equals("ri")) {
                 type = "community";
+            }
             return type;
+        }
         /**
          * 1. Get CoPersonId by Email
          */
-...
             JsonArray cous = getCous();
             Integer couId = null;
             for (JsonElement cou : cous) {
                 if (cou.getAsJsonObject().get("Name").getAsString().equals(type + "." + id)) {
                 if (cou.getAsJsonObject().get("Name").getAsString().equals(mapType(type) + "." + id)) {
                     couId = cou.getAsJsonObject().get("Id").getAsInt();
+                }
+            }

         @POST
         @Produces(MediaType.APPLICATION_JSON)
         @Consumes(MediaType.APPLICATION_JSON)
         @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN)")
         @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN, @AuthorizationService.PORTAL_ADMIN)")
         public Response createRole(@RequestBody Role role) {
             calls.createRole(role);
             return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse("Role has been created").toString()).type(MediaType.APPLICATION_JSON).build();
-...
             Integer coPersonId = calls.getCoPersonIdByEmail(email);
             if (coPersonId != null) {
                 Integer couId = calls.getCouId(type, id);
                 Integer role = calls.getRoleId(coPersonId, couId);
                 Integer role = null;
                 if(couId != null) {
                     role = calls.getRoleId(coPersonId, couId);
+                }
                 if (couId != null && role != null) {
                     calls.removeAdminRole(coPersonId, couId);
                     calls.removeMemberRole(coPersonId, couId, role);
-...
                 "@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))")
         public Response getMembers(@PathParam("type") String type, @PathParam("id") String id) {
             Integer couId = calls.getCouId(type, id);
             JsonArray subscribers = calls.getUserNamesByCouId(couId, false);
             return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(subscribers).toString()).type(MediaType.APPLICATION_JSON).build();
             if(couId != null) {
                 JsonArray members = calls.getUserNamesByCouId(couId, true);
                 return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(members).toString()).type(MediaType.APPLICATION_JSON).build();
             } else {
                 return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build();
+            }
+        }
         /**
-...
                 "@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))")
         public Response getMembersEmail(@PathParam("type") String type, @PathParam("id") String id) {
             Integer couId = calls.getCouId(type, id);
             JsonArray subscribers = calls.getUserEmailByCouId(couId, false);
             return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(subscribers).toString()).type(MediaType.APPLICATION_JSON).build();
             if(couId != null) {
                 JsonArray members = calls.getUserEmailByCouId(couId, true);
                 return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(members).toString()).type(MediaType.APPLICATION_JSON).build();
             } else {
                 return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build();
+            }
+        }
         /**
-...
         @Produces(MediaType.APPLICATION_JSON)
         public Response getMembersCount(@PathParam("type") String type, @PathParam("id") String id) {
             Integer couId = calls.getCouId(type, id);
             int count = calls.getUserNamesByCouId(couId, false).size();
             int count = 0;
             if(couId != null) {
                 count = calls.getUserNamesByCouId(couId, false).size();
+            }
             return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(count).toString()).type(MediaType.APPLICATION_JSON).build();
+        }
-...
         @Produces(MediaType.APPLICATION_JSON)
         public Response getManagers(@PathParam("type") String type, @PathParam("id") String id) {
             Integer couId = calls.getCouId(type, id);
             JsonArray managers = calls.getUserNamesByCouId(couId, true);
             return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(managers).toString()).type(MediaType.APPLICATION_JSON).build();
             if(couId != null) {
                 JsonArray managers = calls.getUserNamesByCouId(couId, true);
                 return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(managers).toString()).type(MediaType.APPLICATION_JSON).build();
             } else {
                 return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build();
+            }
+        }
         /**
-...
         @Produces(MediaType.APPLICATION_JSON)
         public Response getManagersEmail(@PathParam("type") String type, @PathParam("id") String id) {
             Integer couId = calls.getCouId(type, id);
             JsonArray managers = calls.getUserEmailByCouId(couId, true);
             return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(managers).toString()).type(MediaType.APPLICATION_JSON).build();
             if(couId != null) {
                 JsonArray managers = calls.getUserEmailByCouId(couId, true);
                 return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(managers).toString()).type(MediaType.APPLICATION_JSON).build();
             } else {
                 return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build();
+            }
+        }
+    }

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 59763

Added by Konstantinos Triantafyllou over 3 years ago