Changeset 1318

Timestamp:

05/16/11 13:05:02 (13 years ago)

Author:

twagoo

Message:

InsertDescription? method with parameters for userId and isPublic

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/AbstractDescriptionDao.java (modified) (6 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/impl/database/AbstractDescriptionDaoTest.java (modified) (2 diffs)

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

@@ -63 +63 @@
      * @return Id of newly inserted description
      */
-    public Number insertComponent(final AbstractDescription description,
-            final String content) {
+    public Number insertDescription(AbstractDescription description, String content, boolean isPublic, Number userId) {
         SimpleJdbcInsert insert = new SimpleJdbcInsert(getDataSource()).
                 withTableName(TABLE_XML_CONTENT).usingGeneratedKeyColumns(
@@ -76 +75 @@
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("content_id", contentId);
-        params.put("is_public", Boolean.TRUE);
+        params.put("userId", userId);
+        params.put("is_public", isPublic);
         params.put("is_deleted", Boolean.FALSE);
         params.put(getCMDIdColumn(), description.getId());
@@ -128 +128 @@
      */
     public void setDeleted(String id) {
-        String delete = "UPDATE " + getTableName() + " SET is_deleted = true WHERE " + getCMDIdColumn() + " = :id";
-        getSimpleJdbcTemplate().update(delete, Collections.singletonMap("id", id));
-    }
-
+        String update = "UPDATE " + getTableName() + " SET is_deleted = true WHERE " + getCMDIdColumn() + " = :id";
+        getSimpleJdbcTemplate().update(update, Collections.singletonMap("id", id));
+    }
+
+    public void setPublished(String id, boolean published) {
+        final String update = "UPDATE " + getTableName() + " SET is_published = :published WHERE " + getCMDIdColumn() + " = :id";
+        final Map<String, Object> args = new HashMap<String, Object>();
+        args.put("id", id);
+        args.put("published", published);
+
+        getSimpleJdbcTemplate().update(update, Collections.singletonMap("id", id));
+    }
     /*
      * DAO HELPER METHODS (may well be moved to some other place in class hierarchy at a later time)
      */
+
     private T getFirstOrNull(StringBuilder selectQuery, Object... args) {
         return getFirstOrNull(selectQuery.toString(), args);
@@ -153 +162 @@
 
     private List<T> getList(String selectQuery, Object... args) {
-        return getSimpleJdbcTemplate().query(selectQuery, rowMapper, args);
+        return getSimpleJdbcTemplate().query(selectQuery, getRowMapper(), args);
     }
 
@@ -176 +185 @@
         return "name, description, " + getCMDIdColumn();
     }
+    
     private final ParameterizedRowMapper<T> rowMapper = new ParameterizedRowMapper<T>() {
 
@@ -195 +205 @@
         }
     };
+
+    /**
+     * @return the rowMapper
+     */
+    protected ParameterizedRowMapper<T> getRowMapper() {
+        return rowMapper;
+    }
 }

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

@@ -119 +119 @@
             String xml = os.toString();
             if (description.isProfile()) {
-                profileDescriptionDao.insertComponent(description, xml);
+                profileDescriptionDao.insertDescription(description, xml, isPublic(), userId);
             } else {
-                componentDescriptionDao.insertComponent(description, xml);
+                componentDescriptionDao.insertDescription(description, xml, isPublic(), userId);
             }
             return 0;

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

@@ -41 +41 @@
 
         String testComponent = RegistryTestHelper.getComponentTestContentString();
-        Number newId = getDao().insertComponent(description, testComponent);
+        Number newId = getDao().insertDescription(description, testComponent, true, null);
         assertNotNull(newId);
         assertNotNull(getDao().getById(newId));
@@ -67 +67 @@
         int count = getDao().getPublicDescriptions().size();
         // insert
-        getDao().insertComponent(description, testComponent);
+        getDao().insertDescription(description, testComponent, true, null);
         assertEquals(count+1, getDao().getPublicDescriptions().size());