Changeset 4264

Timestamp:

01/15/14 13:13:21 (10 years ago)

Author:

olhsha

Message:

replacing "admin_rights" with the "account" in the principals table. A principal can be user, developer or admin. A developer or and admin have access to the debugging uri's. A debugging request GET all annotation infos is added.

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main

Files:

• java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified) (1 diff)
• java/eu/dasish/annotation/backend/dao/DBIntegrityService.java (modified) (2 diffs)
• java/eu/dasish/annotation/backend/dao/UserDao.java (modified) (1 diff)
• java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified) (2 diffs)
• java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java (modified) (1 diff)
• java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified) (1 diff)
• java/eu/dasish/annotation/backend/dao/impl/JdbcUserDao.java (modified) (1 diff)
• java/eu/dasish/annotation/backend/rest/AnnotationResource.java (modified) (2 diffs)
• java/eu/dasish/annotation/backend/rest/UserResource.java (modified) (5 diffs)
• webapp/index.jsp (modified) (1 diff)

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

@@ -68 +68 @@
     public List<Number> getFilteredAnnotationIDs(List<Number> annotationIDs, String text, String namespace, Timestamp after, Timestamp before);
      
+    public List<Number> getAllAnnotationIDs();
+    
        /**
      * unit test is missing

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

@@ -89 +89 @@
     List<Number> getFilteredAnnotationIDs(String link, String text, Number inloggedUserID, String[] accessModes, String namespace, Timestamp after, Timestamp before);
     
-    
+    AnnotationInfoList getAllAnnotationInfos();
     
     /**
@@ -233 +233 @@
     
     
-    public boolean userHasAdminRights(Number userID);
+    public String getTypeOfUserAccount(Number userID);
     
     /**

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

@@ -38 +38 @@
      public boolean userExists(User user);
      
-     public boolean hasAdminRights(Number internalID);
+     public String getTypeOfUserAccount(Number internalID);
      
      public String getRemoteID(Number internalID);

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

@@ -275 +275 @@
             return null;
         }
-
+    }
+
+    @Override
+    public AnnotationInfoList getAllAnnotationInfos() {
+        List<Number> annotationIDs = annotationDao.getAllAnnotationIDs();
+        if (annotationIDs != null) {
+            AnnotationInfoList result = new AnnotationInfoList();
+            for (Number annotationID : annotationIDs) {
+                Number ownerID = annotationDao.getOwner(annotationID);               
+                ReferenceList targets = getAnnotationTargets(annotationID);
+                AnnotationInfo annotationInfo = annotationDao.getAnnotationInfoWithoutTargets(annotationID);
+                annotationInfo.setTargets(targets);
+                if (ownerID != null){
+                annotationInfo.setOwnerRef(userDao.getURIFromInternalID(ownerID));}
+                else {
+                   annotationInfo.setOwnerRef("ACHTUNG: This annotation does not have an owner in the DB!!!!");
+                }
+                result.getAnnotationInfo().add(annotationInfo);
+            }
+
+            return result;
+        } else {
+            return null;
+        }
     }
 
@@ -343 +366 @@
 
     @Override
-    public boolean userHasAdminRights(Number userID) {
-        return userDao.hasAdminRights(userID);
+    public String getTypeOfUserAccount(Number userID) {
+        return userDao.getTypeOfUserAccount(userID);
     }
 

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

@@ -180 +180 @@
 
         return getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper, params);
+    }
+    
+    /////////////////////////////////////////
+    
+    @Override
+    public List<Number> getAllAnnotationIDs(){
+        StringBuilder sql = new StringBuilder("SELECT ");
+        sql.append(annotation_id).append(" , ").append(last_modified).append(" FROM ").append(annotationTableName).append(" ORDER BY ").append(last_modified).append(" DESC");
+        return getSimpleJdbcTemplate().query(sql.toString(), internalIDRowMapper);        
     }
 

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

@@ -50 +50 @@
     final static protected String targetsCachedRepresentationsTableName = "targets_cached_representations";
     // base string constants: field Names
-    final static protected String admin_rights = "admin_rights";
+    final static protected String account = "account";
     final static protected String annotation_id = "annotation_id";
     final static protected String notebook_id = "notebook_id";

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

@@ -132 +132 @@
     
     @Override
-    public boolean hasAdminRights(Number internalID){
+    public String getTypeOfUserAccount(Number internalID){
        StringBuilder requestDB  = new StringBuilder("SELECT ");
-       requestDB.append(admin_rights).append(" FROM ").append(principalTableName).append(" WHERE ").append(principal_id).append("= ? LIMIT 1");
-       List<Boolean> result = getSimpleJdbcTemplate().query(requestDB.toString(), adminRightsRowMapper, internalID);
-       return  (result.size() > 0) ? result.get(0).booleanValue() :false;    
+       requestDB.append(account).append(" FROM ").append(principalTableName).append(" WHERE ").append(principal_id).append("= ? LIMIT 1");
+       List<String> result = getSimpleJdbcTemplate().query(requestDB.toString(), adminRightsRowMapper, internalID);
+       return  (result.size() > 0) ? result.get(0) :null;    
     }
-     private final RowMapper<Boolean> adminRightsRowMapper = new RowMapper<Boolean>() {
+     private final RowMapper<String> adminRightsRowMapper = new RowMapper<String>() {
         @Override
-        public Boolean mapRow(ResultSet rs, int rowNumber) throws SQLException {
-            return new Boolean(rs.getBoolean(admin_rights));
+        public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
+            return rs.getString(account);
         }
     };

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

@@ -81 +81 @@
     private Providers providers;
     final String default_permission = "reader";
-    private static final Logger logger = LoggerFactory.getLogger(AnnotationResource.class);
+    private final Logger logger = LoggerFactory.getLogger(AnnotationResource.class);
+    private final String admin = "admin";
+    private final String developer = "developer";
 
     public void setUriInfo(UriInfo uriInfo) {
@@ -100 +102 @@
 
     public AnnotationResource() {
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_XML)
+    @Path("/all/debug")
+    @Transactional(readOnly = true)
+    public JAXBElement<AnnotationInfoList> getAllAnnotations() throws IOException {
+        dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
+        Number userID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
+        if (userID != null) {
+            String typeOfAccount = dbIntegrityService.getTypeOfUserAccount(userID);
+            if (typeOfAccount.equals(admin) || typeOfAccount.equals(developer)) {
+                final AnnotationInfoList annotationInfoList = dbIntegrityService.getAllAnnotationInfos();
+                return new ObjectFactory().createAnnotationInfoList(annotationInfoList);
+            } else {
+                httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN, "The logged in user is neither developer nor admin, and therefore cannot perform this request.");
+                return null;
+            }
+        } else {
+            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database");
+            return null;
+        }
+
     }
 

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

@@ -63 +63 @@
     @Context
     private UriInfo uriInfo;
-
+    
+    final private String admin = "admin";
+    
     public void setHttpRequest(HttpServletRequest request) {
         this.httpServletRequest = request;
@@ -145 +147 @@
         final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
         if (remoteUserID != null) {
-            if (dbIntegrityService.userHasAdminRights(remoteUserID)) {
+            if (dbIntegrityService.getTypeOfUserAccount(remoteUserID).equals(admin)) {
                 dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
                 final Number userID = dbIntegrityService.addUser(user, remoteId);
@@ -172 +174 @@
         final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
         if (remoteUserID != null) {
-            if (dbIntegrityService.userHasAdminRights(remoteUserID)) {
+            if (dbIntegrityService.getTypeOfUserAccount(remoteUserID).equals(admin)) {
                 dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
                 final Number userID = dbIntegrityService.updateUser(user);
@@ -197 +199 @@
         final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
         if (remoteUserID != null) {
-            if (dbIntegrityService.userHasAdminRights(remoteUserID)) {
+            if (dbIntegrityService.getTypeOfUserAccount(remoteUserID).equals(admin)) {
                 dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
                 final Number userID = dbIntegrityService.getUserInternalIdentifier(UUID.fromString(externalIdentifier));
@@ -223 +225 @@
         final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
         if (remoteUserID != null) {
-            if (dbIntegrityService.userHasAdminRights(remoteUserID)) {
+            if (dbIntegrityService.getTypeOfUserAccount(remoteUserID).equals(admin)) {
                 dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
                 final Number userID = dbIntegrityService.getUserInternalIdentifier(UUID.fromString(externalIdentifier));

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/webapp/index.jsp

@@ -58 +58 @@
      GET <a href="api/targets/00000000-0000-0000-0000-000000000032/versions">api/targets/00000000-0000-0000-0000-000000000032/versions</a>   <br>
      GET <a href="api/cached/00000000-0000-0000-0000-000000000051/metadata">api/cached/00000000-0000-0000-0000-000000000051/metadata</a><br>
-     GET <a href="api/cached/00000000-0000-0000-0000-000000000051/content">api/cached/00000000-0000-0000-0000-000000000051/content></a> !Problem: works only on image.jpeg, end maps png-blobs to jpegs.
-    </body>
+     GET <a href="api/cached/00000000-0000-0000-0000-000000000051/content">api/cached/00000000-0000-0000-0000-000000000051/content</a> !Problem: works only on image.jpeg, end maps png-blobs to jpegs.
+     <br> 
+     <br>
+      <b>Debugging URI's (only for developers)</b><br>
+      GET <a href="api/annotations/all/debug">api/annotations/all/debug</a> 
+      </body>
         </html>