Check for existence of Soft Deletes on certain methods

src/PaulGoodfield/EloquentBaseRepo/BaseRepository.php

@@ -36,7 +36,16 @@ public function all($columns = array('*'), $order = array())
 	 */
 	public function find($id, $columns = array('*'))
 	{
-		$model = $this->model->withTrashed()->find($id, $columns);
+		if ($this->usesSoftDeletes($this->model))
+		{
+			$model = $this->model->withTrashed();
+		}
+		else
+		{
+			$model = $this->model;
+		}
+
+		$model = $model->find($id, $columns);
 
 		if (is_null($model))
 		{
@@ -73,7 +82,32 @@ public function findWhere($fieldvals = array(), $columns = array('*'), $order =
 				$query->orderBy($key, $val);
 			}
 		}
-		return $this->convertCollection($query->withTrashed()->get());
+
+		if ($this->usesSoftDeletes($this->model))
+		{
+			$collection = $query->withTrashed()->get();
+		}
+		else
+		{
+			$collection = $query->get();
+		}
+
+		return $this->convertCollection($collection);
+	}
+
+	/**
+	 * Determines if current model uses soft deletes
+	 * @return boolean
+	 */
+	private function usesSoftDeletes($model)
+	{
+		$traits = class_uses($model);
+		if (in_array('Illuminate\Database\Eloquent\SoftDeletes', $traits))
+		{
+			return true;
+		}
+
+		return false;
 	}
 
 	/**
@@ -193,8 +227,7 @@ public function convertModel($model)
 		$return = (object) $model->toArray();
 
 		// Check if model has soft deletes
-		$traits = class_uses($model);
-		if (in_array('Illuminate\Database\Eloquent\SoftDeletes', $traits))
+		if ($this->usesSoftDeletes($model))
 		{
 			$return->trashed = ($model->trashed()) ? true : false;
 		}