Changeset 3216

Timestamp:

07/31/13 15:57:15 (11 years ago)

Author:

olhsha

Message:

DAO: adding getExternalId for users (not tested yet)
adding retrieving of the lists externalUserID-Permission for a given annotationID (internal)

Location:

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

Files:

• nb-configuration.xml (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/PermissionsDao.java (added)
• src/main/java/eu/dasish/annotation/backend/dao/UserDao.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcPermissionsDao.java (added)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcUserDao.java (modified) (1 diff)
• src/main/resources/spring-config/permissionsDao.xml (added)
• src/main/sql/DashishAnnotatorCreate.sql (modified) (2 diffs)
• src/test/java/eu/dasish/annotation/backend/MockObjectsFactory.java (modified) (2 diffs)
• src/test/java/eu/dasish/annotation/backend/dao/impl/PermissionsDaoTest.java (added)
• src/test/resources/spring-test-config/mockPermissionsDao.xml (added)
• src/test/resources/test-data/InsertTestData.sql (modified) (1 diff)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/nb-configuration.xml

@@ -17 +17 @@
         <org-netbeans-modules-maven-jaxws.rest_2e_jersey_2e_type>server</org-netbeans-modules-maven-jaxws.rest_2e_jersey_2e_type>
     </properties>
+    <spring-data xmlns="http://www.netbeans.org/ns/spring-data/1">
+        <config-files>
+            <config-file>src/test/resources/spring-test-config/mockPermissions.xml</config-file>
+        </config-files>
+        <config-file-groups/>
+    </spring-data>
 </project-shared-configuration>

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

@@ -25 +25 @@
  */
 public interface UserDao extends ResourceDao{
+    
+    /**
+     * 
+     * @param userIDentifier
+     * @return the internal identifier of "userIDentifier"
+     */
     Number getInternalID(UserIdentifier userIDentifier);
+    
+    /**
+     * 
+     * @param internalId
+     * @return the external UserIdentifier of internalId;
+     */
+    UserIdentifier getExternalID(Number internalId);
 }
+
+

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

@@ -51 +51 @@
     final static protected String principal_id = "principal_id";
     final static protected String time_stamp = "time_stamp";
+    final static protected String permission = "permission_";
     
     // derived string constants: table+field names 

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

@@ -61 +61 @@
         }
     };
+    
+    /////////////////////////////////////////////////////////////////// 
+    @Override
+    public UserIdentifier getExternalID(Number internalId) {
+        if (internalId == null) {
+            return null;
+        }
+        String sql = "SELECT " + external_id + " FROM " + principalTableName + " WHERE " + principal_id + "= ?";
+        List<UserIdentifier> result = getSimpleJdbcTemplate().query(sql, internalIDRowMapper, internalId.toString());
+
+        if (result == null) {
+            return null;
+        }
+
+        if (result.isEmpty()) {
+            return null;
+        }
+
+        return result.get(0);
+    }
+    private final RowMapper<UserIdentifier> internalIDRowMapper = new RowMapper<UserIdentifier>() {
+        @Override
+        public UserIdentifier mapRow(ResultSet rs, int rowNumber) throws SQLException {
+            UserIdentifier result = new UserIdentifier(rs.getString(external_id));
+            return result;
+        }
+    };
 }

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

@@ -219 +219 @@
 --     </xs:complexType>
 
+
+
+
 CREATE TABLE annotations_principals_permissions (
 annotation_id integer REFERENCES annotation(annotation_id),
@@ -225 +228 @@
 unique(annotation_id, principal_id),
 CHECK(permission_ = 'reader' OR permission_='writer' OR permission_='owner'),
--- soundness: owner in this table must be the same as the owner in the annotation table ---
--- ??? check for any pair (annotation, principal) there must be exactly one row in this table: 
+-- 1 soundness: ??? owner in this table must be the same as the owner in the annotation table ---
+-- 2 soundness ??? check for any pair (annotation, principal) there must be exactly one row in this table: 
 -- impossible because of deleting an nnotation: first we have to remove it from this table
 );
+
 
 ---------------------------------------------------------------------------------------------

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

@@ -20 +20 @@
 import eu.dasish.annotation.backend.dao.AnnotationDao;
 import eu.dasish.annotation.backend.dao.NotebookDao;
+import eu.dasish.annotation.backend.dao.PermissionsDao;
 import eu.dasish.annotation.backend.dao.UserDao;
 import org.jmock.Mockery;
@@ -47 +48 @@
         return context.mock(UserDao.class);
     }
+    
+    public PermissionsDao newPermissionsDao() {
+        return context.mock(PermissionsDao.class);
+    }
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql

@@ -157 +157 @@
 INSERT INTO annotations_principals_permissions (annotation_id, principal_id, permission_) VALUES (5, 4, 'writer');
 INSERT INTO annotations_principals_permissions (annotation_id, principal_id, permission_) VALUES (5, 5, 'writer');
+-- checking integrity control:
+-- INSERT INTO annotations_principals_permissions (annotation_id, principal_id, permission_) VALUES (5, 5, 'reader');