Upgraded to Query API

Author: technicalguru

composer.json

@@ -14,7 +14,7 @@
 		"php" : ">=7.0.0",
 		"technicalguru/vault" : "^1",
 		"technicalguru/utils" : "^1",
-		"technicalguru/database" : "~1.2",
+		"technicalguru/database" : "~1.3",
 		"technicalguru/i18n" : "^1",
 		"technicalguru/rest-client" : "^1",
 		"technicalguru/email" : "^1",

src/WebApp/DataModel/LogDAO.php

@@ -3,6 +3,7 @@
 namespace WebApp\DataModel;
 
 use TgUtils\Date;
+use TgDatabase\Restrictions;
 use WebApp\WebAppException;
 
 class LogDAO extends \TgDatabase\DAO {
@@ -29,14 +30,12 @@ public function createTable() {
 	}
 
 	public function deleteAll() {
-		$sql = 'DELETE FROM '.$this->database->quoteName($this->tableName);
-		$this->database->query($sql);
+		return $this->createQuery()->delete();
 	}
 
 	public function housekeeping($days = 30) {
-		$this->threshold = new Date(time()-$days*Date::SECONDS_PER_DAY, WFW_TIMEZONE);
-		$sql = 'DELETE FROM '.$this->database->quoteName($this->tableName).' WHERE log_date < '.$this->database->prepareValue($threshold);
-		$this->database->query($sql);
+		$threshold = new Date(time()-$days*Date::SECONDS_PER_DAY, WFW_TIMEZONE);
+		$this->createQuery(NULL, Restrictions::lt('log_date', $threshold))->delete();
 	}
 }
 

src/WebApp/DataModel/SessionDAO.php

@@ -3,6 +3,7 @@
 namespace WebApp\DataModel;
 
 use TgUtils\Date;
+use TgDatabase\Restrictions;
 use WebApp\WebAppException;
 
 /** DataModel class for sessions */
@@ -41,7 +42,9 @@ public function create($object) {
 
 	public function expire($maxlifetime) {
 		$now    = new Date(time(), WFW_TIMEZONE);
-		$expiry = $now->toMysql(TRUE);
-		$this->deleteBy(array(array('expiry_time', $expiry, '<'), array('persistent', 0)));
+		$this->createQuery(NULL, array(
+			Restrictions::lt('expiry_time', $now),
+			Restrictions::eq('persistent', 0),
+		))->delete();
 	}
 }

src/WebApp/DataModel/UserDAO.php

@@ -47,12 +47,22 @@ public function createTable() {
 	}
 
 	public function getByEmail($email) {
-		return $this->findSingle(array('email' => trim(strtolower($email)), array('status', User::STATUS_DELETED, '!=')));
+		return $this->findSingle(
+			array(
+				Restrictions::eq('email', $email)->ignoreCase(),
+				Restrictions::ne('status', User::STATUS_DELETED)
+			)
+		);
 	}
 
 	public function findByRole($role) {
 		$rc = array();
-		$users = $this->find(array('status' => 'active', array('roles', '%'.$role.'%', 'LIKE')));
+		$users = $this->find(
+			array(
+				Restrictions::eq('status', 'active'),
+				Restrictions::like('roles', '%'.$role.'%')
+			)
+		);
 		foreach ($users AS $user) {
 			if ($user->hasRole($role)) {
 				$rc[] = $user;
@@ -75,7 +85,7 @@ public function getSearchInRestriction($s, $property) {
 					$r->add(Restrictions::like('email', '%'.$s.'%')->ignoreCase());
 				}
 			}
-			$users = $this->createCriteria()->add($r)->add(Restrictions::ne('status', User::STATUS_DELETED))->list();
+			$users = $this->createQuery(NULL, $r)->add(Restrictions::ne('status', User::STATUS_DELETED))->list();
 			$uids  = \TgUtils\Utils::extractAttributeFromList($users, 'uid');
 			if (count($uids) == 0) $uids[] = -1;
 			return Restrictions::in($property, $uids);