fix(reset): Reset all document sessions on upgrades from 3.9.1 or below

Fixes: #5420 Fixes: nextcloud/collectives#1270 Signed-off-by: Jonas <[email protected]>
nextcloud · Jun 12, 2024 · 26501e1 · 26501e1
1 parent e994732
commit 26501e1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -11,7 +11,7 @@
 - **💾 Open format:** Files are saved as [Markdown](https://en.wikipedia.org/wiki/Markdown), so you can edit them from any other text app too.
 - **✊ Strong foundation:** We use [🐈 tiptap](https://tiptap.scrumpy.io) which is based on [🦉 ProseMirror](https://prosemirror.net) – huge thanks to them!
 	]]></description>
-	<version>3.9.1</version>
+	<version>3.9.2</version>
 	<licence>agpl</licence>
 	<author mail="[email protected]">Julius Härtl</author>
 	<namespace>Text</namespace>

diff --git a/lib/Migration/ResetSessionsBeforeYjs.php b/lib/Migration/ResetSessionsBeforeYjs.php
@@ -2,54 +2,48 @@
 
 namespace OCA\Text\Migration;
 
-use OCA\Text\Db\SessionMapper;
+use OCA\Text\Db\Document;
 use OCA\Text\Service\DocumentService;
 use OCP\IConfig;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
 class ResetSessionsBeforeYjs implements IRepairStep {
 	private IConfig $config;
-	private SessionMapper $sessionMapper;
 	private DocumentService $documentService;
 
 	public function __construct(IConfig $config,
-		SessionMapper $sessionMapper,
 		DocumentService $documentService) {
 		$this->config = $config;
-		$this->sessionMapper = $sessionMapper;
 		$this->documentService = $documentService;
 	}
 
 	/**
 	 * @return string
 	 */
 	public function getName(): string {
-		return 'Force-reset all Text sessions before Yjs migration';
+		return 'Force-reset all Text document sessions';
 	}
 
-	/**
-	 * @param IOutput $output
-	 *
-	 * @return void
-	 */
 	public function run(IOutput $output): void {
 		$appVersion = $this->config->getAppValue('text', 'installed_version');
 
-		if (!$appVersion || version_compare($appVersion, '3.7.2') !== -1) {
+		if (!$appVersion || version_compare($appVersion, '3.9.2') !== -1) {
 			return;
 		}
 
-		$sessions = $this->sessionMapper->findAllDocuments();
-		if (!$sessions) {
+		$fileIds = array_map(static function (Document $document) {
+			return $document->getId();
+		}, $this->documentService->getAll());
+
+		if (!$fileIds) {
 			return;
 		}
 
-		$output->startProgress(count($sessions));
-		foreach ($sessions as $session) {
-			$documentId = $session->getDocumentId();
-			$this->documentService->unlock($documentId);
-			$this->documentService->resetDocument($documentId, true);
+		$output->startProgress(count($fileIds));
+		foreach ($fileIds as $fileId) {
+			$this->documentService->unlock($fileId);
+			$this->documentService->resetDocument($fileId, true);
 			$output->advance();
 		}
 		$output->finishProgress();