Changeset 4263

Timestamp:

01/14/14 18:06:27 (10 years ago)

Author:

olhsha

Message:

Put annotation is fixed. But AnnotationResourse? definitely needs refactoring.

Location:

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

Files:

• dao/impl/DBIntegrityServiceImlp.java (modified) (1 diff)
• rest/AnnotationResource.java (modified) (5 diffs)

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

@@ -386 +386 @@
         int addedTargets = addTargets(annotation, annotationID);
         int addedPrincipalsPermissions = addPrincipalsPermissions(annotation.getPermissions().getUserWithPermission(), annotationID);
-        int addedOwner = annotationDao.addAnnotationPrincipalPermission(annotationID, userID, Permission.OWNER);
         return updatedAnnotations;
     }

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

@@ -101 +101 @@
     public AnnotationResource() {
     }
-    
-    
 
     @GET
@@ -167 +165 @@
 // TODO Unit test 
 
-   
-    
-    
     @GET
     @Produces(MediaType.TEXT_XML)
@@ -255 +250 @@
         }
     }
-    
+
     // TODO: how to return the status code? 
-
-    
 ///////////////////////////////////////////////////////
-
     @POST
     @Consumes(MediaType.APPLICATION_XML)
@@ -288 +280 @@
         dbIntegrityService.setServiceURI(path);
         String annotationURI = annotation.getURI();
-        
+
         if (!(path + "annotations/" + externalIdentifier).equals(annotationURI)) {
             httpServletResponse.sendError(HttpServletResponse.SC_CONFLICT, "Wrong request: the external annotation ID and the annotation ID from the request body do not match. Correct the request and resend.");
             return null;
         }
-        
+
         List<UserWithPermission> permissions = annotation.getPermissions().getUserWithPermission();
-        
-        
+        String ownerURI = annotation.getOwnerRef();
+        if (!ownerIsListed(ownerURI, permissions)) {
+            httpServletResponse.sendError(HttpServletResponse.SC_CONFLICT, "Wrong request body: the  owner URI's is not listed in the list of permissions as 'owner'. Correct the request and resend.");
+            return null;
+        }
+
+
         final Number annotationID = dbIntegrityService.getAnnotationInternalIdentifier(UUID.fromString(externalIdentifier));
         if (annotationID != null) {
@@ -518 +515 @@
         }
     }
-    
-    
+
+    private boolean ownerIsListed(String uri, List<UserWithPermission> permissions) {
+        for (UserWithPermission permissionPair : permissions) {
+            if (permissionPair.getRef().equals(uri) && permissionPair.getPermission().equals(Permission.OWNER)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }