Changeset 1369

Timestamp:

05/24/11 14:10:35 (13 years ago)

Author:

patdui

Message:

• fixed undelete admin button, also added unique constraints to the cmd id columns (profile_id and component_id).

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/frontend/AdminHomePage.java (modified) (5 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/AbstractDescriptionDao.java (modified) (1 diff)
• main/sql/create.sql (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDatabase.java (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java (modified) (8 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/AdminHomePage.java

@@ -73 +73 @@
                 try {
                     adminRegistry.delete(info, userPrincipal);
-                    tree.setModelObject(createDBTreeModel());
                     info("Item deleted.");
+                    reloadTreeModel(info);
                 } catch (SubmitFailedException e) {
-                    LOG.error("Admin: ", e);
-                    error("Cannot delete: " + info.getName() + "\n error=" + e);
-                } catch (ComponentRegistryException e) {
                     LOG.error("Admin: ", e);
                     error("Cannot delete: " + info.getName() + "\n error=" + e);
@@ -104 +101 @@
                     adminRegistry.undelete(info);
                     info("Item put back.");
-                    tree.setModelObject(createDBTreeModel());
+                    reloadTreeModel(info);
                 } catch (SubmitFailedException e) {
-                    LOG.error("Admin: ", e);
-                    error("Cannot undelete: " + info.getName() + "\n error=" + e);
-                } catch (ComponentRegistryException e) {
                     LOG.error("Admin: ", e);
                     error("Cannot undelete: " + info.getName() + "\n error=" + e);
@@ -138 +132 @@
                     adminRegistry.submitFile(info, userPrincipal);
                     info("submitting done.");
+                    reloadTreeModel(info);
                 } catch (SubmitFailedException e) {
                     LOG.error("Admin: ", e);
@@ -144 +139 @@
                 if (target != null) {
                     target.addComponent(form);
+                    target.addComponent(tree);
                     target.addComponent(feedback);
                 }
@@ -171 +167 @@
         });
 
+    }
+
+    private void reloadTreeModel(CMDItemInfo info) {
+        try {
+            tree.setModelObject(createDBTreeModel());
+        } catch (ComponentRegistryException e) {
+            LOG.error("Admin: ", e);
+            error("Cannot reload tree: " + info.getName() + "\n error=" + e);
+        }
     }
 

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

@@ -239 +239 @@
      */
     public Number getDbId(String cmdId) {
-        // Check for is_deleted is important, because an id only has to be
-        // unique
-        // among non-deleted descriptions
         StringBuilder query = new StringBuilder("SELECT " + COLUMN_ID + " FROM ").append(getTableName());
-        query.append(" WHERE is_deleted = false AND ").append(getCMDIdColumn()).append(" = ?");
+        query.append(" WHERE ").append(getCMDIdColumn()).append(" = ?");
         return getSimpleJdbcTemplate().queryForInt(query.toString(), cmdId);
     }

ComponentRegistry/trunk/ComponentRegistry/src/main/sql/create.sql

@@ -46 +46 @@
     domain_name character varying,
     group_name character varying,
-    href character varying
+    href character varying,
+    UNIQUE(component_id)
 );
 
@@ -75 +76 @@
     domain_name character varying,
     group_name character varying,
-    href character varying
+    href character varying,
+    UNIQUE(profile_id)
 );
 

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDatabase.java

@@ -30 +30 @@
                 + "  creator_name character varying,"
                 + "  domain_name character varying,"
-                + "  group_name character varying);");
+                + "  group_name character varying, CONSTRAINT UNIQUE_COMPONENT_ID UNIQUE (component_id));");
     }
 
@@ -47 +47 @@
                 + "  creator_name character varying,"
                 + "  domain_name character varying,"
-                + "  group_name character varying);");
+                + "  group_name character varying, CONSTRAINT UNIQUE_PROFILE_ID UNIQUE (profile_id));");
     }
 

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java

@@ -211 +211 @@
 
     private ProfileDescription createProfile(ComponentRegistry register) throws Exception {
-        ProfileDescription description = ProfileDescription.createNewDescription();
-        description.setName("Aap");
-        description.setCreatorName(USER_CREDS.getDisplayName());
-        description.setUserId(USER_CREDS.getPrincipalName());
-        description.setDescription("MyDescription");
+        ProfileDescription description = getProfileDesc();
 
         CMDComponentSpec testProfile = RegistryTestHelper.getTestProfile();
@@ -231 +227 @@
         assertEquals(1, register.getProfileDescriptions().size());
         assertNotNull(register.getMDProfile(description.getId()));
+        return description;
+    }
+
+    private ProfileDescription getProfileDesc() {
+        ProfileDescription description = ProfileDescription.createNewDescription();
+        description.setName("Aap");
+        description.setCreatorName(USER_CREDS.getDisplayName());
+        description.setUserId(USER_CREDS.getPrincipalName());
+        description.setDescription("MyDescription");
         return description;
     }
@@ -268 +273 @@
         ComponentRegistry registry = getComponentRegistryForUser(userId);
 
-        ComponentDescription description = ComponentDescription.
-                createNewDescription();
-        description.setName("Aap");
-        description.setCreatorName(USER_CREDS.getDisplayName());
-        description.setUserId(USER_CREDS.getPrincipalName());
-        description.setDescription("MyDescription");
+        ComponentDescription description = getComponentDesc();
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.YEAR, 1999);
@@ -298 +298 @@
 
         registry = getComponentRegistryForUser(userId); // ComponentRegistryFactoryImpl.getInstance().getComponentRegistry(true, USER_CREDS); //user registry
-        description.setUserId(USER_CREDS.getPrincipalName()); // Set again to principal name
+        description = getComponentDesc();
         registry.register(description, testComp);
         assertEquals(1, registry.getComponentDescriptions().size());
@@ -310 +310 @@
         ComponentRegistry registry = getComponentRegistryForUser(userId);
 
-        ProfileDescription description = ProfileDescription.createNewDescription();
-        description.setName("Aap");
-        description.setCreatorName(USER_CREDS.getDisplayName());
-        description.setUserId(USER_CREDS.getPrincipalName());
-        description.setDescription("MyDescription");
+        ProfileDescription description = getProfileDesc();
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.YEAR, 1999);
@@ -338 +334 @@
 
         registry = getComponentRegistryForUser(userId);
-        description.setUserId(USER_CREDS.getPrincipalName()); // Set again to principal name
+        description = getProfileDesc();//Need to create a new one for a new id
         registry.register(description, testComp);
         assertEquals(1, registry.getProfileDescriptions().size());
@@ -346 +342 @@
 
     private ComponentDescription createComponent(ComponentRegistry registry) throws Exception {
+        ComponentDescription description = getComponentDesc();
+        CMDComponentSpec testComp = RegistryTestHelper.getTestComponent();
+
+        registry.register(description, testComp);
+
+        // Non authorized user should never be able to delete
+        try {
+            registry.deleteMDComponent(description.getId(), new DummyPrincipal("Fake User"), false);
+            fail("Should have thrown exception");
+        } catch (UserUnauthorizedException e) {
+        }
+
+        assertEquals(1, registry.getComponentDescriptions().size());
+        assertNotNull(registry.getMDComponent(description.getId()));
+        return description;
+    }
+
+    private ComponentDescription getComponentDesc() {
         ComponentDescription description = ComponentDescription.
                 createNewDescription();
@@ -352 +366 @@
         description.setUserId(USER_CREDS.getPrincipalName());
         description.setDescription("MyDescription");
-        CMDComponentSpec testComp = RegistryTestHelper.getTestComponent();
-
-        registry.register(description, testComp);
-
-        // Non authorized user should never be able to delete
-        try {
-            registry.deleteMDComponent(description.getId(), new DummyPrincipal("Fake User"), false);
-            fail("Should have thrown exception");
-        } catch (UserUnauthorizedException e) {
-        }
-
-        assertEquals(1, registry.getComponentDescriptions().size());
-        assertNotNull(registry.getMDComponent(description.getId()));
         return description;
     }