Changeset 4260

Timestamp:

01/13/14 17:06:18 (10 years ago)

Author:

olhsha

Message:

adding permission for aninexisting user is fixed. It is not added and, if it for /annotations/aid/permissions/uid, the erver send an error message.

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend

Files:

• dao/UserDao.java (modified) (1 diff)
• dao/impl/DBIntegrityServiceImlp.java (modified) (6 diffs)
• dao/impl/JdbcUserDao.java (modified) (4 diffs)
• rest/AnnotationResource.java (modified) (6 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/UserDao.java

@@ -50 +50 @@
      
      public int deleteUser(Number intenralID);
+     
+     public int deleteUserSafe(Number internalID);
   
      

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java

@@ -98 +98 @@
     }
 
-    
     @Override
     public Number getTargetInternalIdentifier(UUID externalID) {
@@ -139 +138 @@
     }
 
-    
     @Override
     public Annotation getAnnotation(Number annotationID) {
@@ -349 +347 @@
 
     @Override
-    public boolean userHasAdminRights(Number userID){
-       return userDao.hasAdminRights(userID); 
-    }
-    
+    public boolean userHasAdminRights(Number userID) {
+        return userDao.hasAdminRights(userID);
+    }
+
     ///// UPDATERS /////////////////
     @Override
@@ -366 +364 @@
         for (UserWithPermission userWithPermission : usersWithPermissions) {
             Number userID = userDao.getInternalID(UUID.fromString(userDao.stringURItoExternalID(userWithPermission.getRef())));
-            Permission permission = userWithPermission.getPermission();
-            Permission currentPermission = annotationDao.getPermission(annotationID, userID);
-            if (currentPermission != null) {
-                if (!permission.value().equals(currentPermission.value())) {
-                    result = result + annotationDao.updateAnnotationPrincipalPermission(annotationID, userID, permission);
+            if (userID != null) {
+                Permission permission = userWithPermission.getPermission();
+                Permission currentPermission = annotationDao.getPermission(annotationID, userID);
+                if (currentPermission != null) {
+                    if (!permission.value().equals(currentPermission.value())) {
+                        result = result + annotationDao.updateAnnotationPrincipalPermission(annotationID, userID, permission);
+                    }
+                } else {
+                    result = result + annotationDao.addAnnotationPrincipalPermission(annotationID, userID, permission);
                 }
-            } else {
-                result = result + annotationDao.addAnnotationPrincipalPermission(annotationID, userID, permission);
             }
         }
@@ -392 +392 @@
         return updatedAnnotations;
     }
-    
-     
+
     // TODO: unit test
     @Override
     public int updateAnnotationBody(Number internalID, AnnotationBody annotationBody) {
         String[] body = annotationDao.retrieveBodyComponents(annotationBody);
-        return annotationDao.updateAnnotationBody(internalID, body[0], body[1], annotationBody.getXmlBody()!=null);
-    }
-    
-   
-    
+        return annotationDao.updateAnnotationBody(internalID, body[0], body[1], annotationBody.getXmlBody() != null);
+    }
+
     /////////////// ADDERS  /////////////////////////////////
     @Override
@@ -554 +551 @@
         return addedPermissions;
     }
-    
-     private TargetInfo getTargetInfoFromTarget(Target target) {
+
+    private TargetInfo getTargetInfoFromTarget(Target target) {
         TargetInfo targetInfo = new TargetInfo();
         targetInfo.setRef(target.getURI());

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcUserDao.java

@@ -146 +146 @@
     
      ///////////////////// ADDERS ////////////////////////////
+     @Override
      public Number addUser(User user, String remoteID){
         UUID externalIdentifier = UUID.randomUUID();
@@ -161 +162 @@
      
      ////////// UPDATERS ///////////////////////
-     
+      @Override
       public Number updateUser(User user){
         Number principalID = this.getInternalIDFromURI(user.getURI());
@@ -175 +176 @@
      
      ////// DELETERS ////////////
+     @Override
      public int deleteUser(Number internalID){
+           
+        StringBuilder sql = new StringBuilder("DELETE FROM ");
+        sql.append(principalTableName).append(" where ").append(principal_id).append(" = ?");
+        return getSimpleJdbcTemplate().update(sql.toString(), internalID);
+
+     }
+     
+    @Override 
+    public int deleteUserSafe(Number internalID){
           if (userIsInUse(internalID)) {
             return 0;
@@ -184 +195 @@
 
      }
-    
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java

@@ -240 +240 @@
                 }
             } else {
-                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database");
-                return null;
-            }
-
-        } else {
-            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database");
+                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database.");
+                return null;
+            }
+
+        } else {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database.");
             return null;
         }
@@ -263 +263 @@
             return new ObjectFactory().createResponseBody(makeAnnotationResponseEnvelope(annotationID));
         } else {
-            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database");
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database.");
             return null;
         }
@@ -297 +297 @@
                 }
             } else {
-                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database");
-                return null;
-            }
-        } else {
-            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database");
+                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database.");
+                return null;
+            }
+        } else {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database.");
             return null;
         }
@@ -322 +322 @@
                     return new ObjectFactory().createResponseBody(makeAnnotationResponseEnvelope(annotationID));
                 } else {
-                    httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED);
-                    return null;
-                }
-            } else {
-                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database");
-                return null;
-            }
-        } else {
-            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database");
+                    httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The logged-in user cannot change the body of this annotation because (s)he is  not its 'writer'.");
+                    return null;
+                }
+            } else {
+                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database.");
+                return null;
+            }
+        } else {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database.");
             return null;
         }
@@ -341 +341 @@
     public String updatePermission(@PathParam("annotationid") String annotationExternalId, @PathParam("userid") String userExternalId, Permission permission) throws IOException {
         dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
-        final Number annotationID = dbIntegrityService.getAnnotationInternalIdentifier(UUID.fromString(annotationExternalId));
         final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
-        final Number userID = dbIntegrityService.getUserInternalIdentifier(UUID.fromString(userExternalId));
         if (remoteUserID != null) {
-            if (annotationID != null) {
-                if (isOwner(remoteUserID, annotationID)) {
-                    int result = (dbIntegrityService.getPermission(annotationID, userID) != null)
-                            ? dbIntegrityService.updateAnnotationPrincipalPermission(annotationID, userID, permission)
-                            : dbIntegrityService.addAnnotationPrincipalPermission(annotationID, userID, permission);
-                    logger.info("updatePermission method: OK");
-                    return result + " rows are updated/added";
-
-                } else {
-                    httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED);
-                    return null;
-                }
-            } else {
-                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database");
-                return null;
-            }
-
-        } else {
-            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database");
+            final Number userID = dbIntegrityService.getUserInternalIdentifier(UUID.fromString(userExternalId));
+            if (userID != null) {
+                final Number annotationID = dbIntegrityService.getAnnotationInternalIdentifier(UUID.fromString(annotationExternalId));
+                if (annotationID != null) {
+                    if (isOwner(remoteUserID, annotationID)) {
+                        int result = (dbIntegrityService.getPermission(annotationID, userID) != null)
+                                ? dbIntegrityService.updateAnnotationPrincipalPermission(annotationID, userID, permission)
+                                : dbIntegrityService.addAnnotationPrincipalPermission(annotationID, userID, permission);
+                        logger.info("updatePermission method: OK");
+                        return result + " rows are updated/added";
+
+                    } else {
+                        httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The logged-in user cannot change the rights on this annotation because (s)he is  not its owner.");
+                        return null;
+                    }
+                } else {
+                    httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database.");
+                    return null;
+                }
+            } else {
+                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The user with the given id is not found in the database.");
+                return null;
+            }
+
+        } else {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database.");
             return null;
         }
@@ -380 +385 @@
                 if (isOwner(remoteUserID, annotationID)) {
                     int updatedRows = dbIntegrityService.updatePermissions(annotationID, permissions);
-                    logger.info("updatePermissions method: OK");
                     return new ObjectFactory().createResponseBody(makePermissionResponseEnvelope(annotationID));
                 } else {
-                    httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED);
-                    return null;
-                }
-            } else {
-                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database");
-                return null;
-            }
-        } else {
-            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database");
+                    httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The logged-in user cannot change the rights on this annotation because (s)he is  not its owner.");
+                    return null;
+                }
+            } else {
+                httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The annotation with the given id is not found in the database.");
+                return null;
+            }
+        } else {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database.");
             return null;
         }
     }
 /////////////////////////////////////////
+
     private ResponseBody makeAnnotationResponseEnvelope(Number annotationID) {
         ResponseBody result = new ResponseBody();