Merge pull request #1583 from nextcloud/bugfix/1572/delete-settings-o…

…n-user-deletion

fix(settings): Delete settings when a user is deleted

lib/Listener/UserDeletedListener.php

@@ -5,6 +5,7 @@
 /**
  * @copyright Copyright (c) 2020, Daniel Kesselberg <mail@danielkesselberg.de>
  *
+ * @author Joas Schilling <coding@schilljs.com>
  * @author Daniel Kesselberg <mail@danielkesselberg.de>
  *
  * @license AGPL-3.0-or-later
@@ -27,6 +28,7 @@
 namespace OCA\Notifications\Listener;
 
 use OCA\Notifications\Handler;
+use OCA\Notifications\Model\SettingsMapper;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\UserDeletedEvent;
@@ -36,9 +38,14 @@
  */
 class UserDeletedListener implements IEventListener {
 	private Handler $handler;
+	private SettingsMapper $settingsMapper;
 
-	public function __construct(Handler $handler) {
+	public function __construct(
+		Handler $handler,
+		SettingsMapper $settingsMapper,
+	) {
 		$this->handler = $handler;
+		$this->settingsMapper = $settingsMapper;
 	}
 
 	public function handle(Event $event): void {
@@ -49,5 +56,6 @@ public function handle(Event $event): void {
 
 		$user = $event->getUser();
 		$this->handler->deleteByUser($user->getUID());
+		$this->settingsMapper->deleteSettingsByUser($user->getUID());
 	}
 }

lib/Model/SettingsMapper.php

@@ -61,6 +61,19 @@ public function getSettingsByUser(string $userId): Settings {
 		return $this->findEntity($query);
 	}
 
+	/**
+	 * @param string $userId
+	 * @throws DBException
+	 */
+	public function deleteSettingsByUser(string $userId): void {
+		$query = $this->db->getQueryBuilder();
+
+		$query->delete($this->getTableName())
+			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
+
+		$query->executeStatement();
+	}
+
 	public function setBatchSettingForUser(string $userId, int $batchSetting): void {
 		try {
 			$settings = $this->getSettingsByUser($userId);