Adds Utilities.checkConditions() (#293)

dresende · Aug 8, 2013 · fdc7862 · fdc7862
1 parent ad97778
commit fdc7862
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/lib/Model.js b/lib/Model.js
@@ -25,7 +25,7 @@ function Model(opts) {
 	opts = opts || {};
 
 	if (!Array.isArray(opts.id)) {
-		opts.id = [opts.id];
+		opts.id = [ opts.id ];
 	}
 
 	var one_associations       = [];
@@ -365,6 +365,9 @@ function Model(opts) {
 		if (order) {
 			order = Utilities.standardizeOrder(order);
 		}
+		if (conditions) {
+			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+		}
 
 		var chain = new ChainFind(model, {
 			only         : options.only || model_fields,
@@ -460,6 +463,10 @@ function Model(opts) {
 			throw ErrorCodes.generateError(ErrorCodes.MISSING_CALLBACK, "Missing Model.count() callback");
 		}
 
+		if (conditions) {
+			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+		}
+
 		opts.driver.count(opts.table, conditions, {}, function (err, data) {
 			if (err || data.length === 0) {
 				return cb(err);
@@ -483,6 +490,10 @@ function Model(opts) {
 			}
 		}
 
+		if (conditions) {
+			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+		}
+
 		return new require("./AggregateFunctions")({
 			table       : opts.table,
 			driver_name : opts.driver_name,
@@ -516,6 +527,10 @@ function Model(opts) {
 			}
 		}
 
+		if (conditions) {
+			conditions = Utilities.checkConditions(conditions, model_fields, one_associations);
+		}
+
 		opts.driver.count(opts.table, conditions, {}, function (err, data) {
 			if (err || data.length === 0) {
 				return cb(err);

diff --git a/lib/Utilities.js b/lib/Utilities.js
@@ -44,6 +44,35 @@ exports.standardizeOrder = function (order) {
 	return new_order;
 };
 
+/**
+ * Checks for:
+ *
+ * A) condition keys being association names of a model;
+ * B) condition values being instances;
+ */
+exports.checkConditions = function (conditions, model_fields, one_associations) {
+	for (var k in conditions) {
+		if (!conditions.hasOwnProperty(k)) continue;
+
+		// B)
+		if (conditions[k].isInstance) {
+			conditions[k] = conditions[k][conditions[k].model().id];
+		}
+
+		// A)
+		if (model_fields.indexOf(k) == -1) {
+			for (var i = 0; i < one_associations.length; i++) {
+				if (one_associations[i].name == k) {
+					conditions[Object.keys(one_associations[i].field).pop()] = conditions[k];
+					delete conditions[k];
+				}
+			}
+		}
+	}
+
+	return conditions;
+};
+
 /**
  * Gets all the values within an object or array, optionally
  * using a keys array to get only specific values