lib: refactor query builder handling

Rather than having to remember to reset the query builder in each method that uses it, these are now created on-demand from the db connection. Signed-off-by: Maximilian Bosch <[email protected]>
nextcloud · Oct 10, 2024 · 176491b · 176491b
1 parent cf2b9b2
commit 176491b
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 106 deletions.
diff --git a/lib/Controller/ContactsController.php b/lib/Controller/ContactsController.php
@@ -34,7 +34,6 @@ class ContactsController extends Controller {
 	private $contactsManager;
 	private $addressService;
 	private $dbconnection;
-	private $qb;
 	private $cdBackend;
 	private $avatarManager;
 	private $root;
@@ -69,7 +68,6 @@ public function __construct(
 		$this->contactsManager = $contactsManager;
 		$this->addressService = $addressService;
 		$this->dbconnection = $dbconnection;
-		$this->qb = $dbconnection->getQueryBuilder();
 		$this->cdBackend = $cdBackend;
 		$this->root = $root;
 		$this->urlGenerator = $urlGenerator;
@@ -669,7 +667,7 @@ private function getAddressBooksReadOnly(): array {
 	 * @throws \OCP\DB\Exception
 	 */
 	private function setAddressCoordinates(float $lat, float $lng, string $adr, string $uri): void {
-		$qb = $this->qb;
+		$qb = $this->dbconnection->getQueryBuilder();
 		$adr_norm = strtolower(preg_replace('/\s+/', '', $adr));
 
 		$qb->select('id')
@@ -703,7 +701,6 @@ private function setAddressCoordinates(float $lat, float $lng, string $adr, stri
 			$req = $qb->execute();
 			$id = $qb->getLastInsertId();
 		}
-		$qb = $this->dbconnection->getQueryBuilder();
 	}
 
 

diff --git a/lib/Controller/PublicContactsController.php b/lib/Controller/PublicContactsController.php
@@ -39,7 +39,6 @@
 class PublicContactsController extends PublicPageController {
 	protected IManager $contactsManager;
 	protected AddressService $addressService;
-	protected IQueryBuilder $qb;
 	protected CardDavBackend $cdBackend;
 	protected IAvatarManager $avatarManager;
 	protected IRootFolder $root;
@@ -64,7 +63,6 @@ public function __construct(
 		$this->avatarManager = $avatarManager;
 		$this->contactsManager = $contactsManager;
 		$this->addressService = $addressService;
-		$this->qb = $dbconnection->getQueryBuilder();
 		$this->cdBackend = $cdBackend;
 		$this->root = $root;
 	}

diff --git a/lib/Service/AddressService.php b/lib/Service/AddressService.php
@@ -39,7 +39,6 @@
  * @package OCA\Maps\Service
  */
 class AddressService {
-	private $qb;
 	private $dbconnection;
 	private $jobList;
 	private $appData;
@@ -55,7 +54,6 @@ public function __construct(
 		IDBConnection $dbconnection,
 	) {
 		$this->dbconnection = $dbconnection;
-		$this->qb = $dbconnection->getQueryBuilder();
 		$this->memcache = $cacheFactory->createLocal('maps');
 		$this->jobList = $jobList;
 		$this->appData = $appData;
@@ -78,11 +76,12 @@ public function addressToGeo($adr, $uri): string {
 	 */
 	public function lookupAddress($adr, $uri): array {
 		$adr_norm = strtolower(preg_replace('/\s+/', '', $adr));
-		$this->qb->select('id', 'lat', 'lng', 'looked_up')
+		$qb = $this->dbconnection->getQueryBuilder();
+		$qb->select('id', 'lat', 'lng', 'looked_up')
 			->from('maps_address_geo')
-			->where($this->qb->expr()->eq('object_uri', $this->qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR)))
-			->andWhere($this->qb->expr()->eq('adr_norm', $this->qb->createNamedParameter($adr_norm, IQueryBuilder::PARAM_STR)));
-		$req = $this->qb->execute();
+			->where($qb->expr()->eq('object_uri', $qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('adr_norm', $qb->createNamedParameter($adr_norm, IQueryBuilder::PARAM_STR)));
+		$req = $qb->execute();
 		$lat = null;
 		$lng = null;
 		$inDb = false;
@@ -122,14 +121,13 @@ public function lookupAddress($adr, $uri): array {
 
 		} else {
 			if ($lookedUp) {
-				$this->qb->update('maps_address_geo')
+				$qb->update('maps_address_geo')
 					->set('lat', $qb->createNamedParameter($lat, IQueryBuilder::PARAM_STR))
 					->set('lng', $qb->createNamedParameter($lng, IQueryBuilder::PARAM_STR))
 					->set('object_uri', $qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR))
 					->set('looked_up', $qb->createNamedParameter($lookedUp, IQueryBuilder::PARAM_BOOL))
-					->where($this->qb->expr()->eq('id', $this->qb->createNamedParameter($id, IQueryBuilder::PARAM_STR)));
-				$req = $this->qb->execute();
-				$qb = $this->dbconnection->getQueryBuilder();
+					->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_STR)));
+				$req = $qb->execute();
 			}
 		}
 
@@ -149,11 +147,11 @@ private function lookupAddressInternal($adr): array {
 
 		$adr_norm = strtolower(preg_replace('/\s+/', '', $adr));
 
-		$this->qb->select('lat', 'lng')
+		$qb->select('lat', 'lng')
 			->from('maps_address_geo')
-			->where($this->qb->expr()->eq('looked_up', $this->qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL)))
-			->andWhere($this->qb->expr()->eq('adr_norm', $this->qb->createNamedParameter($adr_norm, IQueryBuilder::PARAM_STR)));
-		$req = $this->qb->execute();
+			->where($qb->expr()->eq('looked_up', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL)))
+			->andWhere($qb->expr()->eq('adr_norm', $qb->createNamedParameter($adr_norm, IQueryBuilder::PARAM_STR)));
+		$req = $qb->execute();
 		while ($row = $req->fetch()) {
 			$res[0] = $row['lat'];
 			$res[1] = $row['lng'];
@@ -236,7 +234,7 @@ public function scheduleVCardForLookup($cardData, $cardUri) {
 	}
 
 	private function cleanUpDBContactAddresses($vCard, $uri) {
-		$qb = $this->qb;
+		$qb = $this->dbconnection->getQueryBuilder();
 		// get all vcard addresses
 		$vCardAddresses = [];
 		foreach ($vCard->children() as $property) {
@@ -247,36 +245,34 @@ private function cleanUpDBContactAddresses($vCard, $uri) {
 		}
 		// check which addresses from DB is not in the vCard anymore
 		$adrIdToDelete = [];
-		$this->qb->select('id', 'adr')
+		$qb->select('id', 'adr')
 			->from('maps_address_geo')
-			->where($this->qb->expr()->eq('object_uri', $this->qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR)));
-		$req = $this->qb->execute();
+			->where($qb->expr()->eq('object_uri', $qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR)));
+		$req = $qb->execute();
 		while ($row = $req->fetch()) {
 			if (!in_array($row['adr'], $vCardAddresses)) {
 				array_push($adrIdToDelete, $row['id']);
 			}
 		}
 		$req->closeCursor();
-		$qb = $this->dbconnection->getQueryBuilder();
 
 		foreach ($adrIdToDelete as $id) {
+			$qb = $this->dbconnection->getQueryBuilder();
 			$qb->delete('maps_address_geo')
 				->where(
 					$qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT))
 				);
 			$req = $qb->execute();
-			$qb = $this->dbconnection->getQueryBuilder();
 		}
 	}
 
 	public function deleteDBContactAddresses($uri) {
-		$qb = $this->qb;
+		$qb = $this->dbconnection->getQueryBuilder();
 		$qb->delete('maps_address_geo')
 			->where(
 				$qb->expr()->eq('object_uri', $qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR))
 			);
 		$req = $qb->execute();
-		$qb = $this->dbconnection->getQueryBuilder();
 	}
 
 	// schedules the address for an external lookup
@@ -287,18 +283,18 @@ private function scheduleForLookup($adr, $uri): array {
 			$geo = $this->lookupAddressExternal($adr);
 		}
 		$adr_norm = strtolower(preg_replace('/\s+/', '', $adr));
-		$this->qb->insert('maps_address_geo')
+		$qb = $this->dbconnection->getQueryBuilder();
+		$qb->insert('maps_address_geo')
 			->values([
-				'adr' => $this->qb->createNamedParameter($adr, IQueryBuilder::PARAM_STR),
-				'adr_norm' => $this->qb->createNamedParameter($adr_norm, IQueryBuilder::PARAM_STR),
-				'object_uri' => $this->qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR),
-				'lat' => $this->qb->createNamedParameter($geo[0], IQueryBuilder::PARAM_STR),
-				'lng' => $this->qb->createNamedParameter($geo[1], IQueryBuilder::PARAM_STR),
-				'looked_up' => $this->qb->createNamedParameter($geo[2], IQueryBuilder::PARAM_BOOL),
+				'adr' => $qb->createNamedParameter($adr, IQueryBuilder::PARAM_STR),
+				'adr_norm' => $qb->createNamedParameter($adr_norm, IQueryBuilder::PARAM_STR),
+				'object_uri' => $qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR),
+				'lat' => $qb->createNamedParameter($geo[0], IQueryBuilder::PARAM_STR),
+				'lng' => $qb->createNamedParameter($geo[1], IQueryBuilder::PARAM_STR),
+				'looked_up' => $qb->createNamedParameter($geo[2], IQueryBuilder::PARAM_BOOL),
 			]);
-		$req = $this->qb->execute();
-		$id = $this->qb->getLastInsertId();
-		$qb = $this->dbconnection->getQueryBuilder();
+		$req = $qb->execute();
+		$id = $qb->getLastInsertId();
 		if (!$geo[2]) {
 			$this->jobList->add(LookupMissingGeoJob::class, []);
 		}
@@ -310,11 +306,12 @@ private function scheduleForLookup($adr, $uri): array {
 	public function lookupMissingGeo($max = 200):bool {
 		// stores if all addresses where looked up
 		$lookedUpAll = true;
-		$this->qb->select('adr', 'object_uri')
+		$qb = $this->dbconnection->getQueryBuilder();
+		$qb->select('adr', 'object_uri')
 			->from('maps_address_geo')
-			->where($this->qb->expr()->eq('looked_up', $this->qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
+			->where($qb->expr()->eq('looked_up', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
 			->setMaxResults($max);
-		$req = $this->qb->execute();
+		$req = $qb->execute();
 		$result = $req->fetchAll();
 		$req->closeCursor();
 		$i = 0;