nodester 0.3.0 → 0.3.1

package/lib/query/traverse.js

@@ -171,6 +171,7 @@ function traverse(queryNode, filter=null, model=null) {
 
 	const clausesEntries = Object.entries(clauses);
 	for (let [clauseName, value] of clausesEntries) {
+
 		// If clause is not available:
 		if (filter != null) {
 			if (filter.clauses.indexOf(clauseName) === -1)
@@ -270,7 +271,7 @@ function traverse(queryNode, filter=null, model=null) {
 
 			case null:
 			case undefined:
-				newQuery.order = [ ['id', 'desc'] ];
+				// newQuery.order = [ ['id', 'desc'] ];
 				break;
 
 			default:
@@ -298,13 +299,22 @@ function traverse(queryNode, filter=null, model=null) {
 
 
 	// Where:
+
+	//	Set aatributes from Query:
 	const whereEntries = Object.entries(where);
-	for (let [attribute, value] of whereEntries) {
-		_parseWhereEntry(attribute, value, newQuery.where, filter.statics.attributes);
+	for (let [ attribute, value ] of whereEntries) {
+		_parseWhereEntry(attribute, value, newQuery.where);
+	}
+
+	//	Static attributes override previously set attributes:
+	const staticAttributesEntries = Object.entries(filter.statics.attributes);
+	for (let [ attribute, staticValue ] of staticAttributesEntries) {
+		newQuery.where[attribute] = _parseValue(staticValue, attribute);
 	}
 
-	// If "where" was not set:
-	if (whereEntries.length === 0) {
+	//	If "where" was not set in any way,
+	// 	remove it from the db query:
+	if (Object.entries(newQuery.where).length === 0) {
 		delete newQuery.where;
 	}
 	// Where\
@@ -360,9 +370,8 @@ function _addAssociationQuery(associationQuery, includeName, resultQuery) {
 }
 
 
-function _parseWhereEntry(attribute, value, whereHolder, staticAttributes) {
+function _parseWhereEntry(attribute, value, whereHolder) {
 	let _value = value;
-	const staticAttribute = staticAttributes[attribute];
 
 	// If attribute is Op (not, like, or, etc.):
 	if (attribute in Op) {
@@ -373,12 +382,6 @@ function _parseWhereEntry(attribute, value, whereHolder, staticAttributes) {
 		whereHolder[op] = _value;
 		return;
 	}
-	
-	// Static value overrides any other:
-	if (!!staticAttribute) {
-		whereHolder[attribute] = staticAttribute;
-		return;
-	}
 
 	whereHolder[attribute] = _parseValue(_value, attribute);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",