Skip to content

[stable27] Reset all sessions (in occ command and on upgrade) #5891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
backportbot wants to merge 2 commits into from
Closed

[stable27] Reset all sessions (in occ command and on upgrade) #5891

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be0b7b6
feat(reset): Add `--all` option to `text:reset` occ command
mejo- Jun 11, 2024
a74ae06
fix(reset): Reset all document sessions on upgrades from 4.0.0 or below
mejo- Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(reset): Reset all document sessions on upgrades from 4.0.0 or below 
Fixes: #5420

Fixes: nextcloud/collectives#1270

Signed-off-by: Jonas <[email protected]>

[skip ci]
  • Loading branch information
@mejo- @backportbot
mejo- authored and backportbot[bot] committed Jun 12, 2024
commit a74ae06ca99d27981c13084b31354073089c738c
27 changes: 12 additions & 15 deletions lib/Migration/ResetSessionsBeforeYjs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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;
Expand All @@ -25,31 +25,28 @@ public function __construct(IConfig $config,
* @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, '4.0.1') !== -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();
Expand Down