Changeset 3408 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java

Timestamp:

08/18/13 16:21:58 (11 years ago)

Author:

olhsha

Message:

refactored DAO-s tests are added, but not all working yet. Also: add 8 more tests to dispatcher class

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified) (4 diffs)

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

@@ -21 +21 @@
 import eu.dasish.annotation.schema.Annotation;
 import eu.dasish.annotation.schema.AnnotationInfo;
+import eu.dasish.annotation.schema.Permission;
 import eu.dasish.annotation.schema.ResourceREF;
+import eu.dasish.annotation.schema.UserWithPermission;
 import java.sql.SQLException;
 import java.sql.Timestamp;
@@ -50 +52 @@
      * @param annotationID
      * @return the Annotation object with empty list of sources 
-     * constructing a complete Annotation object from theresult and "retrieveSourceIDs" is done in "CompoundRequests"
+     * constructing a complete Annotation object from there sult and "retrieveSourceIDs" is done in "DaoDispatchter"
      * 
      */
@@ -59 +61 @@
      * 
      * @param annotationId
-     * @return 
-     * result[0] = # removed "annotations_principals_perissions" rows
-     * result[1] = # removed "annotatiobs_target_sources" rows
-     * result[2] = # removed annotation rows (should be 1)
+     * @return removed annotation rows (should be 1)
      */
     
-    public int[] deleteAnnotation(Number annotationId) throws SQLException;
+    public int deleteAnnotation(Number annotationId) throws SQLException;
     
+    /**
+     * 
+     * @param annotationId
+     * @return # removed annotation_source rows for given annotationID 
+     */
+    
+    public int deleteAllAnnotationSource(Number annotationId) throws SQLException;
     
    
@@ -131 +137 @@
     public int addAnnotationSourcePair(Number annotationID, Number sourceID) throws SQLException;
     
+    public int deleteAnnotationPrincipalPermissions(Number annotationID) throws SQLException ;
+
+    /**
+     * 
+     * @param annotationID
+     * @param userID
+     * @param permission
+     * @return the amount of rows added to the table annotations_principals_permissions
+     */
+    public int addAnnotationPrincipalPermission(Number annotationID, Number userID, Permission permission) throws SQLException;
+    
+       /**
+     * 
+     * @param annotationId
+     * @return retrieves all the pairs (user-permission) for "annotationId" from the table annotations_principals permissions
+     */
+    public List<Map<Number, String>>  retrievePermissions(Number annotationId);
+    
 }