Changeset 1836

Timestamp:

04/02/12 12:58:47 (12 years ago)

Author:

twagoo

Message:

When registering comment, use display name from DB. Fixes #144

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (8 diffs)
• test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java (modified) (3 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -39 +39 @@
  * Implementation of ComponentRegistry that uses Database Acces Objects for
  * accessing the registry (ergo: a database implementation)
- * 
+ *
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
@@ -66 +66 @@
      * Default constructor, makes this a (spring) bean. No user is set, so
      * public registry by default. Use setUser() to make it a user registry.
-     * 
+     *
      * @see setUser
      */
@@ -75 +75 @@
      * Creates a new ComponentRegistry (either public or not) for the provided
      * user
-     * 
+     *
      * @param userId
-     *            User id of the user to create registry for. Pass null for
-     *            public
+     * User id of the user to create registry for. Pass null for
+     * public
      */
     public ComponentRegistryDbImpl(Number userId) {
@@ -263 +263 @@
                     || comment.getProfileDescriptionId() != null && profileDescriptionDao.isInRegistry(comment.getProfileDescriptionId(), getUserId())) {
                 // Convert principal name to user record id
-                Number uid = convertUserIdInComment(principalName);
-                if (uid != null) {
-                    // Set user id in comment for convenience of calling method 
-                    comment.setUserId(uid.toString());
-                } else {
-                    throw new ComponentRegistryException("Cannot find user with principal name: " + principalName);
-                }
+                Number uid = convertUserIdInComment(comment, principalName);
                 // Set date to current date
                 comment.setCommentDate(Comment.createNewDate());
@@ -288 +282 @@
      * an id for later reference. If none is set and this is a user's workspace,
      * set from that user's id.
-     * 
+     *
      * It also sets the name in the description according to the display name in the database.
-     * 
+     *
      * @param description
-     *            Description containing principle name as userId
+     * Description containing principle name as userId
      * @return Id (from database)
      * @throws DataAccessException
@@ -321 +315 @@
      * an id for later reference. If none is set and this is a user's workspace,
      * set from that user's id.
-     * 
+     *
      * @param comment
-     *            Comment containing principle name as userId
+     * Comment containing principle name as userId
      * @return Id (from database)
      * @throws DataAccessException
      */
-    private Number convertUserIdInComment(String principalName) throws DataAccessException {
+    private Number convertUserIdInComment(Comment comment, String principalName) throws DataAccessException, ComponentRegistryException {
         if (principalName != null) {
             RegistryUser user = userDao.getByPrincipalName(principalName);
             if (user != null) {
-                return user.getId();
+                Number id = user.getId();
+                if (id != null) {
+                    // Set user id in comment for convenience of calling method 
+                    comment.setUserId(id.toString());
+                    // Set name to user's preferred display name
+                    comment.setUserName(user.getName());
+                    return id;
+                } else {
+                    throw new ComponentRegistryException("Cannot find user with principal name: " + principalName);
+                }
             }
         }
@@ -475 +478 @@
     /**
      * @param User
-     *            for which this should be the registry. Pass null for the
-     *            public registry
+     * for which this should be the registry. Pass null for the
+     * public registry
      */
     public void setUserId(Number user) {
@@ -497 +500 @@
      * Looks up description on basis of CMD Id. This will also check if such a
      * record even exists.
-     * 
+     *
      * @param description
-     *            Description to look up
+     * Description to look up
      * @return Database id for description
      * @throws IllegalArgumentException
-     *             If description with non-existing id is passed
+     * If description with non-existing id is passed
      */
     private Number getIdForDescription(AbstractDescription description) throws IllegalArgumentException {

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java

@@ -151 +151 @@
         assertEquals("COMMENT1", response.get(2).getComment());
 
-        assertEquals("J. Unit", response.get(0).getUserName());
+        assertEquals("Database test user", response.get(0).getUserName());
     }
 
@@ -168 +168 @@
         assertEquals("COMMENT2", response.get(2).getComment());
 
-        assertEquals("J. Unit", response.get(0).getUserName());
+        assertEquals("Database test user", response.get(0).getUserName());
     }
 
@@ -916 +916 @@
         assertNotNull(comment);
         assertEquals("Actual", comment.getComment());
-        assertEquals("J. Unit", comment.getUserName());
+        assertEquals("Database test user", comment.getUserName());
         Assert.hasText(comment.getCommentDate());
         Assert.hasText(comment.getId());