Merge pull request #84 from LaswitchTech/dev

General: Version bumped to v0.0.84

Author: LouisOuellet

VERSION

@@ -1 +1 @@
-v0.0.83
+v0.0.84

src/Base/BaseModel.php

@@ -535,37 +535,6 @@ public function delete(int $id): int
         return $Query->execute();
     }
 
-    /**
-     * Retrieve the count of records
-     *
-     * @param array $conditions
-     * @return int
-     */
-    public function count(array $conditions = [], string $conjunction = 'AND'): int
-    {
-        // Create the Query
-        $Query = $this->Database->query()
-            ->table($this->table)
-            ->select($this->primary)
-            ->where('id', 9999, '<>');
-
-        // Check for ownership
-        if(array_key_exists('organization',$this->definition)){
-            $Query->where('organization', $this->Auth->user()->organization()->id);
-        }
-
-        // Add the Conditions
-        foreach($conditions as $condition){
-            $Query->where($condition["key"], $condition["value"], $condition["operator"], $conjunction);
-        }
-
-        // Execute the Query
-        $records = $Query->fetch();
-
-        // Return the Count
-        return count($records);
-    }
-
     /**
      * Retrieve multiple records
      *
@@ -624,6 +593,17 @@ public function fetchAll(array $conditions = [], string $conjunction = 'AND'): a
         return $records;
     }
 
+    /**
+     * Retrieve the count of records
+     *
+     * @param array $conditions
+     * @return int
+     */
+    public function count(array $conditions = [], string $conjunction = 'AND'): int
+    {
+        return count($this->fetchAll($conditions, $conjunction));
+    }
+
     /**
      * Retrieve a single record
      *