Skip to content

Commit 87fac7a

Browse files
committed
Add configuration flag to disable the background job for files_versions
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
1 parent 339c6ed commit 87fac7a

2 files changed

Lines changed: 90 additions & 3 deletions

File tree

apps/files_versions/lib/BackgroundJob/ExpireVersions.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,41 @@
2727

2828
use OCA\Files_Versions\Expiration;
2929
use OCA\Files_Versions\Storage;
30+
use OCP\IConfig;
3031
use OCP\IUser;
3132
use OCP\IUserManager;
3233

3334
class ExpireVersions extends \OC\BackgroundJob\TimedJob {
3435
public const ITEMS_PER_SESSION = 1000;
3536

37+
/** @var IConfig */
38+
private $config;
39+
3640
/**
3741
* @var Expiration
3842
*/
3943
private $expiration;
40-
44+
4145
/**
4246
* @var IUserManager
4347
*/
4448
private $userManager;
4549

46-
public function __construct(IUserManager $userManager, Expiration $expiration) {
50+
public function __construct(IConfig $config, IUserManager $userManager, Expiration $expiration) {
4751
// Run once per 30 minutes
4852
$this->setInterval(60 * 30);
4953

54+
$this->config = $config;
5055
$this->expiration = $expiration;
5156
$this->userManager = $userManager;
5257
}
5358

54-
protected function run($argument) {
59+
public function run($argument) {
60+
$backgroundJob = $this->config->getAppValue('files_versions', 'background_job_expire_versions', 'yes');
61+
if ($backgroundJob === 'no') {
62+
return;
63+
}
64+
5565
$maxAge = $this->expiration->getMaxAgeAsTimestamp();
5666
if (!$maxAge) {
5767
return;
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?php
2+
/**
3+
* @copyright 2021 Daniel Kesselberg <mail@danielkesselberg.de>
4+
*
5+
* @author Daniel Kesselberg <mail@danielkesselberg.de>
6+
*
7+
* @license GNU AGPL version 3 or any later version
8+
*
9+
* This program is free software: you can redistribute it and/or modify
10+
* it under the terms of the GNU Affero General Public License as
11+
* published by the Free Software Foundation, either version 3 of the
12+
* License, or (at your option) any later version.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU Affero General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Affero General Public License
20+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
21+
*
22+
*/
23+
24+
namespace OCA\Files_Versions\Tests\BackgroundJob;
25+
26+
use OCA\Files_Versions\BackgroundJob\ExpireVersions;
27+
use OCA\Files_Versions\Expiration;
28+
use OCP\BackgroundJob\IJobList;
29+
use OCP\IConfig;
30+
use OCP\ILogger;
31+
use OCP\IUserManager;
32+
use PHPUnit\Framework\MockObject\MockObject;
33+
use Test\TestCase;
34+
35+
class ExpireVersionsTest extends TestCase {
36+
37+
/** @var IConfig|MockObject */
38+
private $config;
39+
40+
/** @var IUserManager|MockObject */
41+
private $userManager;
42+
43+
/** @var Expiration|MockObject */
44+
private $expiration;
45+
46+
/** @var IJobList|MockObject */
47+
private $jobList;
48+
49+
/** @var ILogger|MockObject */
50+
private $logger;
51+
52+
protected function setUp(): void {
53+
parent::setUp();
54+
55+
$this->config = $this->createMock(IConfig::class);
56+
$this->userManager = $this->createMock(IUserManager::class);
57+
$this->expiration = $this->createMock(Expiration::class);
58+
$this->jobList = $this->createMock(IJobList::class);
59+
$this->logger = $this->createMock(ILogger::class);
60+
61+
$this->jobList->expects($this->once())
62+
->method('setLastRun');
63+
$this->jobList->expects($this->once())
64+
->method('setExecutionTime');
65+
}
66+
67+
public function testBackgroundJobDeactivated() {
68+
$this->config->method('getAppValue')
69+
->with('files_versions', 'background_job_expire_versions', 'yes')
70+
->willReturn('no');
71+
$this->expiration->expects($this->never())
72+
->method('getMaxAgeAsTimestamp');
73+
74+
$job = new ExpireVersions($this->config, $this->userManager, $this->expiration);
75+
$job->execute($this->jobList, $this->logger);
76+
}
77+
}

0 commit comments

Comments
 (0)