Query with property conditions for entities that do not have property sets assigned

[hlg]

Queries with property conditions will ignore the condition for entities that do not have any property sets assigned. I don't think that is the semantics we want - not 100% sure though.

For example, the following query will include walls without property sets in the result:

{
  "type": {
    "name": "IfcWall",
    "includeAllSubTypes": true
  },
  "properties": {
    "Pset_WallCommon": {
      "IsExternal": false
    }
  }
}

[hlg]

In the following piece of code, lines 113 and 137-140 should go outside (before and after) the if-condition to have currentObject set to null when there are no property sets at all for the current object, but at least one property condition in the query.

BIMserver/BimServer/src/org/bimserver/database/queries/QueryPropertiesAndTypesStackFrame.java

Lines 107 to 141 in 0ee3d93

	List<Long> isDefinedByOids = (List<Long>) currentObject.get("IsDefinedBy");
	int totalQueryProperties = 0;
	for (String key : this.properties.keySet()) {
	totalQueryProperties += this.properties.get(key).count();
	}
	if (isDefinedByOids != null) {
	Set<String> propertyKeysMatched = new HashSet<>();
	for (Long definedByOid : isDefinedByOids) {
	EClass eClass = databaseSession.getEClassForOid(definedByOid);
	if (getPackageMetaData().getEClass("IfcRelDefinesByProperties").isSuperTypeOf(eClass)) {
	HashMapVirtualObject ifcRelDefinesByProperties = getByOid(definedByOid);
	Long ifcPropertySetDefinition = (Long) ifcRelDefinesByProperties.get("RelatingPropertyDefinition");
	processPropertySet(databaseSession, propertyKeysMatched, ifcPropertySetDefinition);
	} else if (getPackageMetaData().getEClass("IfcRelDefinesByType").isSuperTypeOf(eClass)){
	HashMapVirtualObject ifcRelDefinesByType = getByOid(definedByOid);
	Long relatingTypeId = (Long) ifcRelDefinesByType.get("RelatingType");
	EClass eClassForOid = databaseSession.getEClassForOid(relatingTypeId);
	if (getPackageMetaData().getEClass("IfcTypeObject").isSuperTypeOf(eClassForOid)) {
	HashMapVirtualObject ifcTypeObject = getByOid(relatingTypeId);
	List<Long> propertySets = (List<Long>) ifcTypeObject.get("HasPropertySets");
	if (propertySets != null) {
	for (Long propertySetId : propertySets) {
	processPropertySet(databaseSession, propertyKeysMatched, propertySetId);
	}
	}
	}
	} else {
	LOGGER.info(eClass.getName());
	}
	}
	if (propertyKeysMatched.size() != totalQueryProperties) {
	// All properties should have matched, atm all properties provided in the query are evaluated as AND
	currentObject = null;
	}
	}