improve-findById

XadillaX · Nov 24, 2015 · 50b4a6e · 50b4a6e
1 parent b855545
commit 50b4a6e
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -260,17 +260,35 @@ Model.prototype.where = function(condition) {
  * @param [withJson]
  * @returns {*}
  */
-Model.prototype.findById = function(_id, callback, withJson) {
+Model.prototype.findById = function (_id, callback, withJson) {
     var id = _id;
-    if(this.primaryKeys.length === 1 && typeof _id !== "object") {
+    var self = this;
+    if (this.primaryKeys.length === 1 && typeof _id !== "object") {
         id = {};
         id[this.primaryKeys[0].name] = _id;
     }
 
-    if(typeof id !== "object") {
+    if (typeof id !== "object") {
         return callback(new Error("You should pass a valid IDs object."));
     }
 
+    if (this.cache) {
+        return this.cache.getData(this.toshihiko.database, this.name, id, function (err, data) {
+            if (err) {
+                data = [];
+            }
+            if (data.length !== 0) {
+                var yukari = new Yukari(self, "query");
+                yukari._initRow(data[0]);
+                if (withJson) {
+                    yukari = yukari.toJSON();
+                }
+                return callback(null, yukari);
+            }
+            return self.where(id).findOne(callback, withJson);
+        })
+    }
+
     return this.where(id).findOne(callback, withJson);
 };