[stable5.6] fix: clean text blocks on user deletion

lib/Db/TextBlockMapper.php

@@ -73,4 +73,11 @@ public function findSharedWithMe(string $userId, array $groups) {
 		return $this->findEntities($qb);
 	}
 
+	public function deleteByUserId(string $userId) {
+		$qb = $this->db->getQueryBuilder();
+		$delete = $qb->delete($this->getTableName())
+			->where($qb->expr()->eq('owner', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
+		$delete->executeStatement();
+	}
+
 }

lib/Listener/UserDeletedListener.php

@@ -11,6 +11,7 @@
 
 use OCA\Mail\Exception\ClientException;
 use OCA\Mail\Service\AccountService;
+use OCA\Mail\Service\TextBlockService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\UserDeletedEvent;
@@ -26,8 +27,11 @@ class UserDeletedListener implements IEventListener {
 	/** @var LoggerInterface */
 	private $logger;
 
-	public function __construct(AccountService $accountService,
-		LoggerInterface $logger) {
+	public function __construct(
+		AccountService $accountService,
+		private TextBlockService $textBlockService,
+		LoggerInterface $logger,
+	) {
 		$this->accountService = $accountService;
 		$this->logger = $logger;
 	}
@@ -52,5 +56,8 @@ public function handle(Event $event): void {
 				]);
 			}
 		}
+		$this->textBlockService->deleteByUserId(
+			$user->getUID()
+		);
 	}
 }

lib/Service/TextBlockService.php

@@ -149,4 +149,8 @@ public function unshare(int $textBlockId, string $shareWith): void {
 		$share = $this->textBlockShareMapper->find($textBlockId, $shareWith);
 		$this->textBlockShareMapper->delete($share);
 	}
+
+	public function deleteByUserId(string $userId): void {
+		$this->textBlockMapper->deleteByUserId($userId);
+	}
 }

tests/Unit/Listener/UserDeletedListenerTest.php

@@ -15,6 +15,7 @@
 use OCA\Mail\Exception\ClientException;
 use OCA\Mail\Listener\UserDeletedListener;
 use OCA\Mail\Service\AccountService;
+use OCA\Mail\Service\TextBlockService;
 use OCP\EventDispatcher\Event;
 use OCP\IUser;
 use OCP\User\Events\UserDeletedEvent;
@@ -23,6 +24,8 @@
 
 class UserDeletedListenerTest extends TestCase {
 	private AccountService&MockObject $accountService;
+
+	private TextBlockService&MockObject $textBlockService;
 	private LoggerInterface&MockObject $logger;
 	private UserDeletedListener $listener;
 
@@ -31,9 +34,11 @@ protected function setUp(): void {
 
 		$this->accountService = $this->createMock(AccountService::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->textBlockService = $this->createMock(TextBlockService::class);
 
 		$this->listener = new UserDeletedListener(
 			$this->accountService,
+			$this->textBlockService,
 			$this->logger
 		);
 	}
@@ -60,6 +65,9 @@ public function testHandleUnrelated(): void {
 		$this->accountService->expects($this->never())
 			->method('findByUserId');
 
+		$this->textBlockService->expects($this->never())
+			->method('deleteByUserId');
+
 		$this->listener->handle($event);
 
 		$this->addToAssertionCount(1);
@@ -80,6 +88,10 @@ public function testHandleUserDeletedWithNoAccounts(): void {
 		$this->logger->expects($this->never())
 			->method('error');
 
+		$this->textBlockService->expects($this->once())
+			->method('deleteByUserId')
+			->with('test-user');
+
 		$this->listener->handle($event);
 	}
 
@@ -97,9 +109,14 @@ public function testHandleUserDeletedWithSingleAccount(): void {
 			->method('delete')
 			->with('test-user', 42);
 
+
 		$this->logger->expects($this->never())
 			->method('error');
 
+		$this->textBlockService->expects($this->once())
+			->method('deleteByUserId')
+			->with('test-user');
+
 		$this->listener->handle($event);
 	}
 
@@ -125,6 +142,10 @@ public function testHandleUserDeletedWithMultipleAccounts(): void {
 		$this->logger->expects($this->never())
 			->method('error');
 
+		$this->textBlockService->expects($this->once())
+			->method('deleteByUserId')
+			->with('test-user');
+
 		$this->listener->handle($event);
 	}
 
@@ -152,6 +173,10 @@ public function testHandleUserDeletedWithClientException(): void {
 				['exception' => $exception]
 			);
 
+		$this->textBlockService->expects($this->once())
+			->method('deleteByUserId')
+			->with('test-user');
+
 		$this->listener->handle($event);
 	}
 
@@ -184,6 +209,9 @@ public function testHandleUserDeletedWithPartialFailure(): void {
 				'Could not delete user\'s Mail account: Failed to delete account 2',
 				['exception' => $exception]
 			);
+		$this->textBlockService->expects($this->once())
+			->method('deleteByUserId')
+			->with('test-user');
 
 		$this->listener->handle($event);
 	}

tests/Unit/Service/TextBlockServiceTest.php

@@ -338,5 +338,12 @@ public function testGetShares(): void {
 		$this->assertSame($shares, $result);
 	}
 
+	public function testDeleteByUserId(): void {
+		$userId = 'toBeDeleted';
+		$this->textBlockMapper->expects($this->once())
+			->method('deleteByUserId')
+			->with($userId);
+		$this->textBlockService->deleteByUserId($userId);
+	}
 
 }