Merge pull request 52North#306 from ridoo/fix/issue_305-broken-servic…

…es-and-datasets-collections apply pkid projection for datasets
antego · Mar 8, 2017 · 27b3eb5 · 27b3eb5
2 parents 3056672 + 5341d30
commit 27b3eb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...series/series-dao/src/main/java/org/n52/series/db/da/HierarchicalParameterRepository.java b/...series/series-dao/src/main/java/org/n52/series/db/da/HierarchicalParameterRepository.java
@@ -14,7 +14,7 @@
 public abstract class HierarchicalParameterRepository<E extends HierarchicalEntity<E>, O> extends SessionAwareRepository implements OutputAssembler<O> {
 
     // TODO introduce lambdas here
-    
+
     protected List<O> createExpanded(Collection<E> entities, DbQuery parameters) throws DataAccessException {
         Set<O> results = new HashSet<>();
         if (entities != null) {

diff --git a/spi-impl/series/series-dao/src/main/java/org/n52/series/db/dao/DbQuery.java b/spi-impl/series/series-dao/src/main/java/org/n52/series/db/dao/DbQuery.java
@@ -329,7 +329,10 @@ private Type getGeometryType(String geometryType) {
 
     public Criteria addDetachedFilters(String propertyName, Criteria criteria) {
         DetachedCriteria filter = DetachedCriteria.forClass(DatasetEntity.class)
-                .setProjection(projectionList().add(property(propertyName)));
+                .setProjection(projectionList()
+                        .add(Property.forName(propertyName != null && !propertyName.isEmpty()
+                                ? propertyName
+                                : "pkid")));
 
         filterWithSingularParmameters(filter); // stay backwards compatible
         addFilterRestriction(parameters.getPhenomena(), "phenomenon", filter);