Validator fix

entity/queryStructValidator.go

@@ -33,11 +33,11 @@ func getIllegalToFromInRelation(JSONQuery IncomingQueryJSON, minEntityID int, ma
 		toGroupByValid := relationToValid(rel, GROUPBYSTRING, minGroupByID, maxGroupByID)
 		fromEntityValid := relationFromValid(rel, ENTITYSTRING, minEntityID, maxEntityID)
 		fromGroupByValid := relationFromValid(rel, GROUPBYSTRING, minGroupByID, maxGroupByID)
-		if !toEntityValid || !toGroupByValid {
+		if !(toEntityValid || toGroupByValid) {
 			err := errors.New("relation has invalid TO type and/or ID")
 			ret = append(ret, err)
 		}
-		if !fromEntityValid || !fromGroupByValid {
+		if !(fromEntityValid || fromGroupByValid) {
 			err := errors.New("relation has invalid FROM type and/or ID")
 			ret = append(ret, err)
 		}
@@ -52,11 +52,11 @@ func getIllegalToFromInGroupBy(JSONQuery IncomingQueryJSON, minEntityID int, max
 		groupRelationValid := groupByGroupValid(groupBy, RELATIONSTRING, minRelationID, maxRelationID)
 		byEntityValid := groupByByValid(groupBy, ENTITYSTRING, minEntityID, maxEntityID)
 		byRelationValid := groupByByValid(groupBy, RELATIONSTRING, minRelationID, maxRelationID)
-		if !groupEntityValid || !groupRelationValid {
+		if !(groupEntityValid || groupRelationValid) {
 			err := errors.New("relation has invalid TO type and/or ID")
 			ret = append(ret, err)
 		}
-		if !byEntityValid || !byRelationValid {
+		if !(byEntityValid || byRelationValid) {
 			err := errors.New("relation has invalid FROM type and/or ID")
 			ret = append(ret, err)
 		}