Use DI for MonthlyReport

Signed-off-by: Joas Schilling <[email protected]>

composer.json

@@ -8,13 +8,11 @@
 	"name": "nextcloud/survey_client",
 	"description": "Usage survey",
 	"license": "AGPL",
-	"require": {
-	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.5",
 		"nextcloud/coding-standard": "^1.0.0",
-		"christophwurst/nextcloud": "dev-master@dev",
-		"vimeo/psalm": "^4.3.2"
+		"vimeo/psalm": "^4.3.2",
+		"christophwurst/nextcloud": "dev-master"
 	},
 	"config": {
 		"optimize-autoloader": true,

lib/BackgroundJobs/MonthlyReport.php

@@ -21,29 +21,34 @@
 
 namespace OCA\Survey_Client\BackgroundJobs;
 
-use OCA\Survey_Client\AppInfo\Application;
+use OCA\Survey_Client\Collector;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJob;
 use OCP\BackgroundJob\TimedJob;
+use Psr\Log\LoggerInterface;
 
 class MonthlyReport extends TimedJob {
-	public function __construct(ITimeFactory $time) {
+	protected Collector $collector;
+	protected LoggerInterface $logger;
+
+	public function __construct(ITimeFactory $time,
+								Collector $collector,
+								LoggerInterface $logger) {
 		parent::__construct($time);
+		$this->collector = $collector;
+		$this->logger = $logger;
 		// Run all 28 days
 		$this->setInterval(28 * 24 * 60 * 60);
 		// keeping time sensitive to not overload the target server at a single specific time of the day
 		$this->setTimeSensitivity(IJob::TIME_SENSITIVE);
 	}
 
 	protected function run($argument) {
-		$application = new Application();
-		/** @var \OCA\Survey_Client\Collector $collector */
-		$collector = $application->getContainer()->query('OCA\Survey_Client\Collector');
-		$result = $collector->sendReport();
+		$result = $this->collector->sendReport();
 
 		if ($result->getStatus() !== Http::STATUS_OK) {
-			\OC::$server->getLogger()->info('Error while sending usage statistic');
+			$this->logger->info('Error while sending usage statistic');
 		}
 	}
 }