Changeset 5549 for ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/impl/ComponentDaoImpl.java

Timestamp:

08/11/14 16:07:55 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Added group service. Tested via the tomcat on loclahots (test URI and postman), old unit tests are adjusted and work well. Todo: retest on localhost tomcat, look at run-time exceptions, add new unit tests, adjust front-end

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/impl/ComponentDaoImpl.java (modified) (7 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/impl/ComponentDaoImpl.java

@@ -110 +110 @@
      */
     private List<BaseDescription> augment(List<BaseDescription> baseDescription) {
-        if (baseDescription.isEmpty())
+        if (baseDescription.isEmpty()) {
             return baseDescription;
+        }
         Map<String, BaseDescription> map = new HashMap<String, BaseDescription>();
         List<String> idlist = new ArrayList<String>();
@@ -165 +166 @@
      *         public)
      */
-    @Override
-    public boolean isInRegistry(String cmdId, Number userId) {
-        if (userId == null) {
-            return isPublic(cmdId);
-        } else {
-            return isInUserSpace(cmdId, userId);
-        }
-    }
+//    @Override
+//    public boolean isAccessible(String cmdId, Number userId) {
+//      if (userId == null) {
+//          return this.isPublic(cmdId);
+//      } else {
+//          return this.isInUserSpace(cmdId, userId);
+//      }
+//    }
 
     /**
@@ -207 +208 @@
         copy.setPublic(isPublic);
         copy.setUserId(toString(userId));
+        copy.setCreatorName(description.getCreatorName());
         copy = jpaComponentDao.saveAndFlush(copy);
         jpaComponentDao.updateContent(copy.getId(), content);
@@ -278 +280 @@
     }
 
-    /**
-     * Get by ComponentId / ProfileId
-     * 
-     * @param id
-     *            Full component id
-     * @param userId
-     *            Db id of user for workspace; null for public space
-     * @return The description, if it exists; null otherwise
-     */
-    @Override
-    public BaseDescription getByCmdId(String id, Number userId) {
-        BaseDescription baseDescription = getByCmdId(id);
-        if (baseDescription != null) {
-            augment(baseDescription);
-            if (userId == null) {
-                if (!baseDescription.isPublic())
-                    baseDescription = null;
-            } else {
-                if (baseDescription.isPublic()
-                        || !compare(baseDescription.getUserId(), userId))
-                    baseDescription = null;
-            }
-        }
-        return baseDescription;
-    }
-
+  
     /**
      * 
@@ -352 +329 @@
      */
     @Override
-    public List<BaseDescription> getUserspaceComponents(Number userId) {
-        return augment(jpaComponentDao
-                .findItemsForUserThatAreNotInGroups(userId.longValue(),
-                        ComponentDescription.COMPONENT_PREFIX + "%"));
-    }
-
-    @Override
-    public List<BaseDescription> getUserspaceProfiles(Number userId) {
-        return augment(jpaComponentDao.findItemsForUserThatAreNotInGroups(
-                userId.longValue(), ProfileDescription.PROFILE_PREFIX + "%"));
-    }
-
+    public List<BaseDescription> getPrivateBaseDescriptions(Number userId, String prefix) {
+        return augment(jpaComponentDao.findItemsForUserThatAreNotInGroups(userId.longValue(),prefix + "%"));
+        //return augment(jpaComponentDao.findNotPublishedUserItems(userId.longValue(),prefix + "%"));
+    }
+
+   
     @Override
     public void setDeleted(BaseDescription desc, boolean isDeleted) {
@@ -399 +370 @@
 
     @Override
-    public List<BaseDescription> getPublicComponentDescriptions() {
-        return augment(jpaComponentDao
-                .findPublicItems(ComponentDescription.COMPONENT_PREFIX + "%"));
-    }
-
-    @Override
-    public List<BaseDescription> getPublicProfileDescriptions() {
-        return augment(jpaComponentDao
-                .findPublicItems(ProfileDescription.PROFILE_PREFIX + "%"));
-    }
-
+    public List<BaseDescription> getPublicBaseDescriptions(String prefix) {
+        return augment(jpaComponentDao.findPublishedItems(prefix + "%"));
+    }
+
+   
     @Override
     public List<String> getAllNonDeletedProfileIds() {
@@ -419 +384 @@
         return jpaComponentDao.findNonDeletedItemIds(ComponentDescription.COMPONENT_PREFIX+"%");
     }
-
+    
+    @Override
+    public List<BaseDescription> getAllNonDeletedDescriptions() {
+        return jpaComponentDao.findNonDeletedDescriptions();
+    }
+    
+    // Olha was here
+    @Override
+    public List<String> getAllItemIdsInGroup(String prefix, Long groupId) {
+        // we are ineterested only in non-published components in the group
+        return jpaComponentDao.findAllItemIdsInGroup(false, prefix + "%", groupId);
+    }
+    
+   
 }